diff --git a/BUILD.gn b/BUILD.gn index e55cf09150d27de0172465e89b386c5d6b34e8d0..e5091933dca5a9b3fa778611f1eb641cf0c09a9e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -38,7 +38,6 @@ ohos_source_set("astc_encoder_static") { "//third_party/astc-encoder/Source/astcenc_partition_tables.cpp", "//third_party/astc-encoder/Source/astcenc_percentile_tables.cpp", "//third_party/astc-encoder/Source/astcenc_pick_best_endpoint_format.cpp", - "//third_party/astc-encoder/Source/astcenc_platform_isa_detection.cpp", "//third_party/astc-encoder/Source/astcenc_quantization.cpp", "//third_party/astc-encoder/Source/astcenc_symbolic_physical.cpp", "//third_party/astc-encoder/Source/astcenc_weight_align.cpp", @@ -51,7 +50,6 @@ ohos_source_set("astc_encoder_static") { ohos_shared_library("astc_encoder_shared") { public_configs = [ ":astc_encoder_config" ] deps = [ ":astc_encoder_static" ] - output_extension = "so" install_enable = true part_name = "astc-encoder" innerapi_tags = [ "platformsdk" ] diff --git a/CMakeLists.txt b/CMakeLists.txt index a17cb9399b61dd4b05f1cccfc5f62fb5493c9613..30447153063702876ea45b166a31a069d9de6af6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ---------------------------------------------------------------------------- -# Copyright 2020-2022 Arm Limited +# Copyright 2020-2024 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -24,163 +24,83 @@ if(MSVC) add_compile_options("/wd4324") # Disable structure was padded due to alignment specifier endif() -project(astcencoder VERSION 3.7.0) +project(astcencoder VERSION 4.7.0) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -set(PACKAGE_ROOT astcenc) +set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "x86_64 x86_64h arm64") include(CTest) -option(ISA_AVX2 "Enable builds for AVX2 SIMD") -option(ISA_SSE41 "Enable builds for SSE4.1 SIMD") -option(ISA_SSE2 "Enable builds for SSE2 SIMD") -option(ISA_NEON "Enable builds for NEON SIMD") -option(ISA_NONE "Enable builds for no SIMD") -option(ISA_NATIVE "Enable builds for native SIMD") -option(DECOMPRESSOR "Enable builds for decompression only") -option(DIAGNOSTICS "Enable builds for diagnostic trace") -option(ASAN "Enable builds width address sanitizer") -option(UNITTEST "Enable builds for unit tests") -option(NO_INVARIANCE "Enable builds without invariance") -option(CLI "Enable build of CLI" ON) - -set(UNIVERSAL_BUILD OFF) -set(MACOS_BUILD OFF) -set(MACOS_ARCH_LEN 0) +option(ASTCENC_ISA_AVX2 "Enable astcenc builds for AVX2 SIMD") +option(ASTCENC_ISA_SSE41 "Enable astcenc builds for SSE4.1 SIMD") +option(ASTCENC_ISA_SSE2 "Enable astcenc builds for SSE2 SIMD") +option(ASTCENC_ISA_NEON "Enable astcenc builds for NEON SIMD") +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_DIAGNOSTICS "Enable astcenc builds with diagnostic trace") +option(ASTCENC_ASAN "Enable astcenc builds with address 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) # Preflight for some macOS-specific build options if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(MACOS_BUILD ON) - list(LENGTH CMAKE_OSX_ARCHITECTURES MACOS_ARCH_LEN) -endif() - -# Count options which MUST be x64 -set(X64_ISA_COUNT 0) -set(CONFIGS ${ISA_AVX2} ${ISA_SSE41} ${ISA_SSE2}) -foreach(CONFIG ${CONFIGS}) - if(${CONFIG}) - math(EXPR X64_ISA_COUNT "${X64_ISA_COUNT} + 1") - endif() -endforeach() - -# Count options which MUST be arm64 -set(ARM64_ISA_COUNT 0) -set(CONFIGS ${ISA_NEON}) -foreach(CONFIG ${CONFIGS}) - if(${CONFIG}) - math(EXPR ARM64_ISA_COUNT "${ARM64_ISA_COUNT} + 1") - endif() -endforeach() - -# macOS builds -if("${MACOS_BUILD}") - list(FIND CMAKE_OSX_ARCHITECTURES "x86_64" IS_X64) - list(FIND CMAKE_OSX_ARCHITECTURES "arm64" IS_ARM64) - list(FIND CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)" IS_AUTO) - - # Turn list index into boolean - if(${IS_X64} EQUAL -1) - set(IS_X64 OFF) - else() - set(IS_X64 ON) - endif() - - if(${IS_ARM64} EQUAL -1) - set(IS_ARM64 OFF) - else() - set(IS_ARM64 ON) - endif() - - if(${IS_AUTO} EQUAL -1) - set(IS_AUTO OFF) - else() - set(IS_AUTO ON) - endif() - - # Set up defaults if no more specific ISA set - use XCode's own defaults - if((IS_ARM64 OR IS_AUTO) AND ("${ARM64_ISA_COUNT}" EQUAL 0) AND (NOT "${ISA_NONE}")) - set(ARM64_ISA_COUNT 1) - set(ISA_NEON ON) - endif() + option(ASTCENC_UNIVERSAL_BUILD "Enable universal multi-arch build" ON) - if((IS_X64 OR IS_AUTO) AND ("${X64_ISA_COUNT}" EQUAL 0) AND (NOT "${ISA_NONE}")) - set(X64_ISA_COUNT 1) - set(ISA_SSE41 ON) - endif() + if(${ASTCENC_UNIVERSAL_BUILD}) + set(ASTCENC_ISA_SSE41 ON) + set(ASTCENC_ISA_AVX2 ON) + set(ASTCENC_ISA_NEON ON) - # User might be doing multi-architecture - XCode sets this at runtime - if("${IS_AUTO}") - if(("${ARM64_ISA_COUNT}" GREATER 1) OR ("${X64_ISA_COUNT}" GREATER 1)) - message(FATAL_ERROR "For macOS universal binaries only one backend per architecture is allowed.") + if(${ASTCENC_ISA_SSE2}) + message(FATAL_ERROR "ISA_SSE2 cannot be used in a universal build") endif() - set(UNIVERSAL_BUILD ON) - - # User requested explicit multi-architecture universal build - elseif("${MACOS_ARCH_LEN}" GREATER 2) - message(FATAL_ERROR "For macOS universal binaries only x86_64 and arm64 builds are allowed.") - - elseif("${MACOS_ARCH_LEN}" EQUAL 2) - if(NOT (${IS_X64} AND ${IS_ARM64})) - message(FATAL_ERROR "For macOS universal binaries only x86_64 and arm64 builds are allowed.") + if(${ASTCENC_ISA_NONE}) + message(FATAL_ERROR "ISA_NONE cannot be used in a universal build") endif() - if(("${ARM64_ISA_COUNT}" GREATER 1) OR ("${X64_ISA_COUNT}" GREATER 1)) - message(FATAL_ERROR "For macOS universal binaries only one backend per architecture is allowed.") + if(${ASTCENC_ISA_NATIVE}) + message(FATAL_ERROR "ISA_NATIVE cannot be used in a universal build") endif() + endif() +else() + set(ASTCENC_UNIVERSAL_BUILD OFF) +endif() - set(UNIVERSAL_BUILD ON) - - # User requested explicit single architecture build - elseif("${MACOS_ARCH_LEN}" EQUAL 1) - if("${IS_X64}" AND "${ARM64_ISA_COUNT}") - message(FATAL_ERROR "For macOS x86_64 builds an arm64 backend cannot be specified.") - endif() - - if("${IS_ARM64}" AND "${X64_ISA_COUNT}") - message(FATAL_ERROR "For macOS arm64 builds an x86_64 backend cannot be specified.") - endif() - - # Else is this a implicit multi-architecture universal build? - elseif(("${ARM64_ISA_COUNT}" EQUAL 1) AND ("${X64_ISA_COUNT}" GREATER 1)) - string(CONCAT MSG "For macOS setting multiple architecture backends builds a universal binary. " - "For universal binaries only one backend per architecture is allowed.") - message(FATAL_ERROR "${MSG}") - - elseif(("${X64_ISA_COUNT}" EQUAL 1) AND ("${ARM64_ISA_COUNT}" GREATER 1)) - string(CONCAT MSG "For macOS setting multiple architecture backends builds a universal binary. " - "For universal binaries only one backend per architecture is allowed.") - message(FATAL_ERROR "${MSG}") - - elseif(("${ARM64_ISA_COUNT}" EQUAL 1) AND ("${X64_ISA_COUNT}" EQUAL 1)) - set(UNIVERSAL_BUILD ON) - set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") - - # Else is this an implicit single architecture build? - elseif("${ARM64_ISA_COUNT}" EQUAL 1) - set(CMAKE_OSX_ARCHITECTURES "arm64") - - elseif("${X64_ISA_COUNT}" EQUAL 1) - set(CMAKE_OSX_ARCHITECTURES "x86_64") - - else() - # Do nothing here - assume it defaults to host? +# Count options which MUST be x64 +set(ASTCENC_X64_ISA_COUNT 0) +set(ASTCENC_CONFIGS ${ASTCENC_ISA_AVX2} ${ASTCENC_ISA_SSE41} ${ASTCENC_ISA_SSE2}) +foreach(ASTCENC_CONFIG ${ASTCENC_CONFIGS}) + if(${ASTCENC_CONFIG}) + math(EXPR ASTCENC_X64_ISA_COUNT "${ASTCENC_X64_ISA_COUNT} + 1") + endif() +endforeach() +# Count options which MUST be arm64 +set(ASTCENC_ARM64_ISA_COUNT 0) +set(ASTCENC_CONFIGS ${ASTCENC_ISA_NEON}) +foreach(ASTCENC_CONFIG ${ASTCENC_CONFIGS}) + if(${ASTCENC_CONFIG}) + math(EXPR ASTCENC_ARM64_ISA_COUNT "${ASTCENC_ARM64_ISA_COUNT} + 1") endif() +endforeach() # Non-macOS builds -else() - if(("${ARM64_ISA_COUNT}" GREATER 0) AND ("${X64_ISA_COUNT}" GREATER 0)) +if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + if(("${ASTCENC_ARM64_ISA_COUNT}" GREATER 0) AND ("${ASTCENC_X64_ISA_COUNT}" GREATER 0)) message(FATAL_ERROR "Builds can only support a single architecture per configure.") endif() endif() # If nothing more specific is set then fall back on the compiler's defaults -if(("${ARM64_ISA_COUNT}" EQUAL 0) AND ("${X64_ISA_COUNT}" EQUAL 0) AND (NOT "${ISA_NONE}")) - set(ISA_NATIVE ON) +if(("${ASTCENC_ARM64_ISA_COUNT}" EQUAL 0) AND ("${ASTCENC_X64_ISA_COUNT}" EQUAL 0) AND (NOT "${ASTCENC_ISA_NONE}")) + set(ASTCENC_ISA_NATIVE ON) endif() function(printopt optName optVal) @@ -191,38 +111,38 @@ function(printopt optName optVal) endif() endfunction() -if("${BLOCK_MAX_TEXELS}") - message(STATUS " Max block texels - ${BLOCK_MAX_TEXELS}") +if("${ASTCENC_BLOCK_MAX_TEXELS}") + message(STATUS " Max block texels - ${ASTCENC_BLOCK_MAX_TEXELS}") endif() -printopt("AVX2 backend " ${ISA_AVX2}) -printopt("SSE4.1 backend " ${ISA_SSE41}) -printopt("SSE2 backend " ${ISA_SSE2}) -printopt("NEON backend " ${ISA_NEON}) -printopt("NONE backend " ${ISA_NONE}) -printopt("NATIVE backend " ${ISA_NATIVE}) -if("${MACOS_BUILD}") - printopt("Universal bin " ${UNIVERSAL_BUILD}) + +printopt("AVX2 backend " ${ASTCENC_ISA_AVX2}) +printopt("SSE4.1 backend " ${ASTCENC_ISA_SSE41}) +printopt("SSE2 backend " ${ASTCENC_ISA_SSE2}) +printopt("NEON backend " ${ASTCENC_ISA_NEON}) +printopt("NONE backend " ${ASTCENC_ISA_NONE}) +printopt("NATIVE backend " ${ASTCENC_ISA_NATIVE}) +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + printopt("Universal bin " ${ASTCENC_UNIVERSAL_BUILD}) endif() -printopt("Decompressor " ${DECOMPRESSOR}) -printopt("No invariance " ${NO_INVARIANCE}) -printopt("Diagnostics " ${DIAGNOSTICS}) -printopt("ASAN " ${ASAN}) -printopt("Unit tests " ${UNITTEST}) +printopt("Invariance " ${ASTCENC_INVARIANCE}) +printopt("Shared libs " ${ASTCENC_SHAREDLIB}) +printopt("Decompressor " ${ASTCENC_DECOMPRESSOR}) +printopt("Diagnostics " ${ASTCENC_DIAGNOSTICS}) +printopt("ASAN " ${ASTCENC_ASAN}) +printopt("Unit tests " ${ASTCENC_UNITTEST}) # Subcomponents add_subdirectory(Source) # Configure package archive -if(PACKAGE) - if("${MACOS_BUILD}") - string(TOLOWER "macOS" PKG_OS) +if(ASTCENC_PACKAGE) + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + string(TOLOWER "macOS" ASTCENC_PKG_OS) else() - string(TOLOWER ${CMAKE_SYSTEM_NAME} PKG_OS) + string(TOLOWER ${CMAKE_SYSTEM_NAME} ASTCENC_PKG_OS) endif() - set(PKG_VER ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}) - - set(CPACK_PACKAGE_FILE_NAME "astcenc-${PKG_VER}-${PKG_OS}-${PACKAGE}") + set(CPACK_PACKAGE_FILE_NAME "astcenc-${CMAKE_PROJECT_VERSION}-${ASTCENC_PKG_OS}-${ASTCENC_PACKAGE}") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE) set(CPACK_PACKAGE_CHECKSUM SHA256) set(CPACK_GENERATOR ZIP) diff --git a/Docs/Building.md b/Docs/Building.md index d695dde426b50c471d922ff48b06b6ee52b5364c..dda9df1cea7088855fb5adbdba4c71533f26b104 100644 --- a/Docs/Building.md +++ b/Docs/Building.md @@ -10,7 +10,7 @@ backends. ## Windows -Builds for Windows are tested with CMake 3.17 and Visual Studio 2019. +Builds for Windows are tested with CMake 3.17, and Visual Studio 2019 or newer. ### Configuring the build @@ -25,13 +25,13 @@ cd build # Configure your build of choice, for example: +# x86-64 using a Visual Studio solution +cmake -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_INSTALL_PREFIX=..\ ^ + -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON .. + # x86-64 using NMake cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..\ ^ - -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON .. - -# x86-64 using Visual Studio solution -cmake -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_INSTALL_PREFIX=..\ ^ - -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON .. + -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON .. ``` A single CMake configure can build multiple binaries for a single target CPU @@ -49,14 +49,15 @@ Once you have configured the build you can use NMake to compile the project from your build dir, and install to your target install directory. ```shell -# Run a build and install build outputs in `${CMAKE_INSTALL_PREFIX}/astcenc/` +# Run a build and install build outputs in `${CMAKE_INSTALL_PREFIX}/bin/` cd build nmake install ``` -## macOS and Linux +## macOS and Linux using Make -Builds for macOS and Linux are tested with CMake 3.17 and clang++ 9.0. +Builds for macOS and Linux are tested with CMake 3.17, and clang++ 9.0 or +newer. > Compiling using g++ is supported, but clang++ builds are faster by ~15%. @@ -78,15 +79,14 @@ cd build # Arm arch64 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ \ - -DISA_NEON=ON .. + -DASTCENC_ISA_NEON=ON .. # x86-64 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ \ - -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON .. + -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON .. # macOS universal binary build -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ \ - -DISA_AVX2=ON -DISA_NEON=ON .. +cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ .. ``` A single CMake configure can build multiple binaries for a single target CPU @@ -94,14 +94,13 @@ architecture, for example building x64 for both SSE2 and AVX2. Each binary name will include the build variant as a postfix. It is possible to build any set of the supported SIMD variants by enabling only the ones you require. -For macOS, we additionally support the ability to build a universal binary, -combining one x86 and one arm64 variant into a single output binary. The OS -will select the correct variant to run for the machine being used to run the -built binary. To build a universal binary select a single x86 variant and a -single arm64 variant, and both will be included in a single output binary. It -is not required, but if `CMAKE_OSX_ARCHITECTURES` is set on the command line -(e.g. by XCode-generated build commands) it will be validated against the other -configuration variant settings. +For macOS, we additionally support the ability to build a universal binary. +This build includes SSE4.1 (`x86_64`), AVX2 (`x86_64h`), and NEON (`arm64`) +build slices in a single output binary. The OS will select the correct variant +to run for the machine being used. This is the default build target for a macOS +build, but single-target binaries can still be built by setting +`-DASTCENC_UNIVERSAL_BINARY=OFF` and then manually selecting the specific ISA +variants that are required. ### Building @@ -109,11 +108,44 @@ Once you have configured the build you can use Make to compile the project from your build dir, and install to your target install directory. ```shell -# Run a build and install build outputs in `${CMAKE_INSTALL_PREFIX}/astcenc/` +# Run a build and install build outputs in `${CMAKE_INSTALL_PREFIX}/bin/` +# for executable binaries and `${CMAKE_INSTALL_PREFIX}/lib/` for libraries cd build make install -j16 ``` +## macOS using XCode + +Builds for macOS and Linux are tested with CMake 3.17, and XCode 14.0 or +newer. + +### Configuring the build + +To use CMake you must first configure the build. Create a build directory +in the root of the astcenc checkout, and then run `cmake` inside that directory +to generate the build system. + +```shell +# Create a build directory +mkdir build +cd build + +# Configure a universal build +cmake -G Xcode -DCMAKE_INSTALL_PREFIX=../ .. +``` + +### Building + +Once you have configured the build you can use CMake to compile the project +from your build dir, and install to your target install directory. + +```shell +cmake --build . --config Release + +# Optionally install the binaries to the installation directory +cmake --install . --config Release +``` + ## Advanced build options For codec developers and power users there are a number of useful features in @@ -132,22 +164,33 @@ We support and test the following `CMAKE_BUILD_TYPE` options. Note that optimized release builds are compiled with link-time optimization, which can make profiling more challenging ... +### Shared Libraries + +We support building the core library as a shared object by setting the CMake +option `-DASTCENC_SHAREDLIB=ON` at configure time. For macOS build targets the +shared library supports the same universal build configuration as the command +line utility. + +Note that the command line tool is always statically linked; the shared objects +are an extra build output that are not currently used by the command line tool. + ### Constrained block size builds All normal builds will support all ASTC block sizes, including the worst case 6x6x6 3D block size (216 texels per block). Compressor memory footprint and performance can be improved by limiting the block sizes supported in the build -by adding `-DBLOCK_MAX_TEXELS=` to to CMake command line when -configuring. Legal block sizes that are unavailable in a restricted build will -return the error `ASTCENC_ERR_NOT_IMPLEMENTED` during context creation. +by adding `-DASTCENC_BLOCK_MAX_TEXELS=` to to CMake command line +when configuring. Legal block sizes that are unavailable in a restricted build +will return the error `ASTCENC_ERR_NOT_IMPLEMENTED` during context creation. ### Non-invariant builds All normal builds are designed to be invariant, so any build from the same git revision will produce bit-identical results for all compilers and CPU architectures. To achieve this we sacrifice some performance, so if this is -not required you can specify `-DNO_INVARIANCE=ON` to enable additional -optimizations. +not required you can specify `-DASTCENC_INVARIANCE=OFF` to enable additional +optimizations. This has most benefit for AVX2 builds where we are able to +enable use of the FMA instruction set extensions. ### No intrinsics builds @@ -156,8 +199,8 @@ supported target architectures (x86 and arm64) guarantee SIMD availability. For development purposes it is possible to build an intrinsic-free build which uses no explicit SIMD acceleration (the compiler may still auto-vectorize). -To enable this binary variant add `-DISA_NONE=ON` to the CMake command line -when configuring. It is NOT recommended to use this for production; it is +To enable this binary variant add `-DASTCENC_ISA_NONE=ON` to the CMake command +line when configuring. It is NOT recommended to use this for production; it is significantly slower than the vectorized SIMD builds. ### Test builds @@ -171,7 +214,7 @@ git submodule init git submodule update ``` -To build unit tests add `-DUNITTEST=ON` to the CMake command line when +To build unit tests add `-DASTCENC_UNITTEST=ON` to the CMake command line when configuring. To run unit tests use the CMake `ctest` utility from your build directory after @@ -185,14 +228,56 @@ ctest --verbose ### Address sanitizer builds We support building with ASAN on Linux and macOS when using a compiler that -supports it. To build binaries with ASAN checking enabled add `-DASAN=ON` to -the CMake command line when configuring. +supports it. To build binaries with ASAN checking enabled add `-DASTCENC_ASAN=ON` +to the CMake command line when configuring. + +### Android builds + +Builds of the command line utility for Android are not officially supported, but can be a useful +development build for testing on e.g. different Arm CPU microarchitectures. + +The build script below shows one possible route to building the command line tool for Android. Once +built the application can be pushed to e.g. `/data/local/tmp` and executed from an Android shell +terminal over `adb`. + +```shell +ANDROID_ABI=arm64-v8a +ANDROID_NDK=/work/tools/android/ndk/22.1.7171670 + +BUILD_TYPE=RelWithDebInfo + +BUILD_DIR=build + +mkdir -p ${BUILD_DIR} +cd ${BUILD_DIR} + +cmake \ + -DCMAKE_INSTALL_PREFIX=./ \ + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \ + -DANDROID_ABI=${ANDROID_ABI} \ + -DANDROID_ARM_NEON=ON \ + -DANDROID_PLATFORM=android-21 \ + -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \ + -DANDROID_TOOLCHAIN=clang \ + -DANDROID_STL=c++_static \ + -DARCH=aarch64 \ + -DASTCENC_ISA_NEON=ON \ + .. + +make -j16 +``` ## Packaging a release bundle We support building a release bundle of all enabled binary configurations in the current CMake configuration using the `package` build target +Configure CMake with: + +* `-DASTCENC_PACAKGE=` to set the package architecture/variant name used +to name the package archive (not set by default). + ```shell # Run a build and package build outputs in `./astcenc---.` cd build @@ -212,4 +297,4 @@ details. - - - -_Copyright © 2019-2022, Arm Limited and contributors. All rights reserved._ +_Copyright © 2019-2023, Arm Limited and contributors. All rights reserved._ diff --git a/Docs/ChangeLog-2x.md b/Docs/ChangeLog-2x.md deleted file mode 100644 index 0c1ccdce4ed8a7c12b37da9f8246e75f966a9bae..0000000000000000000000000000000000000000 --- a/Docs/ChangeLog-2x.md +++ /dev/null @@ -1,328 +0,0 @@ -# 2.x series change log - -This page summarizes the major functional and performance changes in each -release of the 2.x series. - -All performance data on this page is measured on an Intel Core i5-9600K -clocked at 4.2 GHz, running astcenc using 6 threads. - - -## 2.5 - -**Status:** Released, March 2021 - -The 2.5 release is the last major release in the 2.x series. After this release -a `2.x` branch will provide stable long-term support, and the `main` branch -will switch to focusing on more radical changes for the 3.x series. - -Reminder for users of the library interface - the API is not designed to be -stable across versions, and this release is not compatible with earlier 2.x -releases. Please update and rebuild your client-side code using the updated -`astcenc.h` header. - -**General:** - * **Feature:** The `ISA_INVARIANCE` build option is no longer supported, as - there is no longer any performance benefit from the variant paths. All - builds are now using the equivalent of the `ISA_INVARIANCE=ON` setting, and - all builds (except Armv7) are now believed to be invariant across operating - systems, compilers, CPU architectures, and SIMD instruction sets. - * **Feature:** Armv8 32-bit builds with NEON are now supported, with - out-of-the-box support for Arm Linux soft-float and hard-float ABIs. There - are no pre-built binaries for these targets; support is included for - library users targeting older 32-bit Android and iOS devices. - * **Feature:** A compressor mode for encoding HDR textures that have been - encoded into LDR RGBM wrapper format is now supported. Note that this - encoding has some strong recommendations for how the RGBM encoding is - implemented to avoid block artifacts in the compressed image. -* **Core API:** - * **API Change:** The core API has been changed to be a pure C API, making it - easier to wrap the codec in a stable shared library ABI. Some entry points - that used to accept references now expect pointers. - * **API Change:** The decompression functionality in the core API has been - changed to allow use of multiple threads. The design pattern matches the - compression functionality, requiring the caller to create the threads, - synchronize them between images, and to call the new - `astcenc_decompress_reset()` function between images. -* **API Feature:** Defines to support exporting public API entry point - symbols from a shared object are provided, but not exposed off-the-shelf by - the CMake provided by the project. - * **API Feature:** New `astcenc_get_block_info()` function added to the core - API to allow users to perform high level analysis of compressed data. This - API is not implemented in decompressor-only builds. - * **API Feature:** Codec configuration structure has been extended to expose - the new RGBM compression mode. See the API header for details. - - -## 2.4 - -**Status:** Released, February 2021 - -The 2.4 release is the fifth release in the 2.x series. It is primarily a bug -fix release for HDR image handling, which impacts all earlier 2.x series -releases. - -**General:** - * **Feature:** When using the `-a` option, or the equivalent config option - for the API, any 2D blocks that are entirely zero alpha after the alpha - filter radius is taken into account are replaced by transparent black - constant color blocks. This is an RDO-like technique to improve compression - ratios of any additional application packaging compression that is applied. -**Command Line:** - * **Bug fix:** The command line wrapper now correctly loads HDR images that - have a non-square aspect ratio. - - -## 2.3 - -**Status:** Released, January 2021 - -The 2.3 release is the fourth release in the 2.x series. It includes a number -of performance improvements and new features. - -Reminder for users of the library interface - the API is not designed to be -stable across versions, and this release is not compatible with 2.2. Please -recompile your client-side code using the updated `astcenc.h` header. - -* **General:** - * **Feature:** Decompressor-only builds of the codec are supported again. - While this is primarily a feature for library users who want to shrink - binary size, a variant command line tool `astcdec` can be built by - specifying `DECOMPRESSOR=ON` on the CMake configure command line. - * **Feature:** Diagnostic builds of the codec can now be built. These builds - generate a JSON file containing a trace of the compressor execution. - Diagnostic builds are only suitable for codec development; they are slower - and JSON generation cannot be disabled. Build by setting `DIAGNOSTICS=ON` - on the CMake configure command line. - * **Feature:** Code compatibility improved with older versions of GCC, - earliest compiler now tested is GCC 7.5 (was GCC 9.3). - * **Feature:** Code compatibility improved with newer versions of LLVM, - latest compiler now tested is Clang 12.0 (was Clang 9.0). - * **Feature:** Code compatibility improved with the Visual Studio 2019 LLVM - toolset (`clang-cl`). Using the LLVM toolset gives 25% performance - improvements and is recommended. -* **Command Line:** - * **Feature:** Quality level now accepts either a preset (`-fast`, etc) or a - float value between 0 and 100, allowing more control over the compression - quality vs performance trade-off. The presets are not evenly spaced in the - float range; they have been spaced to give the best distribution of points - between the fast and thorough presets. - * `-fastest`: 0.0 - * `-fast`: 10.0 - * `-medium`: 60.0 - * `-thorough`: 98.0 - * `-exhaustive`: 100.0 -* **Core API:** - * **API Change:** Quality level preset enum replaced with a float value - between 0 (`-fastest`) and 100 (`-exhaustive`). See above for more info. - -### Performance - -This release includes a number of optimizations to improve performance. - -* New compressor algorithm for handling encoding candidates and refinement. -* Vectorized implementation of `compute_error_of_weight_set()`. -* Unrolled implementation of `encode_ise()`. -* Many other small improvements! - -The most significant change is the change to the compressor path, which now -uses an adaptive approach to candidate trials and block refinement. - -In earlier releases the quality level will determine the number of encoding -candidates and the number of iterative refinement passes that are used for each -major encoding trial. This is a fixed behavior; it will always try the full N -candidates and M refinement iterations specified by the quality level for each -encoding trial. - -The new approach implements two optimizations for this: - -* Compression will complete when a block candidate hits the specified target - quality, after its M refinement iterations have been applied. Later block - candidates are simply abandoned. -* Block candidates will predict how much refinement can improve them, and - abandon refinement if they are unlikely to improve upon the best known - encoding already in-hand. - -This pair of optimizations provides significant performance improvement to the -high quality modes which use the most block candidates and refinement -iterations. A minor loss of image quality is expected, as the blocks we no -longer test or refine may have been better coding choices. - -**Absolute performance vs 2.2 release:** - -![Absolute scores 2.3 vs 2.2](./ChangeLogImg/absolute-2.2-to-2.3.png) - -**Relative performance vs 2.2 release:** - -![Relative scores 2.3 vs 2.2](./ChangeLogImg/relative-2.2-to-2.3.png) - - -## 2.2 - -**Status:** Released, January 2021 - -The 2.2 release is the third release in the 2.x series. It includes a number -of performance improvements and new features. - -Reminder for users of the library interface - the API is not designed to be -stable across versions, and this release is not compatible with 2.1. Please -recompile your client-side code using the updated `astcenc.h` header. - -* **General:** - * **Feature:** New Arm aarch64 NEON accelerated vector library support. - * **Improvement:** New CMake build system for all platforms. - * **Improvement:** SSE4.2 feature profile changed to SSE4.1, which more - accurately reflects the feature set used. -* **Binary releases:** - * **Improvement:** Linux binaries changed to use Clang 9.0, which gives - up to 15% performance improvement. - * **Improvement:** Windows binaries are now code signed. - * **Improvement:** macOS binaries for Apple silicon platforms now provided. - * **Improvement:** macOS binaries are now code signed and notarized. -* **Command Line:** - * **Feature:** New image preprocess `-pp-normalize` option added. This forces - normal vectors to be unit length, which is useful when compressing source - textures that use normal length to encode an NDF, which is incompatible - with ASTC's two channel encoding. - * **Feature:** New image preprocess `-pp-premultiply` option added. This - scales RGB values by the alpha value. This can be useful to minimize - cross-channel color bleed caused by GPU post-multiply filtering/blending. - * **Improvements:** Command line tool cleanly traps and reports errors for - corrupt input images rather than relying on standard library `assert()` - calls in release builds. -* **Core API:** - * **API Change:** Images using region-based metrics no longer need to include - padding; all input images should be tightly packed and `dim_pad` is removed - from the `astcenc_image` structure. This makes it easier to directly use - images loaded from other libraries. - * **API Change:** Image `data` is no longer a 3D array accessed using - `data[z][y][x]` indexing, it's an array of 2D slices. This makes it easier - to directly use images loaded from other libraries. - * **API Change:** New `ASTCENC_FLG_SELF_DECOMPRESS_ONLY` flag added to the - codec config. Using this flag enables additional optimizations that - aggressively exploit implementation- and configuration-specific, behavior - to gain performance. When using this flag the codec can only reliably - decompress images that were compressed in the same context session. Images - produced via other means may fail to decompress correctly, even if they are - otherwise valid ASTC files. - -### Performance - -There is one major set of optimizations in this release, related to the new -`ASTCENC_FLG_SELF_DECOMPRESS_ONLY` mode. These allow the compressor to only -create data tables it knows that it is going to use, based on its current set -of heuristics, rather than needing the full set the format allows. - -The first benefit of these changes is a reduced context creation time, which -can be reduced by up to 250ms on our test machine. This is a significant -percentage of the command line utility runtime for a small image when using a -quick search preset. Compressing the whole Kodak test suite using the command -line utility and the `-fastest` preset is ~30% faster with this release, which -is mostly due to faster startup. - -The reduction in the data table size in this mode also improve the core codec -speed. Our test sets show an average of 12% improvement in the codec for -`-fastest` mode, and an average of 3% for `-medium` mode. - -Key for performance charts: - -* Color = block size (see legend). -* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). - -**Absolute performance vs 2.1 release:** - -![Absolute scores 2.2 vs 2.1](./ChangeLogImg/absolute-2.1-to-2.2.png) - -**Relative performance vs 2.1 release:** - -![Relative scores 2.2 vs 2.1](./ChangeLogImg/relative-2.1-to-2.2.png) - - - -## 2.1 - -**Status:** Released, November 2020 - -The 2.1 release is the second release in the 2.x series. It includes a number -of performance optimizations and new features. - -Reminder for users of the library interface - the API is not designed to be -stable across versions, and this release is not compatible with 2.0. Please -recompile your client-side code using the updated `astcenc.h` header. - -### Features: - -* **Command line:** - * **Bug fix:** The meaning of the `-tH\cH\dH` and `-th\ch\dh` compression - modes was inverted. They now match the documentation; use `-*H` for HDR - RGBA, and `-*h` for HDR RGB with LDR alpha. - * **Feature:** A new `-fastest` quality preset is now available. This is - designed for fast "roughing out" of new content, and sacrifices significant - image quality compared to `-fast`. We do not recommend its use for - production builds. - * **Feature:** A new `-candidatelimit` compression tuning option is now - available. This is a power-user control to determine how many candidates - are returned for each block mode encoding trial. This feature is used - automatically by the search presets; see `-help` for details. - * **Improvement:** The compression test modes (`-tl\ts\th\tH`) now emit a - MTex/s performance metric, in addition to coding time. -* **Core API:** - * **Feature:** A new quality preset `ASTCENC_PRE_FASTEST` is available. See - `-fastest` above for details. - * **Feature:** A new tuning option `tune_candidate_limit` is available in - the config structure. See `-candidatelimit` above for details. - * **Feature:** Image input/output can now use `ASTCENC_TYPE_F32` data types. -* **Stability:** - * **Feature:** The SSE2, SSE4.2, and AVX2 variants now produce identical - compressed output when run on the same CPU when compiled with the - preprocessor define `ASTCENC_ISA_INVARIANCE=1`. For Make builds this can - be set on the command line by setting `ISA_INV=1`. ISA invariance is off - by default; it reduces performance by 1-3%. - -### Performance - -Key for performance charts: - -* Color = block size (see legend). -* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). - -**Absolute performance vs 2.0 release:** - -![Absolute scores 2.1 vs 2.0](./ChangeLogImg/absolute-2.0-to-2.1.png) - -**Relative performance vs 2.0 release:** - -![Relative scores 2.1 vs 2.0](./ChangeLogImg/relative-2.0-to-2.1.png) - - - -## 2.0 - -**Status:** Released, August 2020 - -The 2.0 release is first release in the 2.x series. It includes a number of -major changes over the earlier 1.7 series, and is not command-line compatible. - -### Features: - -* The core codec can be built as a library, exposed via a new codec API. -* The core codec supports accelerated SIMD paths for SSE2, SSE4.2, and AVX2. -* The command line syntax has a clearer mapping to Khronos feature profiles. - -### Performance: - -Key for performance charts - -* Color = block size (see legend). -* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). - -**Absolute performance vs 1.7 release:** - -![Absolute scores 2.0 vs 1.7](./ChangeLogImg/absolute-1.7-to-2.0.png) - -**Relative performance vs 1.7 release:** - -![Relative scores 2.0 vs 1.7](./ChangeLogImg/relative-1.7-to-2.0.png) - -- - - - -_Copyright © 2020-2022, Arm Limited and contributors. All rights reserved._ diff --git a/Docs/ChangeLog-3x.md b/Docs/ChangeLog-3x.md index 9d2239a91bd94747c18d15f5675a3d3278acd6c6..2bb022f11db19d6cf02883bc5ddde4069592d12c 100644 --- a/Docs/ChangeLog-3x.md +++ b/Docs/ChangeLog-3x.md @@ -299,10 +299,6 @@ Key for charts: * Color = block size (see legend). * Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). -**Absolute performance vs 2.5 release:** - -![Absolute scores 3.0 vs 2.5](./ChangeLogImg/absolute-2.5-to-3.0.png) - **Relative performance vs 2.5 release:** ![Relative scores 3.0 vs 2.5](./ChangeLogImg/relative-2.5-to-3.0.png) diff --git a/Docs/ChangeLog-4x.md b/Docs/ChangeLog-4x.md new file mode 100644 index 0000000000000000000000000000000000000000..4450a490b4ad85d32bf26c7e76185e93acae956c --- /dev/null +++ b/Docs/ChangeLog-4x.md @@ -0,0 +1,398 @@ +# 4.x series change log + +This page summarizes the major functional and performance changes in each +release of the 4.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. + + +## 4.7.0 + +**Status:** January 2024 + +The 4.7.0 release is a major maintenance release, fixing rounding behavior in +the decompressor to match the Khronos specification. This fix includes the +addition of explicit support for optimizing for `decode_unorm8` rounding. + +Reminder - the codec library API is not designed to be binary compatible across +versions. We always recommend rebuilding your client-side code using the updated +`astcenc.h` header. + +* **General:** + * **Bug fix:** sRGB LDR decompression now uses the correct endpoint expansion + method to create the 16-bit RGB endpoint colors, and removes the previous + correction code from the interpolation function. This bug could result in + LSB bit flips relative to the standard specification. + * **Bug fix:** Decompressing to an 8-bit per component output image now matches + the `decode_unorm8` extension rounding rules. This bug could result in + LSB bit flips relative to the standard specification. + * **Bug fix:** Code now avoids using `alignas()` in the reference C + implementation, as the default `alignas(16)` is narrower than the + native minimum alignment requirement on some CPUs. + * **Feature:** Library configuration supports a new flag, + `ASTCENC_FLG_USE_DECODE_UNORM8`. This flag indicates that the image will be + used with the `decode_unorm8` decode mode. When set during compression + this allows the compressor to use the correct rounding when determining the + best encoding. + * **Feature:** Command line tool supports a new option, `-decode_unorm8`. + This option indicates that the image will be used with the `decode_unorm8` + decode mode. This option will automatically be set for decompression + (`-d*`) and trial (`-t*`) tool operation if the decompressed output image + is stored to an 8-bit per component file format. This option must be set + manually for compression (`-c*`) tool operation, as the desired decode mode + cannot be reliably determined. + * **Feature:** Library configuration supports a new optional progress + reporting callback to be specified. This is called during compression to + to allow interactive tooling use cases to display incremental progress. The + command line tool uses this feature to show compression progress unless + `-silent` is used. + + +## 4.6.1 + +**Status:** November 2023 + +The 4.6.1 release is a minor maintenance release to fix a scaling bug on +large core count Windows systems. + +* **General:** + * **Optimization:** Windows builds of the `astcenc` command line tool can now + use more than 64 cores on large core count systems. This change doubled + command line performance for `-exhaustive` compression when testing on an + 96 core/192 thread system. + * **Feature:** Windows Arm64 native builds of the `astcenc` command line tool + are now included in the prebuilt release binaries. + + +## 4.6.0 + +**Status:** November 2023 + +The 4.6.0 release retunes the compressor heuristics to give improvements to +performance for trivial losses to image quality. It also includes some minor +bug fixes and code quality improvements. + +Reminder - the codec library API is not designed to be binary compatible across +versions. We always recommend rebuilding your client-side code using the updated +`astcenc.h` header. + +* **General:** + * **Bug-fix:** Fixed context allocation for contexts allocated with the + `ASTCENC_FLG_DECOMPRESS_ONLY` flag. + * **Bug-fix:** Reduced use of `reinterpret_cast` in the core codec to + avoid strict aliasing violations. + * **Optimization:** `-medium` search quality no longer tests 4 partition + encodings for block sizes between 25 and 83 texels (inclusive). This + improves performance for a tiny drop in image quality. + * **Optimization:** `-thorough` and higher search qualities no longer test the + mode0 first search for block sizes between 25 and 83 texels (inclusive). + This improves performance for a tiny drop in image quality. + * **Optimization:** `TUNE_MAX_PARTITIONING_CANDIDATES` reduced from 32 to 8 + to reduce the size of stack allocated data structures. This causes a tiny + drop in image quality for the `-verythorough` and `-exhaustive` presets. + + +## 4.5.0 + +**Status:** June 2023 + +The 4.5.0 release is a maintenance release with small image quality +improvements, and a number of build system quality of life improvements. + +* **General:** + * **Bug-fix:** Improved handling compiler arguments in CMake, including + consistent use of MSVC-style command line arguments for ClangCL. + * **Bug-fix:** Invariant Clang builds now use `-ffp-model=precise` with + `-ffp-contract=off` which is needed to restore invariance due to recent + changes in compiler defaults. + * **Change:** macOS binary releases are now distributed as a single universal + binary for all platforms. + * **Change:** Windows binary releases are now compiled with VS2022. + * **Change:** Invariant MSVC builds for VS2022 now use `/fp:precise` instead + of `/fp:strict`, which is is now possible because precise no longer implies + contraction. This should improve performance for MSVC builds. + * **Change:** Non-invariant Clang builds now use `-ffp-model=precise` with + `-ffp-contract=on`. This should improve performance on older Clang + versions which defaulted to no contraction. + * **Change:** Non-invariant MSVC builds for VS2022 now use `/fp:precise` + with `/fp:contract`. This should improve performance for MSVC builds. + * **Change:** CMake config variables now use an `ASTCENC_` prefix to add a + namespace and group options when the library is used in a larger project. + * **Change:** CMake config `ASTCENC_UNIVERSAL_BUILD` for building macOS + universal binaries has been improved to include the `x86_64h` slice for + AVX2 builds. Universal builds are now on by default for macOS, and always + include NEON (arm64), SSE4.1 (x86_64), and AVX2 (x86_64h) variants. + * **Change:** CMake config `ASTCENC_NO_INVARIANCE` has been inverted to + remove the negated option, and is now `ASTCENC_INVARIANCE` with a default + of `ON`. Disabling this option can substantially improve performance, but + images can different across platforms and compilers. + * **Optimization:** Color quantization and packing for LDR RGB and RGBA has + been vectorized to improve performance. + * **Change:** Color quantization for LDR RGB and RGBA endpoints will now try + multiple quantization packing methods, and pick the one with the lowest + endpoint encoding error. This gives a minor image quality improvement, for + no significant performance impact when combined with the vectorization + optimizations. + + +## 4.4.0 + +**Status:** March 2023 + +The 4.4.0 release is a minor release with image quality improvements, a small +performance boost, and a few new quality-of-life features. + +* **General:** + * **Change:** Core library no longer checks availability of required + instruction set extensions, such as SSE4.1 or AVX2. Checking compatibility + is now the responsibility of the caller. See `astcenccli_entry.cpp` for + an example of code performing this check. + * **Change:** Core library can be built as a shared object by setting the + `-DSHAREDLIB=ON` CMake option, resulting in e.g. `libastcenc-avx2-shared.so`. + Note that the command line tool is always statically linked. + * **Change:** Decompressed 3D images will now write one output file per + slice, if the target format is a 2D image format. + * **Change:** Command line errors print to stderr instead of stdout. + * **Change:** Color encoding uses new quantization tables, that now factor + in floating-point rounding if a distance tie is found when using the + integer quant256 value. This improves image quality for 4x4 and 5x5 block + sizes. + * **Optimization:** Partition selection uses a simplified line calculation + with a faster approximation. This improves performance for all block sizes. + * **Bug-fix:** Fixed missing symbol error in decompressor-only builds. + * **Bug-fix:** Fixed infinity handling in debug trace JSON files. + +### Performance: + +Key for charts: + +* Color = block size (see legend). +* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). + +**Relative performance vs 4.3 release:** + +![Relative scores 4.4 vs 4.3](./ChangeLogImg/relative-4.3-to-4.4.png) + + +## 4.3.1 + +**Status:** January 2023 + +The 4.3.1 release is a minor maintenance release. No performance or image +quality changes are expected. + +* **General:** + * **Bug-fix:** Fixed typo in `-2/3/4partitioncandidatelimit` CLI options. + * **Bug-fix:** Fixed handling for `-3/4partitionindexlimit` CLI options. + * **Bug-fix:** Updated to `stb_image.h` v2.28, which includes multiple fixes + and improvements for image loading. + + +## 4.3.0 + +**Status:** January 2023 + +The 4.3.0 release is an optimization release. There are minor performance +and image quality improvements in this release. + +Reminder - the codec library API is not designed to be binary compatible across +versions. We always recommend rebuilding your client-side code using the updated +`astcenc.h` header. + +* **General:** + * **Bug-fix:** Use lower case `windows.h` include for MinGW compatibility. + * **Change:** The `-mask` command line option, `ASTCENC_FLG_MAP_MASK` in the + library API, has been removed. + * **Optimization:** Always skip blue-contraction for `QUANT_256` encodings. + This gives a small image quality improvement for the 4x4 block size. + * **Optimization:** Always skip RGBO vector calculation for LDR encodings. + * **Optimization:** Defer color packing and scrambling to physical layer. + * **Optimization:** Remove folded `decimation_info` lookup tables. This + significantly reduces compressor memory footprint and improves context + creation time. Impact increases with the active block size. + * **Optimization:** Increased trial and refinement pruning by using stricter + target errors when determining whether to skip iterations. + +### Performance: + +Key for charts: + +* Color = block size (see legend). +* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). + +**Relative performance vs 4.2 release:** + +![Relative scores 4.3 vs 4.2](./ChangeLogImg/relative-4.2-to-4.3.png) + + + +## 4.2.0 + +**Status:** November 2022 + +The 4.2.0 release is an optimization release. There are significant performance +improvements, minor image quality improvements, and library interface changes in +this release. + +Reminder - the codec library API is not designed to be binary compatible across +versions. We always recommend rebuilding your client-side code using the updated +`astcenc.h` header. + +* **General:** + * **Bug-fix:** Compression for RGB and RGBA base+offset encodings no + longer generate endpoints with the incorrect blue-contract behavior. + * **Bug-fix:** Lowest channel correlation calculation now correctly ignores + constant color channels for the purposes of filtering 2 plane encodings. + On average this improves both performance and image quality. + * **Bug-fix:** ISA compatibility now checked in `config_init()` as well as + in `context_alloc()`. + * **Change:** Removed the low-weight count optimization, as more recent + changes had significantly reduced its performance benefit. Option removed + from both command line and configuration structure. + * **Feature:** The `-exhaustive` mode now runs full trials on more + partitioning candidates and block candidates. This improves image quality + by 0.1 to 0.25 dB, but slows down compression by 3x. The `-verythorough` + and `-thorough` modes also test more candidates. + * **Feature:** A new preset, `-verythorough`, has been introduced to provide + a standard performance point between `-thorough` and the re-tuned + `-exhaustive` mode. This new mode is faster and higher quality than the + `-exhaustive` preset in the 4.1 release. + * **Feature:** The compressor can now independently vary the number of + partitionings considered for error estimation for 2/3/4 partitions. This + allows heuristics to put more effort into 2 partitions, and less in to + 3/4 partitions. + * **Feature:** The compressor can now run trials on a variable number of + candidate partitionings, allowing high quality modes to explore more of the + search space at the expense of slower compression. The number of trials is + independently configurable for 2/3/4 partition cases. + * **Optimization:** Introduce early-out threshold for 2/3/4 partition + searches based on the results after 1 of 2 trials. This significantly + improves performance for `-medium` and `-thorough` searches, for a minor + loss in image quality. + * **Optimization:** Reduce early-out threshold for 3/4 partition searches + based on 2/3 partition results. This significantly improves performance, + especially for `-thorough` searches, for a minor loss in image quality. + * **Optimization:** Use direct vector compare to create a SIMD mask instead + of a scalar compare that is broadcast to a vector mask. + * **Optimization:** Remove obsolete partition validity masks from the + partition selection algorithm. + * **Optimization:** Removed obsolete channel scaling from partition + `avgs_and_dirs()` calculation. + +### Performance: + +Key for charts: + +* Color = block size (see legend). +* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). + +**Relative performance vs 4.0 and 4.1 release:** + +![Relative scores 4.2 vs 4.0](./ChangeLogImg/relative-4.0-to-4.2.png) + + + +## 4.1.0 + +**Status:** August 2022 + +The 4.1.0 release is a maintenance release. There is no performance or image +quality change in this release. + +* **General:** + * **Change:** Command line decompressor no longer uses the legacy + `GL_LUMINANCE` or `GL_LUMINANCE_ALPHA` format enums when writing KTX + output files. Luminance textures now use the `GL_RED` format and + luminance_alpha textures now use the `GL_RG` format. + * **Change:** Command line tool gains a new `-dimage` option to generate + diagnostic images showing aspects of the compression encoding. The output + file name with its extension stripped is used as the stem of the diagnostic + image file names. + * **Bug-fix:** Library decompressor builds for SSE no longer use masked store + `maskmovdqu` instructions, as they can generate faults on masked lanes. + * **Bug-fix:** Command line decompressor now correctly uses sized type enums + for the internal format when writing output KTX files. + * **Bug-fix:** Command line compressor now correctly loads 16 and 32-bit per + component input KTX files. + * **Bug-fix:** Fixed GCC9 compiler warnings on Arm aarch64. + + +## 4.0.0 + +**Status:** July 2022 + +The 4.0.0 release introduces some major performance enhancement, and a number +of larger changes to the heuristics used in the codec to find a more effective +cost:quality trade off. + +* **General:** + * **Change:** The `-array` option for specifying the number of image planes + for ASTC 3D volumetric block compression been renamed to `-zdim`. + * **Change:** The build root package directory is now `bin` instead of + `astcenc`, allowing the CMake install step to write binaries into + `/usr/local/bin` if the user wishes to do so. + * **Feature:** A new `-ssw` option for specifying the shader sampling swizzle + has been added as convenience alternative to the `-cw` option. This is + needed to correct error weighting during compression if not all components + are read in the shader. For example, to extract and compress two components + from an RGBA input image, weighting the two components equally when + sampling through .ra in the shader, use `-esw ggga -ssw ra`. In this + example `-ssw ra` is equivalent to the alternative `-cw 1 0 0 1` encoding. + * **Feature:** The `-a` alpha weighting option has been re-enabled in the + backend, and now again applies alpha scaling to the RGB error metrics when + encoding. This is based on the maximum alpha in each block, not the + individual texel alpha values used in the earlier implementation. + * **Feature:** The command line tool now has `-repeats ` for testing, + which will iterate around compression and decompression `count` times. + Reported performance metrics also now separate compression and + decompression scores. + * **Feature:** The core codec is now warning clean up to /W4 for both MSVC + `cl.exe` and `clangcl.exe` compilers. + * **Feature:** The core codec now supports arm64 for both MSVC `cl.exe` and + `clangcl.exe` compilers. + * **Feature:** `NO_INVARIANCE` builds will enable the `-ffp-contract=fast` + option for all targets when using Clang or GCC. In addition AVX2 targets + will also set the `-mfma` option. This reduces image quality by up to 0.2dB + (normally much less), but improves performance by up to 5-20%. + * **Optimization:** Angular endpoint min/max weight selection is restricted + to weight `QUANT_11` or lower. Higher quantization levels assume default + 0-1 range, which is less accurate but much faster. + * **Optimization:** Maximum weight quantization for later trials is selected + based on the weight quantization of the best encoding from the 1 plane 1 + partition trial. This significantly reduces the search space for the later + trials with more planes or partitions. + * **Optimization:** Small data tables now use in-register SIMD permutes + rather than gathers (AVX2) or unrolled scalar lookups (SSE/NEON). This can + be a significant optimization for paths that are load unit limited. + * **Optimization:** Decompressed image block writes in the decompressor now + use a vectorized approach to writing each row of texels in the block, + including to ability to exploit masked stores if the target supports them. + * **Optimization:** Weight scrambling has been moved into the physical layer; + the rest of the codec now uses linear order weights. + * **Optimization:** Weight packing has been moved into the physical layer; + the rest of the codec now uses unpacked weights in the 0-64 range. + * **Optimization:** Consistently vectorize the creation of unquantized weight + grids when they are needed. + * **Optimization:** Remove redundant per-decimation mode copies of endpoint + and weight structures, which were really read-only duplicates. + * **Optimization:** Early-out the same endpoint mode color calculation if it + cannot be applied. + * **Optimization:** Numerous type size reductions applied to arrays to reduce + both context working buffer size usage and stack usage. + +### Performance: + +Key for charts: + +* Color = block size (see legend). +* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR). + +**Relative performance vs 3.7 release:** + +![Relative scores 4.0 vs 3.7](./ChangeLogImg/relative-3.7-to-4.0.png) + + +- - - + +_Copyright © 2022-2024, Arm Limited and contributors. All rights reserved._ diff --git a/Docs/ChangeLogImg/absolute-1.7-to-2.0.png b/Docs/ChangeLogImg/absolute-1.7-to-2.0.png deleted file mode 100644 index 9458f715b09347de711d737aebbe5a082501e4b8..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/absolute-1.7-to-2.0.png and /dev/null differ diff --git a/Docs/ChangeLogImg/absolute-2.0-to-2.1.png b/Docs/ChangeLogImg/absolute-2.0-to-2.1.png deleted file mode 100644 index 6e943e4e4b29bcbd6567ef1e9639830ade59525a..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/absolute-2.0-to-2.1.png and /dev/null differ diff --git a/Docs/ChangeLogImg/absolute-2.1-to-2.2.png b/Docs/ChangeLogImg/absolute-2.1-to-2.2.png deleted file mode 100644 index c5067b45b4508352c3855c4de9d2711dcf22ba95..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/absolute-2.1-to-2.2.png and /dev/null differ diff --git a/Docs/ChangeLogImg/absolute-2.2-to-2.3.png b/Docs/ChangeLogImg/absolute-2.2-to-2.3.png deleted file mode 100644 index c507896cb27cde330e4bc5448798744f9e5a9f9d..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/absolute-2.2-to-2.3.png and /dev/null differ diff --git a/Docs/ChangeLogImg/absolute-2.5-to-3.0.png b/Docs/ChangeLogImg/absolute-2.5-to-3.0.png deleted file mode 100644 index b3f702331ca71c6cf81a9acfb43adad522440cce..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/absolute-2.5-to-3.0.png and /dev/null differ diff --git a/Docs/ChangeLogImg/relative-1.7-to-2.0.png b/Docs/ChangeLogImg/relative-1.7-to-2.0.png deleted file mode 100644 index 65fe4a489ad903263af52027a9cf1cd25cab9422..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/relative-1.7-to-2.0.png and /dev/null differ diff --git a/Docs/ChangeLogImg/relative-2.0-to-2.1.png b/Docs/ChangeLogImg/relative-2.0-to-2.1.png deleted file mode 100644 index 40f55feecb175e79b7e69d609e51de273e7318cf..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/relative-2.0-to-2.1.png and /dev/null differ diff --git a/Docs/ChangeLogImg/relative-2.1-to-2.2.png b/Docs/ChangeLogImg/relative-2.1-to-2.2.png deleted file mode 100644 index 428db0e34c44b6e7e9ce0477231c891182e81602..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/relative-2.1-to-2.2.png and /dev/null differ diff --git a/Docs/ChangeLogImg/relative-2.2-to-2.3.png b/Docs/ChangeLogImg/relative-2.2-to-2.3.png deleted file mode 100644 index 21eef9d741a3a7f9f25b1efcc32b8a9aa849ca16..0000000000000000000000000000000000000000 Binary files a/Docs/ChangeLogImg/relative-2.2-to-2.3.png and /dev/null differ diff --git a/Docs/ChangeLogImg/relative-3.7-to-4.0.png b/Docs/ChangeLogImg/relative-3.7-to-4.0.png new file mode 100644 index 0000000000000000000000000000000000000000..2c373b00ab049f7b24394becc1265c9c6e097fb0 Binary files /dev/null and b/Docs/ChangeLogImg/relative-3.7-to-4.0.png differ diff --git a/Docs/ChangeLogImg/relative-4.0-to-4.2.png b/Docs/ChangeLogImg/relative-4.0-to-4.2.png new file mode 100644 index 0000000000000000000000000000000000000000..b65dbf4bb7afbef691047a27ebdf4f3faccf4330 Binary files /dev/null and b/Docs/ChangeLogImg/relative-4.0-to-4.2.png differ diff --git a/Docs/ChangeLogImg/relative-4.2-to-4.3.png b/Docs/ChangeLogImg/relative-4.2-to-4.3.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6db037171fc2a68b48c19f9ac40adc3072816e Binary files /dev/null and b/Docs/ChangeLogImg/relative-4.2-to-4.3.png differ diff --git a/Docs/ChangeLogImg/relative-4.3-to-4.4.png b/Docs/ChangeLogImg/relative-4.3-to-4.4.png new file mode 100644 index 0000000000000000000000000000000000000000..7dde3ddf380001e5a976f74fdf0f8cab2db0d96c Binary files /dev/null and b/Docs/ChangeLogImg/relative-4.3-to-4.4.png differ diff --git a/Docs/Encoding.md b/Docs/Encoding.md index 85a3a73fed39474a96ce9ed28faa33baa5c5992c..da2098038d96eab4c04ef2344082ef876e7b84bc 100644 --- a/Docs/Encoding.md +++ b/Docs/Encoding.md @@ -25,7 +25,7 @@ their compressed bitrate are shown in the table below. | BC3nm | G+R | 8 | BC1 G + BC4 R | | BC4 | R | 4 | L8 | | BC5 | R+G | 8 | BC1 R + BC1 G | -| BC6 | RGB (HDR) | 8 | | +| BC6H | RGB (HDR) | 8 | | | BC7 | RGB / RGBA | 8 | | | EAC_R11 | R | 4 | R11 | | EAC_RG11 | RG | 8 | RG11 | @@ -46,40 +46,40 @@ also a weakness (it reduces quality when compressing correlated signals). # ASTC Format Mapping The main question which arises with the mapping of another format on to ASTC -is how to handle cases where the input isn't a 4 channel RGBA input. ASTC is a -container format which always decompresses in to a 4 channel RGBA result. +is how to handle cases where the input isn't a 4 component RGBA input. ASTC is +a container format which always decompresses in to a 4 component RGBA result. However, the internal compressed representation is very flexible and can store -1-4 channels as needed on a per-block basis. +1-4 components as needed on a per-block basis. To get the best quality for a given bitrate, or the lowest bitrate for a given -quality, it is important that as few channels as possible are stored in the +quality, it is important that as few components as possible are stored in the internal representation to avoid wasting coding space. Specific optimizations in the ASTC coding scheme exist for: -* Encoding the RGB channels as a single luminance channel, so only a single +* Encoding the RGB components as a single luminance component, so only a single value needs to be stored in the coding instead of three. -* Encoding the A channel as a constant 1.0 value, so the coding doesn't +* Encoding the A component as a constant 1.0 value, so the coding doesn't actually need to store a per-pixel alpha value at all. ... so mapping your inputs given to the compressor to hit these paths is really important if you want to get the best output quality for your chosen bitrate. -## Encoding 1-4 channel data +## Encoding 1-4 component data -The table below shows the recommended channel usage for data with different -numbers of color channels present in the data. +The table below shows the recommended component usage for data with different +numbers of color components present in the data. The coding swizzle should be applied when compressing an image. This can be handled by the compressor when reading an uncompressed input image by specifying the swizzle using the `-esw` command line option. The sampling swizzle is what your should use in your shader programs to read -the data from the compressed texture, assuming no additional API-level channel -swizzling is specified by the application. +the data from the compressed texture, assuming no additional API-level +component swizzling is specified by the application. -| Input Channels | ASTC Endpoint | Coding Swizzle | Sampling Swizzle | +| Input components | ASTC Endpoint | Coding Swizzle | Sampling Swizzle | | -------------- | ------------- | -------------- | ------------------ | | 1 | L + 1 | `rrr1` | `.g` 1 | | 2 | L + A | `rrrg` | `.ga` 1 | @@ -88,13 +88,13 @@ swizzling is specified by the application. **1:** Sampling from `g` is preferred to sampling from `r` because it allows a single shader to be compatible with ASTC, BC1, or ETC formats. BC1 and ETC1 -store color endpoints as RGB565 data, so the `g` channel will have higher +store color endpoints as RGB565 data, so the `g` component will have higher precision. For ASTC it doesn't actually make any difference; the same single -channel luminance will be returned for all three of the `.rgb` channels. +component luminance will be returned for all three of the `.rgb` components. ## Equivalence with other formats -Based on these channel encoding requirements we can now derive the the ASTC +Based on these component encoding requirements we can now derive the the ASTC coding equivalents for most of the other texture compression formats in common use today. @@ -105,7 +105,7 @@ use today. | BC3nm | `gggr` | `.ag` | | | BC4 | `rrr1` | `.r` | | | BC5 | `rrrg` | `.ra` 2 | | -| BC6 | `rgb1` | `.rgb` | HDR profile only | +| BC6H | `rgb1` | `.rgb` 3 | HDR profile only | | BC7 | `rgba` | `.rgba` | | | EAC_R11 | `rrr1` | `.r` | | | EAC_RG11 | `rrrg` | `.ra` 2 | | @@ -115,38 +115,66 @@ use today. | ETC2+EAC | `rgba` | `.rgba` | | **1:** ASTC has no equivalent of the 1-bit punch-through alpha encoding -supported by BC1 or ETC2; if alpha is present it will be a full alpha channel. +supported by BC1 or ETC2; if alpha is present it will be a full alpha +component. **2:** ASTC relies on using the L+A color endpoint type for coding efficiency -for two channel data. It therefore has no direct equivalent of a two-plane -format sampled though the `.rg` channels such as BC5 or EAC_RG11. This can -be emulated by setting texture channel swizzles in the runtime API - e.g. via +for two component data. It therefore has no direct equivalent of a two-plane +format sampled though the `.rg` components such as BC5 or EAC_RG11. This can +be emulated by setting texture component swizzles in the runtime API - e.g. via `glTexParameteri()` for OpenGL ES - although it has been noted that API controlled swizzles are not available in WebGL. +**3:** ASTC can only store unsigned values, and has no equivalent of the BC6 +signed endpoint mode. + # Other Considerations This section outlines some of the other things to consider when encoding textures using ASTC. -## Encoding non-correlated channels +## Decode mode extensions + +ASTC is specified to decompress into a 16-bit per component RGBA output by +default, with the exception of the sRGB format which uses an 8-bit value for the +RGB components. + +Decompressing in to a 16-bit per component output format is often higher than +many use cases require, especially for LDR textures which originally came from +an 8-bit per component source image. Most implementations of ASTC support the +decode mode extensions, which allow an application to opt-in to a lower +precision decompressed format (RGBA8 for LDR, RGB9E5 for HDR). Using these +extensions can improve GPU texture cache efficiency, and even improve texturing +filtering throughput, for use cases that do not need the higher precision. + +The ASTC format uses different data rounding rules when the decode mode +extensions are used. To ensure that the compressor chooses the best encodings +for the RGBA8 rounding rules, you can specify `-decode_unorm8` when compressing +textures that will be decompressed into the RGBA8 intermediate. This gives a +small image quality boost. -Most other texture compression formats have a static channel assignment in +**Note:** This mode is automatically enabled if you use the `astcenc` +decompressor to write an 8-bit per component output image. + +## Encoding non-correlated components + +Most other texture compression formats have a static component assignment in terms of the expected data correlation. For example, ETC2+EAC assumes that RGB are always correlated and that alpha is non-correlated. ASTC can automatically -encode data as either fully correlated across all 4 channels, or with any one -channel assigned to a separate non-correlated partition to the other three. +encode data as either fully correlated across all 4 components, or with any one +component assigned to a separate non-correlated partition to the other three. -The non-correlated channel can be changed on a block-by-block basis, so the +The non-correlated component can be changed on a block-by-block basis, so the compressor can dynamically adjust the coding based on the data present in the image. This means that there is no need for non-correlated data to be stored -in a specific channel in the input image. +in a specific component in the input image. -It is however worth noting that the alpha channel is treated differently to -the RGB color channels in some circumstances: +It is however worth noting that the alpha component is treated differently to +the RGB color components in some circumstances: -* When coding for sRGB the alpha channel will always be stored in linear space. -* When coding for HDR the alpha channel can optionally be kept as LDR data. +* When coding for sRGB the alpha component will always be stored in linear + space. +* When coding for HDR the alpha component can optionally be kept as LDR data. ## Encoding normal maps @@ -155,21 +183,21 @@ BC5; store the X and Y components of a unit-length normal. The Z component of the normal can be reconstructed in shader code based on the knowledge that the vector is unit length. -To encode this we therefore want to store two input channels and should -therefore use the `rrrg` coding swizzle, and the `.ga` sampling swizzle. The -OpenGL ES shader code for reconstruction of the Z value is: +To encode this we need to store only two input components in the compressed +data, and therefore use the `rrrg` coding swizzle to align the data with the +ASTC luminance+alpha endpoint. We can sample this in shader code using the +`.ga` sampling swizzle, and reconstruct the Z value with: vec3 nml; nml.xy = texture(...).ga; // Load normals (range 0 to 1) nml.xy = nml.xy * 2.0 - 1.0; // Unpack normals (range -1 to +1) nml.z = sqrt(1 - dot(nml.xy, nml.xy)); // Compute Z, given unit length -In addition to this it is useful to optimize for angular error in the resulting -vector rather than for absolute color error in the data, which improves the -perceptual quality of the image. - -Both the encoding swizzle and the angular error function are enabled by using -the `-normal` command line option. +The encoding swizzle and appropriate component weighting is enabled by using +the `-normal` command line option. If you wish to use a different pair of +components you can specify a custom swizzle after setting the `-normal` +parameter. For example, to match BC5n component ordering use +`-normal -esw gggr` for compression and `-normal -dsw arz1` for decompression. ## Encoding sRGB data @@ -182,8 +210,8 @@ For color data it is nearly always a perceptual quality win to use sRGB input source textures that are then compressed using the ASTC sRGB compression mode (compress using the `-cs` command line option rather than the `-cl` command line option). Note that sRGB gamma correction is only applied to the RGB -channels during decode; the alpha channel is always treated as linear encoded -data. +components during decode; the alpha component is always treated as linear +encoded data. *Important:* The uncompressed input texture provided on the command line must be stored in the sRGB color space for `-cs` to function correctly. @@ -191,17 +219,17 @@ be stored in the sRGB color space for `-cs` to function correctly. ## Encoding HDR data HDR data can be encoded just like LDR data, but with some caveats around -handling the alpha channel. +handling the alpha component. -For many use cases the alpha channel is an actual alpha opacity channel and is -therefore used for storing an LDR value between 0 and 1. For these cases use -the `-ch` compressor option which will treat the RGB channels as HDR, but the -A channel as LDR. +For many use cases the alpha component is an actual alpha opacity component and +is therefore used for storing an LDR value between 0 and 1. For these cases use +the `-ch` compressor option which will treat the RGB components as HDR, but the +A component as LDR. -For other use cases the alpha channel is simply a fourth data channel which is -also storing an HDR value. For these cases use the `-cH` compressor option -which will treat all channels as HDR data. +For other use cases the alpha component is simply a fourth data component which +is also storing an HDR value. For these cases use the `-cH` compressor option +which will treat all components as HDR data. - - - -_Copyright © 2019-2022, Arm Limited and contributors. All rights reserved._ +_Copyright © 2019-2024, Arm Limited and contributors. All rights reserved._ diff --git a/Docs/Testing.md b/Docs/Testing.md index 2cef276b2a65e1e75489a2587cf07f98ec494ee8..da197fc14478f180829f8125ae8c939ab77ce139 100644 --- a/Docs/Testing.md +++ b/Docs/Testing.md @@ -20,8 +20,8 @@ We support a small (but growing) number of C++ unit tests, which are written using the `googletest` framework and integrated in the CMake "CTest" test framework. -To build unit tests pull the `googletest` git submodule and add `-DUNITTEST=ON` -to the CMake command line when configuring. +To build unit tests pull the `googletest` git submodule and add +`-DASTCENC_UNITTEST=ON` to the CMake command line when configuring. To run unit tests use the CMake `ctest` utility from your build directory after you have built the tests. diff --git a/README.OpenSource b/README.OpenSource index f16f25e56e08e2e93f1803bc90a4b51f975f3578..66f0d644f0e00f92cfc3fa5f26856594c46a62af 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,7 +3,7 @@ "Name":"astc-encoder", "License":"Apache 2.0 License", "License File":"LICENSE", - "Version Number":"3.7", + "Version Number":"4.7", "Owner":"wangyonglang@huawei.com", "Upstream URL":"https://github.com/ARM-software/astc-encoder.git", "Description":"The Arm Adaptive Scalable Texture Compression (ASTC) Encoder,astcenc,is a command-line tool for compressing and decompressing images using the ASTC texture compression standard." diff --git a/README.md b/README.md index 1566473f590174b22251f86d89cbd35a2b4fc0ac..ce23b02088a3436c753f9ba4ad266e627b91fc9f 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # About -This is the official repository for the Arm® Adaptive Scalable Texture -Compression (ASTC) Encoder, `astcenc`, a command-line tool for compressing -and decompressing images using the ASTC texture compression standard. +The Arm® Adaptive Scalable Texture Compression (ASTC) Encoder, `astcenc`, is +a command-line tool for compressing and decompressing images using the ASTC +texture compression standard. ## The ASTC format The ASTC compressed data format, developed by Arm® and AMD, has been adopted as -an official extension to the Open GL®, OpenGL ES, and Vulkan® graphics APIs. It +an official extension to the OpenGL®, OpenGL ES, and Vulkan® graphics APIs. It provides a major step forward in terms of both the image quality at a given bitrate, and the format and bitrate flexibility available to content creators. This allows more assets to use compression, often at a reduced bitrate compared @@ -20,7 +20,7 @@ read the full [Khronos Data Format Specification][2] for all the details. This project is licensed under the Apache 2.0 license. By downloading any component from this repository you acknowledge that you accept terms specified -in the [LICENSE](LICENSE) file. +in the [LICENSE.txt](LICENSE.txt) file. # Encoder feature support @@ -33,8 +33,8 @@ dynamic range (BMP, PNG, TGA), high dynamic range (EXR, HDR), or DDS and KTX wrapped output images. The encoder allows control over the compression time/quality tradeoff with -`exhaustive`, `thorough`, `medium`, `fast`, and `fastest` encoding quality -presets. +`exhaustive`, `verythorough`, `thorough`, `medium`, `fast`, and `fastest` +encoding quality presets. The encoder allows compression time and quality analysis by reporting the compression time, and the Peak Signal-to-Noise Ratio (PSNR) between the input @@ -58,15 +58,15 @@ from 0.89 bits/pixel up to 8 bits/pixel. Release build binaries for the `astcenc` stable releases are provided in the [GitHub Releases page][3]. -**Latest 3.x stable release:** 3.7 +* Change log: [4.x series](./Docs/ChangeLog-4x.md) * Change log: [3.x series](./Docs/ChangeLog-3x.md) -**Latest 2.x stable release:** 2.5 -* Change log: [2.x series](./Docs/ChangeLog-2x.md) +Binaries are provided for 64-bit builds on Windows, macOS, and Linux. -Binaries are provided for 64-bit builds on Windows, macOS, and Linux. The -builds of the astcenc are provided as multiple binaries, each tuned for a -specific SIMD instruction set. +## Windows and Linux + +For Windows and Linux the builds of the astcenc are provided as multiple +binaries, each tuned for a specific SIMD instruction set. For x86-64 we provide, in order of increasing performance: @@ -78,23 +78,33 @@ 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 Apple silicon macOS devices we provide: +For Arm, if binaries are available, we provide: * `astcenc-neon` - uses NEON +## macOS + +For macOS devices we provide a single universal binary `astcenc`, which allows +the OS to automatically use the correct binary variant for the current host +machine. Support is provided for three architecture slices: + +* `x86_64` - uses the `astcenc-sse4.1` build defined above. +* `x86_64h` - uses the `astcenc-avx2` build defined above. +* `arm64` - uses the `astcenc-neon` build defined above. ## Repository branches The `main` branch is an active development branch for the compressor. It aims -to be a stable branch, but as it is used for ongoing development expect it to -have some volatility. +to be a stable branch for the latest major release series, but as it is used +for ongoing development expect it to have some volatility. We recommend using +the latest stable release tag for production development. -The `2.x` branch is a stable branch for the 2.x release series. It is no longer -under active development, but is a supported branch that will continue to get +The `3.x` branch is a stable branch for the 3.x release series. It is no longer +under active development, but is a supported branch that continues to get backported bug fixes. -The `1.x` branch is a stable branch for the 1.x release series. It is no longer -under active development or getting bug fixes. +The `1.x` and `2.x` branches are stable branches for older releases. They are +no longer under active development or getting bug fixes. Any other branches you might find are development branches for new features or optimizations, so might be interesting to play with but should be considered @@ -135,6 +145,11 @@ The modes available are: * `-ch` : use the HDR color profile, tuned for HDR RGB and LDR A. * `-cH` : use the HDR color profile, tuned for HDR RGBA. +If you intend to use the resulting image with the decode mode extensions to +limit the decompressed precision to UNORM8, it is recommended that you also +specify the `-decode_unorm8` flag. This will ensure that the compressor uses +the correct rounding rules when choosing encodings. + ## Decompressing an image Decompress an image using the `-dl` \ `-ds` \ `-dh` \ `-dH` modes. For example: @@ -180,11 +195,6 @@ The compression speed can be controlled from `-fastest`, through `-fast`, encoder has to spend looking for good encodings the better the results, but it does result in increasingly small improvements for the amount of time required. -:warning: The `-fastest` quality preset is designed for quickly roughing-out -new content. It is tuned to give the fastest possible compression, often at the -expense of significant image quality loss compared to `-fast`. We do not -recommend using it for production builds. - There are many other command line options for tuning the encoder parameters which can be used to fine tune the compression algorithm. See the command line help message for more details. @@ -203,6 +213,9 @@ It covers: * How to efficiently encode normal maps, sRGB data, and HDR data. * Coding equivalents to other compression formats. +The [ASTC Developer Guide][5] document (external link) provides a more detailed +guide for developers using the `astcenc` compressor. + The [.astc File Format](./Docs/FileFormat.md) page provides a light-weight specification for the `.astc` file format and how to read or write it. @@ -217,10 +230,16 @@ how to test any modifications to the source code in this repository. If you have issues with the `astcenc` encoder, or questions about the ASTC texture format itself, please raise them in the GitHub issue tracker. +If you have any questions about Arm GPUs, application development for Arm GPUs, +or general mobile graphics development or technology please submit them on the +[Arm Community graphics forums][4]. + - - - -_Copyright © 2013-2022, Arm Limited and contributors. All rights reserved._ +_Copyright © 2013-2024, 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 [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 diff --git a/README_zh.md b/README_zh.md index 3767345ff6630b20e4c9954a39ea305de8f9fc33..f5d1a5baed6f6c91394330a8bc034183e15ed398 100644 --- a/README_zh.md +++ b/README_zh.md @@ -41,7 +41,7 @@ astc-encoder引入openharmony的thirdparty目录下， ``` ./build.sh --product-name rk3568 --ccache ``` -编译生成物对应路径：`out/rk3568/thirdparty/astc-encoder/libastc_encoder_shared.so`。 +编译生成物对应路径：`out/rk3568/thirdparty/astc-encoder/libastc_encoder_shared.z.so`。 ## 许可证 diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index a90fa27d9fceb9d9e943b81f736978d1c1a86fda..4acbc95b5a9cb39d017e49f27d2e029cde94d4aa 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ---------------------------------------------------------------------------- -# Copyright 2020-2021 Arm Limited +# Copyright 2020-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -17,45 +17,80 @@ # 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 ${CLI}) +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND ${ASTCENC_CLI}) set(CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto") endif() -if(${DECOMPRESSOR}) - set(CODEC dec) +if(${ASTCENC_DECOMPRESSOR}) + set(ASTCENC_CODEC dec) else() - set(CODEC enc) + set(ASTCENC_CODEC enc) endif() -if(${UNIVERSAL_BUILD}) - if(${ISA_AVX2}) - set(ISA_SIMD "avx2") - elseif(${ISA_SSE41}) - set(ISA_SIMD "sse4.1") - elseif(${ISA_SSE2}) - set(ISA_SIMD "sse2") - endif() - include(cmake_core.cmake) -else() - set(ARTEFACTS native none neon avx2 sse4.1 sse2) - set(CONFIGS ${ISA_NATIVE} ${ISA_NONE} ${ISA_NEON} ${ISA_AVX2} ${ISA_SSE41} ${ISA_SSE2}) - list(LENGTH ARTEFACTS ARTEFACTS_LEN) - math(EXPR ARTEFACTS_LEN "${ARTEFACTS_LEN} - 1") - - foreach(INDEX RANGE ${ARTEFACTS_LEN}) - list(GET ARTEFACTS ${INDEX} ARTEFACT) - list(GET CONFIGS ${INDEX} CONFIG) - if(${CONFIG}) - set(ISA_SIMD ${ARTEFACT}) - include(cmake_core.cmake) +set(ASTCENC_ARTIFACTS native none neon avx2 sse4.1 sse2) +set(ASTCENC_CONFIGS ${ASTCENC_ISA_NATIVE} ${ASTCENC_ISA_NONE} ${ASTCENC_ISA_NEON} ${ASTCENC_ISA_AVX2} ${ASTCENC_ISA_SSE41} ${ASTCENC_ISA_SSE2}) +list(LENGTH ASTCENC_ARTIFACTS ASTCENC_ARTIFACTS_LEN) +math(EXPR ASTCENC_ARTIFACTS_LEN "${ASTCENC_ARTIFACTS_LEN} - 1") + +foreach(INDEX RANGE ${ASTCENC_ARTIFACTS_LEN}) + list(GET ASTCENC_ARTIFACTS ${INDEX} ASTCENC_ARTIFACT) + list(GET ASTCENC_CONFIGS ${INDEX} ASTCENC_CONFIG) + if(${ASTCENC_CONFIG}) + set(ASTCENC_ISA_SIMD ${ASTCENC_ARTIFACT}) + + if(${ASTCENC_ISA_SIMD} MATCHES "neon") + set(CMAKE_OSX_ARCHITECTURES arm64) + elseif(${ASTCENC_ISA_SIMD} MATCHES "avx2") + set(CMAKE_OSX_ARCHITECTURES x86_64h) + elseif(NOT ${ASTCENC_ISA_SIMD} MATCHES "none") + set(CMAKE_OSX_ARCHITECTURES x86_64) endif() - endforeach() + + include(cmake_core.cmake) + endif() +endforeach() + +if(${ASTCENC_CLI} AND ${ASTCENC_UNIVERSAL_BUILD}) + add_custom_target( + astc${ASTCENC_CODEC} + ALL + COMMAND + lipo -create -output $/astc${ASTCENC_CODEC} -arch x86_64 $ -arch x86_64h $ -arch arm64 $ + VERBATIM) + + add_dependencies( + astc${ASTCENC_CODEC} + astc${ASTCENC_CODEC}-sse4.1 + astc${ASTCENC_CODEC}-avx2 + astc${ASTCENC_CODEC}-neon) + + install(PROGRAMS $/astc${ASTCENC_CODEC} + DESTINATION bin) +endif() + +if(${ASTCENC_SHAREDLIB} AND ${ASTCENC_UNIVERSAL_BUILD}) + add_custom_target( + astc${ASTCENC_CODEC}-shared + ALL + COMMAND + lipo -create -output $/libastc${ASTCENC_CODEC}-shared.dylib -arch x86_64 $ -arch x86_64h $ -arch arm64 $ + VERBATIM) + + add_dependencies( + astc${ASTCENC_CODEC}-shared + astc${ASTCENC_CODEC}-sse4.1-shared + astc${ASTCENC_CODEC}-avx2-shared + astc${ASTCENC_CODEC}-neon-shared) + + install(PROGRAMS $/libastc${ASTCENC_CODEC}-shared.dylib + DESTINATION lib) endif() # - - - - - - - - - - - - - - - - - - # Unit testing -if(${UNITTEST}) +if(${ASTCENC_UNITTEST}) set(INSTALL_GTEST OFF CACHE BOOL "" FORCE) + set(CMAKE_OSX_ARCHITECTURES x86_64;arm64) add_subdirectory(GoogleTest) enable_testing() add_subdirectory(UnitTest) diff --git a/Source/Fuzzers/fuzz_astc_physical_to_symbolic.cpp b/Source/Fuzzers/fuzz_astc_physical_to_symbolic.cpp index 67ef24bc8a4ed8602987cea4dfdf1f419f00c0ab..e387108b2f19fe93716790f33c5fd12534c56dde 100644 --- a/Source/Fuzzers/fuzz_astc_physical_to_symbolic.cpp +++ b/Source/Fuzzers/fuzz_astc_physical_to_symbolic.cpp @@ -94,9 +94,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) int i = stream.ConsumeIntegralInRange(0, testSz.size() - 1); // Populate the physical block - physical_compressed_block pcb; + uint8_t pcb[16]; std::vector buffer = stream.ConsumeBytes(16); - std::memcpy(&pcb, buffer.data(), 16); + std::memcpy(pcb, buffer.data(), 16); // Call the function under test symbolic_compressed_block scb; diff --git a/Source/UnitTest/CMakeLists.txt b/Source/UnitTest/CMakeLists.txt index e1e2d0b4d2b6a0b6f449ab2bbf16a73ae5abfac6..a65dc47dcb9a6d28f02a85faa03924030f0d3568 100644 --- a/Source/UnitTest/CMakeLists.txt +++ b/Source/UnitTest/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ---------------------------------------------------------------------------- -# Copyright 2020-2021 Arm Limited +# Copyright 2020-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -15,27 +15,25 @@ # under the License. # ---------------------------------------------------------------------------- -if(${UNIVERSAL_BUILD}) - if(${ISA_AVX2}) - set(ISA_SIMD "avx2") - elseif(${ISA_SSE41}) - set(ISA_SIMD "sse4.1") - elseif(${ISA_SSE2}) - set(ISA_SIMD "sse2") - endif() - include(cmake_core.cmake) -else() - set(ARTEFACTS native none neon avx2 sse4.1 sse2) - set(CONFIGS ${ISA_NATIVE} ${ISA_NONE} ${ISA_NEON} ${ISA_AVX2} ${ISA_SSE41} ${ISA_SSE2}) - list(LENGTH ARTEFACTS ARTEFACTS_LEN) - math(EXPR ARTEFACTS_LEN "${ARTEFACTS_LEN} - 1") +set(ASTCENC_ARTIFACTS native none neon avx2 sse4.1 sse2) +set(ASTCENC_CONFIGS ${ASTCENC_ISA_NATIVE} ${ASTCENC_ISA_NONE} ${ASTCENC_ISA_NEON} ${ASTCENC_ISA_AVX2} ${ASTCENC_ISA_SSE41} ${ASTCENC_ISA_SSE2}) +list(LENGTH ASTCENC_ARTIFACTS ASTCENC_ARTIFACTS_LEN) +math(EXPR ASTCENC_ARTIFACTS_LEN "${ASTCENC_ARTIFACTS_LEN} - 1") + +foreach(INDEX RANGE ${ASTCENC_ARTIFACTS_LEN}) + list(GET ASTCENC_ARTIFACTS ${INDEX} ASTCENC_ARTIFACT) + list(GET ASTCENC_CONFIGS ${INDEX} ASTCENC_CONFIG) + if(${ASTCENC_CONFIG}) + set(ASTCENC_ISA_SIMD ${ASTCENC_ARTIFACT}) - foreach(INDEX RANGE ${ARTEFACTS_LEN}) - list(GET ARTEFACTS ${INDEX} ARTEFACT) - list(GET CONFIGS ${INDEX} CONFIG) - if(${CONFIG}) - set(ISA_SIMD ${ARTEFACT}) - include(cmake_core.cmake) + if(${ASTCENC_ISA_SIMD} MATCHES "neon") + set(CMAKE_OSX_ARCHITECTURES arm64) + elseif(${ASTCENC_ISA_SIMD} MATCHES "avx2") + set(CMAKE_OSX_ARCHITECTURES x86_64h) + elseif(NOT ${ASTCENC_ISA_SIMD} MATCHES "none") + set(CMAKE_OSX_ARCHITECTURES x86_64) endif() - endforeach() -endif() + + include(cmake_core.cmake) + endif() +endforeach() diff --git a/Source/UnitTest/cmake_core.cmake b/Source/UnitTest/cmake_core.cmake index 656f352c2ed9c826680dc801c8ae67bc4789ba0b..2fb7a4d707c8c9f2aa3712233bf2ce1150718ea8 100644 --- a/Source/UnitTest/cmake_core.cmake +++ b/Source/UnitTest/cmake_core.cmake @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ---------------------------------------------------------------------------- -# Copyright 2020-2021 Arm Limited +# Copyright 2020-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -15,25 +15,34 @@ # under the License. # ---------------------------------------------------------------------------- -if(${UNIVERSAL_BUILD}) - set(ASTC_TEST test-unit) -else() - set(ASTC_TEST test-unit-${ISA_SIMD}) -endif() +set(ASTCENC_TEST test-unit-${ASTCENC_ISA_SIMD}) + +add_executable(${ASTCENC_TEST}) -add_executable(${ASTC_TEST}) +# 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}) + set_property(TARGET ${ASTCENC_TEST} + PROPERTY + INTERPROCEDURAL_OPTIMIZATION_RELEASE True) +endif() -target_sources(${ASTC_TEST} +target_sources(${ASTCENC_TEST} PRIVATE test_simd.cpp test_softfloat.cpp + test_decode.cpp ../astcenc_mathlib_softfloat.cpp) -target_include_directories(${ASTC_TEST} +target_include_directories(${ASTCENC_TEST} PRIVATE ${gtest_SOURCE_DIR}/include) -target_compile_options(${ASTC_TEST} +target_link_libraries(${ASTCENC_TEST} + PRIVATE + astcenc-${ASTCENC_ISA_SIMD}-static) + +target_compile_options(${ASTCENC_TEST} PRIVATE # Use pthreads on Linux/macOS $<$:-pthread> @@ -47,92 +56,83 @@ target_compile_options(${ASTC_TEST} $<$>:-Wpedantic> $<$>:-Werror> $<$>:-Wshadow> - $<$>:-Wdouble-promotion>) + $<$>:-Wno-c++98-compat-pedantic> + $<$>:-Wno-c++98-c++11-compat-pedantic> + $<$>:-Wno-float-equal> + + # Ignore things that the googletest build triggers + $<$>:-Wno-unknown-warning-option> + $<$>:-Wno-double-promotion> + $<$>:-Wno-undef> + $<$>:-Wno-reserved-identifier> + $<$>:-Wno-global-constructors>) # Set up configuration for SIMD ISA builds -if(${ISA_SIMD} MATCHES "none") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${ASTC_TEST} - PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=0 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) - endif() - -elseif(${ISA_SIMD} MATCHES "neon") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${ASTC_TEST} - PRIVATE - ASTCENC_NEON=1 - ASTCENC_SSE=0 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) - endif() - -elseif(${ISA_SIMD} MATCHES "sse2") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${ASTC_TEST} - PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=20 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) - endif() - - target_compile_options(${ASTC_TEST} +if(${ASTCENC_ISA_SIMD} MATCHES "none") + target_compile_definitions(${ASTCENC_TEST} PRIVATE - $<$:-mfpmath=sse -msse2>) - -elseif(${ISA_SIMD} MATCHES "sse4.1") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${ASTC_TEST} - PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=41 - ASTCENC_AVX=0 - ASTCENC_POPCNT=1 - ASTCENC_F16C=0) - endif() - - target_compile_options(${ASTC_TEST} + ASTCENC_NEON=0 + ASTCENC_SSE=0 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) + +elseif(${ASTCENC_ISA_SIMD} MATCHES "neon") + target_compile_definitions(${ASTCENC_TEST} PRIVATE - $<$>:-mfpmath=sse -msse4.1 -mpopcnt>) - -elseif(${ISA_SIMD} MATCHES "avx2") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${ASTC_TEST} - PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=41 - ASTCENC_AVX=2 - ASTCENC_POPCNT=1 - ASTCENC_F16C=1) - endif() - - target_compile_options(${ASTC_TEST} + ASTCENC_NEON=1 + ASTCENC_SSE=0 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) + +elseif(${ASTCENC_ISA_SIMD} MATCHES "sse2") + target_compile_definitions(${ASTCENC_TEST} PRIVATE - $<$>:-mfpmath=sse -mavx2 -mpopcnt -mf16c> - $<$:/arch:AVX2>) + ASTCENC_NEON=0 + ASTCENC_SSE=20 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) -endif() + target_compile_options(${ASTCENC_TEST} + PRIVATE + $<$:-msse2>) -target_compile_options(${ASTC_TEST} - PRIVATE - $<$:-fsanitize=undefined>) +elseif(${ASTCENC_ISA_SIMD} MATCHES "sse4.1") + target_compile_definitions(${ASTCENC_TEST} + PRIVATE + ASTCENC_NEON=0 + ASTCENC_SSE=41 + ASTCENC_AVX=0 + ASTCENC_POPCNT=1 + ASTCENC_F16C=0) -target_link_options(${ASTC_TEST} - PRIVATE - $<$:-fsanitize=undefined>) + target_compile_options(${ASTCENC_TEST} + PRIVATE + $<$>:-msse4.1 -mpopcnt>) + +elseif(${ASTCENC_ISA_SIMD} MATCHES "avx2") + target_compile_definitions(${ASTCENC_TEST} + PRIVATE + ASTCENC_NEON=0 + ASTCENC_SSE=41 + ASTCENC_AVX=2 + ASTCENC_POPCNT=1 + ASTCENC_F16C=1) + + target_compile_options(${ASTCENC_TEST} + PRIVATE + $<$>:-mavx2 -mpopcnt -mf16c> + $<$:/arch:AVX2>) + +endif() -target_link_libraries(${ASTC_TEST} +target_link_libraries(${ASTCENC_TEST} PRIVATE gtest_main) -add_test(NAME ${ASTC_TEST} - COMMAND ${ASTC_TEST}) +add_test(NAME ${ASTCENC_TEST} + COMMAND ${ASTCENC_TEST}) -install(TARGETS ${ASTC_TEST} DESTINATION ${PACKAGE_ROOT}) +install(TARGETS ${ASTCENC_TEST}) diff --git a/Source/UnitTest/test_decode.cpp b/Source/UnitTest/test_decode.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e1364b662c2e9fa4ec841ac6cd42e78af2f06ebc --- /dev/null +++ b/Source/UnitTest/test_decode.cpp @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: Apache-2.0 +// ---------------------------------------------------------------------------- +// Copyright 2023 Arm Limited +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations +// under the License. +// ---------------------------------------------------------------------------- + +/** + * @brief Unit tests for the vectorized SIMD functionality. + */ + +#include + +#include "gtest/gtest.h" + +#include "../astcenc.h" + +namespace astcenc +{ + +/** @brief Test harness for exploring issue #447. */ +TEST(decode, decode12x12) +{ + astcenc_error status; + astcenc_config config; + astcenc_context* context; + + static const astcenc_swizzle swizzle { + ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A + }; + + uint8_t data[16] { +#if 0 + 0x84,0x00,0x38,0xC8,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0xB3,0x4D,0x78 +#else + 0x29,0x00,0x1A,0x97,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0xCF,0x97,0x86 +#endif + }; + + uint8_t output[12*12*4]; + astcenc_config_init(ASTCENC_PRF_LDR, 12, 12, 1, ASTCENC_PRE_MEDIUM, 0, &config); + + status = astcenc_context_alloc(&config, 1, &context); + EXPECT_EQ(status, ASTCENC_SUCCESS); + + astcenc_image image; + image.dim_x = 12; + image.dim_y = 12; + image.dim_z = 1; + image.data_type = ASTCENC_TYPE_U8; + uint8_t* slices = output; + image.data = reinterpret_cast(&slices); + + status = astcenc_decompress_image(context, data, 16, &image, &swizzle, 0); + EXPECT_EQ(status, ASTCENC_SUCCESS); + + for (int y = 0; y < 12; y++) + { + for (int x = 0; x < 12; x++) + { + uint8_t* pixel = output + (12 * 4 * y) + (4 * x); + printf("[%2dx%2d] = %03d, %03d, %03d, %03d\n", x, y, pixel[0], pixel[1], pixel[2], pixel[3]); + } + } +} + +} diff --git a/Source/UnitTest/test_simd.cpp b/Source/UnitTest/test_simd.cpp index 37315b132520fd9e5bae62d6ee196d546578cd2d..9424c9952a1b4eb003675383a87cf0a76368f6e3 100644 --- a/Source/UnitTest/test_simd.cpp +++ b/Source/UnitTest/test_simd.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2020-2022 Arm Limited +// Copyright 2020-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -31,15 +31,15 @@ namespace astcenc // Misc utility tests - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static int round_down(int x) +static unsigned int round_down(unsigned int x) { - int remainder = x % ASTCENC_SIMD_WIDTH; + unsigned int remainder = x % ASTCENC_SIMD_WIDTH; return x - remainder; } -static int round_up(int x) +static unsigned int round_up(unsigned int x) { - int remainder = x % ASTCENC_SIMD_WIDTH; + unsigned int remainder = x % ASTCENC_SIMD_WIDTH; if (!remainder) { return x; @@ -52,9 +52,9 @@ static int round_up(int x) TEST(misc, RoundDownVLA) { // Static ones which are valid for all VLA widths - EXPECT_EQ(round_down_to_simd_multiple_vla(0), 0); - EXPECT_EQ(round_down_to_simd_multiple_vla(8), 8); - EXPECT_EQ(round_down_to_simd_multiple_vla(16), 16); + EXPECT_EQ(round_down_to_simd_multiple_vla(0), 0u); + EXPECT_EQ(round_down_to_simd_multiple_vla(8), 8u); + EXPECT_EQ(round_down_to_simd_multiple_vla(16), 16u); // Variable ones which depend on VLA width EXPECT_EQ(round_down_to_simd_multiple_vla(3), round_down(3)); @@ -67,9 +67,9 @@ TEST(misc, RoundDownVLA) TEST(misc, RoundUpVLA) { // Static ones which are valid for all VLA widths - EXPECT_EQ(round_up_to_simd_multiple_vla(0), 0); - EXPECT_EQ(round_up_to_simd_multiple_vla(8), 8); - EXPECT_EQ(round_up_to_simd_multiple_vla(16), 16); + EXPECT_EQ(round_up_to_simd_multiple_vla(0), 0u); + EXPECT_EQ(round_up_to_simd_multiple_vla(8), 8u); + EXPECT_EQ(round_up_to_simd_multiple_vla(16), 16u); // Variable ones which depend on VLA width EXPECT_EQ(round_up_to_simd_multiple_vla(3), round_up(3)); @@ -540,27 +540,27 @@ TEST(vfloat4, ceq) vfloat4 a1(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b1(0.1f, 0.2f, 0.3f, 0.4f); vmask4 r1 = a1 == b1; - EXPECT_EQ(0, mask(r1)); + EXPECT_EQ(0u, mask(r1)); EXPECT_EQ(false, any(r1)); EXPECT_EQ(false, all(r1)); vfloat4 a2(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b2(1.0f, 0.2f, 0.3f, 0.4f); vmask4 r2 = a2 == b2; - EXPECT_EQ(0x1, mask(r2)); + EXPECT_EQ(0x1u, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vfloat4 a3(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b3(1.0f, 0.2f, 3.0f, 0.4f); vmask4 r3 = a3 == b3; - EXPECT_EQ(0x5, mask(r3)); + EXPECT_EQ(0x5u, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vfloat4 a4(1.0f, 2.0f, 3.0f, 4.0f); vmask4 r4 = a4 == a4; - EXPECT_EQ(0xF, mask(r4)); + EXPECT_EQ(0xFu, mask(r4)); EXPECT_EQ(true, any(r4)); EXPECT_EQ(true, all(r4)); } @@ -571,27 +571,27 @@ TEST(vfloat4, cne) vfloat4 a1(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b1(0.1f, 0.2f, 0.3f, 0.4f); vmask4 r1 = a1 != b1; - EXPECT_EQ(0xF, mask(r1)); + EXPECT_EQ(0xFu, mask(r1)); EXPECT_EQ(true, any(r1)); EXPECT_EQ(true, all(r1)); vfloat4 a2(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b2(1.0f, 0.2f, 0.3f, 0.4f); vmask4 r2 = a2 != b2; - EXPECT_EQ(0xE, mask(r2)); + EXPECT_EQ(0xEu, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vfloat4 a3(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b3(1.0f, 0.2f, 3.0f, 0.4f); vmask4 r3 = a3 != b3; - EXPECT_EQ(0xA, mask(r3)); + EXPECT_EQ(0xAu, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vfloat4 a4(1.0f, 2.0f, 3.0f, 4.0f); vmask4 r4 = a4 != a4; - EXPECT_EQ(0, mask(r4)); + EXPECT_EQ(0u, mask(r4)); EXPECT_EQ(false, any(r4)); EXPECT_EQ(false, all(r4)); } @@ -602,7 +602,7 @@ TEST(vfloat4, clt) vfloat4 a(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b(0.9f, 2.1f, 3.0f, 4.1f); vmask4 r = a < b; - EXPECT_EQ(0xA, mask(r)); + EXPECT_EQ(0xAu, mask(r)); } /** @brief Test vfloat4 cle. */ @@ -611,7 +611,7 @@ TEST(vfloat4, cle) vfloat4 a(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b(0.9f, 2.1f, 3.0f, 4.1f); vmask4 r = a <= b; - EXPECT_EQ(0xE, mask(r)); + EXPECT_EQ(0xEu, mask(r)); } /** @brief Test vfloat4 cgt. */ @@ -620,7 +620,7 @@ TEST(vfloat4, cgt) vfloat4 a(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b(0.9f, 2.1f, 3.0f, 4.1f); vmask4 r = a > b; - EXPECT_EQ(0x1, mask(r)); + EXPECT_EQ(0x1u, mask(r)); } /** @brief Test vfloat4 cge. */ @@ -629,7 +629,7 @@ TEST(vfloat4, cge) vfloat4 a(1.0f, 2.0f, 3.0f, 4.0f); vfloat4 b(0.9f, 2.1f, 3.0f, 4.1f); vmask4 r = a >= b; - EXPECT_EQ(0x5, mask(r)); + EXPECT_EQ(0x5u, mask(r)); } /** @brief Test vfloat4 min. */ @@ -894,7 +894,8 @@ TEST(vfloat4, select) /** @brief Test vfloat4 select MSB only. */ TEST(vfloat4, select_msb) { - vint4 msb(0x80000000, 0, 0x80000000, 0); + int msb_set = static_cast(0x80000000); + vint4 msb(msb_set, 0, msb_set, 0); vmask4 cond(msb.m); vfloat4 a(1.0f, 3.0f, 3.0f, 1.0f); @@ -929,7 +930,7 @@ TEST(vfloat4, gatherf) /** @brief Test vfloat4 storea. */ TEST(vfloat4, storea) { - alignas(16) float out[4]; + ASTCENC_ALIGNAS float out[4]; vfloat4 a(f32_data); storea(a, out); EXPECT_EQ(out[0], 0.0f); @@ -941,7 +942,7 @@ TEST(vfloat4, storea) /** @brief Test vfloat4 store. */ TEST(vfloat4, store) { - alignas(16) float out[5]; + ASTCENC_ALIGNAS float out[5]; vfloat4 a(f32_data); store(a, &(out[1])); EXPECT_EQ(out[1], 0.0f); @@ -1439,27 +1440,27 @@ TEST(vint4, ceq) vint4 a1(1, 2, 3, 4); vint4 b1(0, 1, 2, 3); vmask4 r1 = a1 == b1; - EXPECT_EQ(0, mask(r1)); + EXPECT_EQ(0u, mask(r1)); EXPECT_EQ(false, any(r1)); EXPECT_EQ(false, all(r1)); vint4 a2(1, 2, 3, 4); vint4 b2(1, 0, 0, 0); vmask4 r2 = a2 == b2; - EXPECT_EQ(0x1, mask(r2)); + EXPECT_EQ(0x1u, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vint4 a3(1, 2, 3, 4); vint4 b3(1, 0, 3, 0); vmask4 r3 = a3 == b3; - EXPECT_EQ(0x5, mask(r3)); + EXPECT_EQ(0x5u, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vint4 a4(1, 2, 3, 4); vmask4 r4 = a4 == a4; - EXPECT_EQ(0xF, mask(r4)); + EXPECT_EQ(0xFu, mask(r4)); EXPECT_EQ(true, any(r4)); EXPECT_EQ(true, all(r4)); } @@ -1470,27 +1471,27 @@ TEST(vint4, cne) vint4 a1(1, 2, 3, 4); vint4 b1(0, 1, 2, 3); vmask4 r1 = a1 != b1; - EXPECT_EQ(0xF, mask(r1)); + EXPECT_EQ(0xFu, mask(r1)); EXPECT_EQ(true, any(r1)); EXPECT_EQ(true, all(r1)); vint4 a2(1, 2, 3, 4); vint4 b2(1, 0, 0, 0); vmask4 r2 = a2 != b2; - EXPECT_EQ(0xE, mask(r2)); + EXPECT_EQ(0xEu, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vint4 a3(1, 2, 3, 4); vint4 b3(1, 0, 3, 0); vmask4 r3 = a3 != b3; - EXPECT_EQ(0xA, mask(r3)); + EXPECT_EQ(0xAu, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vint4 a4(1, 2, 3, 4); vmask4 r4 = a4 != a4; - EXPECT_EQ(0, mask(r4)); + EXPECT_EQ(0u, mask(r4)); EXPECT_EQ(false, any(r4)); EXPECT_EQ(false, all(r4)); } @@ -1501,7 +1502,7 @@ TEST(vint4, clt) vint4 a(1, 2, 3, 4); vint4 b(0, 3, 3, 5); vmask4 r = a < b; - EXPECT_EQ(0xA, mask(r)); + EXPECT_EQ(0xAu, mask(r)); } /** @brief Test vint4 cgt. */ @@ -1510,7 +1511,7 @@ TEST(vint4, cle) vint4 a(1, 2, 3, 4); vint4 b(0, 3, 3, 5); vmask4 r = a > b; - EXPECT_EQ(0x1, mask(r)); + EXPECT_EQ(0x1u, mask(r)); } /** @brief Test vint4 lsl. */ @@ -1544,7 +1545,7 @@ TEST(vint4, lsr) EXPECT_EQ(a.lane<0>(), 1); EXPECT_EQ(a.lane<1>(), 2); EXPECT_EQ(a.lane<2>(), 4); - EXPECT_EQ(a.lane<3>(), 0xFFFFFFFC); + EXPECT_EQ(a.lane<3>(), static_cast(0xFFFFFFFC)); a = lsr<1>(a); EXPECT_EQ(a.lane<0>(), 0); @@ -1681,7 +1682,8 @@ TEST(vint4, hadd_rgb_s) /** @brief Test vint4 clz. */ TEST(vint4, clz) { - vint4 a1(0x80000000, 0x40000000, 0x20000000, 0x10000000); + int msb_set = static_cast(0x80000000); + vint4 a1(msb_set, 0x40000000, 0x20000000, 0x10000000); vint4 r1 = clz(a1); EXPECT_EQ(r1.lane<0>(), 0); EXPECT_EQ(r1.lane<1>(), 1); @@ -1723,7 +1725,7 @@ TEST(vint4, two_to_the_n) /** @brief Test vint4 storea. */ TEST(vint4, storea) { - alignas(16) int out[4]; + ASTCENC_ALIGNAS int out[4]; vint4 a(s32_data); storea(a, out); EXPECT_EQ(out[0], 0); @@ -1735,7 +1737,7 @@ TEST(vint4, storea) /** @brief Test vint4 store. */ TEST(vint4, store) { - alignas(16) int out[5]; + ASTCENC_ALIGNAS int out[5]; vint4 a(s32_data); store(a, &(out[1])); EXPECT_EQ(out[1], 0); @@ -1747,12 +1749,78 @@ TEST(vint4, store) /** @brief Test vint4 store_nbytes. */ TEST(vint4, store_nbytes) { - alignas(16) int out; + ASTCENC_ALIGNAS int out; vint4 a(42, 314, 75, 90); - store_nbytes(a, (uint8_t*)&out); + store_nbytes(a, reinterpret_cast(&out)); EXPECT_EQ(out, 42); } +/** @brief Test vint4 store_lanes_masked. */ +TEST(vint4, store_lanes_masked) +{ + uint8_t resulta[16] { 0 }; + + // Store nothing + vmask4 mask1 = vint4(0) == vint4(1); + vint4 data1 = vint4(1); + + store_lanes_masked(resulta, data1, mask1); + vint4 result1v = vint4::load(resulta); + vint4 expect1v = vint4::zero(); + EXPECT_TRUE(all(result1v == expect1v)); + + // Store half + vmask4 mask2 = vint4(1, 1, 0, 0) == vint4(1); + vint4 data2 = vint4(2); + + store_lanes_masked(resulta, data2, mask2); + vint4 result2v = vint4::load(resulta); + vint4 expect2v = vint4(2, 2, 0, 0); + EXPECT_TRUE(all(result2v == expect2v)); + + // Store all + vmask4 mask3 = vint4(1) == vint4(1); + vint4 data3 = vint4(3); + + store_lanes_masked(resulta, data3, mask3); + vint4 result3v = vint4::load(resulta); + vint4 expect3v = vint4(3); + EXPECT_TRUE(all(result3v == expect3v)); +} + +/** @brief Test vint4 store_lanes_masked to unaligned address. */ +TEST(vint4, store_lanes_masked_unaligned) +{ + uint8_t resulta[17] { 0 }; + + // Store nothing + vmask4 mask1 = vint4(0) == vint4(1); + vint4 data1 = vint4(1); + + store_lanes_masked(resulta + 1, data1, mask1); + vint4 result1v = vint4::load(resulta + 1); + vint4 expect1v = vint4::zero(); + EXPECT_TRUE(all(result1v == expect1v)); + + // Store half + vmask4 mask2 = vint4(1, 1, 0, 0) == vint4(1); + vint4 data2 = vint4(2); + + store_lanes_masked(resulta + 1, data2, mask2); + vint4 result2v = vint4::load(resulta + 1); + vint4 expect2v = vint4(2, 2, 0, 0); + EXPECT_TRUE(all(result2v == expect2v)); + + // Store all + vmask4 mask3 = vint4(1) == vint4(1); + vint4 data3 = vint4(3); + + store_lanes_masked(resulta + 1, data3, mask3); + vint4 result3v = vint4::load(resulta + 1); + vint4 expect3v = vint4(3); + EXPECT_TRUE(all(result3v == expect3v)); +} + /** @brief Test vint4 gatheri. */ TEST(vint4, gatheri) { @@ -1799,38 +1867,38 @@ TEST(vint4, select) /** @brief Test vmask4 scalar literal constructor. */ TEST(vmask4, scalar_literal_construct) { - vfloat4 m1a(0, 0, 0, 0); - vfloat4 m1b(1, 1, 1, 1); + vfloat4 m1a(0.0f, 0.0f, 0.0f, 0.0f); + vfloat4 m1b(1.0f, 1.0f, 1.0f, 1.0f); vmask4 m1(true); vfloat4 r = select(m1a, m1b, m1); - EXPECT_EQ(r.lane<0>(), 1); - EXPECT_EQ(r.lane<1>(), 1); - EXPECT_EQ(r.lane<2>(), 1); - EXPECT_EQ(r.lane<3>(), 1); + EXPECT_EQ(r.lane<0>(), 1.0f); + EXPECT_EQ(r.lane<1>(), 1.0f); + EXPECT_EQ(r.lane<2>(), 1.0f); + EXPECT_EQ(r.lane<3>(), 1.0f); r = select(m1b, m1a, m1); - EXPECT_EQ(r.lane<0>(), 0); - EXPECT_EQ(r.lane<1>(), 0); - EXPECT_EQ(r.lane<2>(), 0); - EXPECT_EQ(r.lane<3>(), 0); + EXPECT_EQ(r.lane<0>(), 0.0f); + EXPECT_EQ(r.lane<1>(), 0.0f); + EXPECT_EQ(r.lane<2>(), 0.0f); + EXPECT_EQ(r.lane<3>(), 0.0f); } /** @brief Test vmask4 literal constructor. */ TEST(vmask4, literal_construct) { - vfloat4 m1a(0, 0, 0, 0); - vfloat4 m1b(1, 1, 1, 1); + vfloat4 m1a(0.0f, 0.0f, 0.0f, 0.0f); + vfloat4 m1b(1.0f, 1.0f, 1.0f, 1.0f); vmask4 m1(true, false, true, false); vfloat4 r = select(m1a, m1b, m1); - EXPECT_EQ(r.lane<0>(), 1); - EXPECT_EQ(r.lane<1>(), 0); - EXPECT_EQ(r.lane<2>(), 1); - EXPECT_EQ(r.lane<3>(), 0); + EXPECT_EQ(r.lane<0>(), 1.0f); + EXPECT_EQ(r.lane<1>(), 0.0f); + EXPECT_EQ(r.lane<2>(), 1.0f); + EXPECT_EQ(r.lane<3>(), 0.0f); } /** @brief Test vmask4 or. */ @@ -1845,7 +1913,7 @@ TEST(vmask4, or) vmask4 m2 = m2a == m2b; vmask4 r = m1 | m2; - EXPECT_EQ(mask(r), 0xB); + EXPECT_EQ(mask(r), 0xBu); } /** @brief Test vmask4 and. */ @@ -1860,7 +1928,7 @@ TEST(vmask4, and) vmask4 m2 = m2a == m2b; vmask4 r = m1 & m2; - EXPECT_EQ(mask(r), 0x2); + EXPECT_EQ(mask(r), 0x2u); } /** @brief Test vmask4 xor. */ @@ -1875,7 +1943,7 @@ TEST(vmask4, xor) vmask4 m2 = m2a == m2b; vmask4 r = m1 ^ m2; - EXPECT_EQ(mask(r), 0x9); + EXPECT_EQ(mask(r), 0x9u); } /** @brief Test vmask4 not. */ @@ -1885,7 +1953,63 @@ TEST(vmask4, not) vfloat4 m1b(1, 1, 1, 1); vmask4 m1 = m1a == m1b; vmask4 r = ~m1; - EXPECT_EQ(mask(r), 0x5); + EXPECT_EQ(mask(r), 0x5u); +} + +/** @brief Test vint4 table permute. */ +TEST(vint4, vtable_8bt_32bi_32entry) +{ + vint4 table0(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f); + vint4 table1(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f); + + vint4 table0p, table1p; + vtable_prepare(table0, table1, table0p, table1p); + + vint4 index(0, 7, 4, 31); + + vint4 result = vtable_8bt_32bi(table0p, table1p, index); + + EXPECT_EQ(result.lane<0>(), 3); + EXPECT_EQ(result.lane<1>(), 4); + EXPECT_EQ(result.lane<2>(), 7); + EXPECT_EQ(result.lane<3>(), 28); +} + +/** @brief Test vint4 table permute. */ +TEST(vint4, vtable_8bt_32bi_64entry) +{ + vint4 table0(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f); + vint4 table1(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f); + vint4 table2(0x20212223, 0x24252627, 0x28292a2b, 0x2c2d2e2f); + vint4 table3(0x30313233, 0x34353637, 0x38393a3b, 0x3c3d3e3f); + + vint4 table0p, table1p, table2p, table3p; + vtable_prepare(table0, table1, table2, table3, table0p, table1p, table2p, table3p); + + vint4 index(0, 7, 38, 63); + + vint4 result = vtable_8bt_32bi(table0p, table1p, table2p, table3p, index); + + EXPECT_EQ(result.lane<0>(), 3); + EXPECT_EQ(result.lane<1>(), 4); + EXPECT_EQ(result.lane<2>(), 37); + EXPECT_EQ(result.lane<3>(), 60); +} + +/** @brief Test vint4 rgba byte interleave. */ +TEST(vint4, interleave_rgba8) +{ + vint4 r(0x01, 0x11, 0x21, 0x31); + vint4 g(0x02, 0x12, 0x22, 0x32); + vint4 b(0x03, 0x13, 0x23, 0x33); + vint4 a(0x04, 0x14, 0x24, 0x34); + + vint4 result = interleave_rgba8(r, g, b, a); + + EXPECT_EQ(result.lane<0>(), 0x04030201); + EXPECT_EQ(result.lane<1>(), 0x14131211); + EXPECT_EQ(result.lane<2>(), 0x24232221); + EXPECT_EQ(result.lane<3>(), 0x34333231); } # if ASTCENC_SIMD_WIDTH == 8 @@ -2142,27 +2266,27 @@ TEST(vfloat8, ceq) vfloat8 a1(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b1(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r1 = a1 == b1; - EXPECT_EQ(0, mask(r1)); + EXPECT_EQ(0u, mask(r1)); EXPECT_EQ(false, any(r1)); EXPECT_EQ(false, all(r1)); vfloat8 a2(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b2(1.0f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r2 = a2 == b2; - EXPECT_EQ(0x1, mask(r2)); + EXPECT_EQ(0x1u, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vfloat8 a3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b3(1.0f, 0.2f, 3.0f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r3 = a3 == b3; - EXPECT_EQ(0x5, mask(r3)); + EXPECT_EQ(0x5u, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vfloat8 a4(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vmask8 r4 = a4 == a4; - EXPECT_EQ(0xFF, mask(r4)); + EXPECT_EQ(0xFFu, mask(r4)); EXPECT_EQ(true, any(r4)); EXPECT_EQ(true, all(r4)); } @@ -2173,27 +2297,27 @@ TEST(vfloat8, cne) vfloat8 a1(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b1(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r1 = a1 != b1; - EXPECT_EQ(0xFF, mask(r1)); + EXPECT_EQ(0xFFu, mask(r1)); EXPECT_EQ(true, any(r1)); EXPECT_EQ(true, all(r1)); vfloat8 a2(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b2(1.0f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r2 = a2 != b2; - EXPECT_EQ(0xFE, mask(r2)); + EXPECT_EQ(0xFEu, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vfloat8 a3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vfloat8 b3(1.0f, 0.2f, 3.0f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f); vmask8 r3 = a3 != b3; - EXPECT_EQ(0xFA, mask(r3)); + EXPECT_EQ(0xFAu, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vfloat8 a4(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); vmask8 r4 = a4 != a4; - EXPECT_EQ(0, mask(r4)); + EXPECT_EQ(0u, mask(r4)); EXPECT_EQ(false, any(r4)); EXPECT_EQ(false, all(r4)); } @@ -2204,7 +2328,7 @@ TEST(vfloat8, clt) vfloat8 a(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f); vfloat8 b(0.9f, 2.1f, 3.0f, 4.1f, 0.9f, 2.1f, 3.0f, 4.1f); vmask8 r = a < b; - EXPECT_EQ(0xAA, mask(r)); + EXPECT_EQ(0xAAu, mask(r)); } /** @brief Test vfloat8 cle. */ @@ -2213,7 +2337,7 @@ TEST(vfloat8, cle) vfloat8 a(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f); vfloat8 b(0.9f, 2.1f, 3.0f, 4.1f, 0.9f, 2.1f, 3.0f, 4.1f); vmask8 r = a <= b; - EXPECT_EQ(0xEE, mask(r)); + EXPECT_EQ(0xEEu, mask(r)); } /** @brief Test vfloat8 cgt. */ @@ -2222,7 +2346,7 @@ TEST(vfloat8, cgt) vfloat8 a(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f); vfloat8 b(0.9f, 2.1f, 3.0f, 4.1f, 0.9f, 2.1f, 3.0f, 4.1f); vmask8 r = a > b; - EXPECT_EQ(0x11, mask(r)); + EXPECT_EQ(0x11u, mask(r)); } /** @brief Test vfloat8 cge. */ @@ -2231,7 +2355,7 @@ TEST(vfloat8, cge) vfloat8 a(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f); vfloat8 b(0.9f, 2.1f, 3.0f, 4.1f, 0.9f, 2.1f, 3.0f, 4.1f); vmask8 r = a >= b; - EXPECT_EQ(0x55, mask(r)); + EXPECT_EQ(0x55u, mask(r)); } /** @brief Test vfloat8 min. */ @@ -2510,7 +2634,8 @@ TEST(vfloat8, select) /** @brief Test vfloat8 select MSB only. */ TEST(vfloat8, select_msb) { - vint8 msb(0x80000000, 0, 0x80000000, 0, 0x80000000, 0, 0x80000000, 0); + int msb_set = static_cast(0x80000000); + vint8 msb(msb_set, 0, msb_set, 0, msb_set, 0, msb_set, 0); vmask8 cond(msb.m); vfloat8 a(1.0f, 3.0f, 3.0f, 1.0f, 1.0f, 3.0f, 3.0f, 1.0f); @@ -2527,7 +2652,6 @@ TEST(vfloat8, select_msb) EXPECT_EQ(r1.lane<6>(), 2.0f); EXPECT_EQ(r1.lane<7>(), 1.0f); - // Select in the other vfloat8 r2 = select(b, a, cond); EXPECT_EQ(r2.lane<0>(), 1.0f); @@ -2867,27 +2991,27 @@ TEST(vint8, ceq) vint8 a1(1, 2, 3, 4, 1, 2, 3, 4); vint8 b1(0, 1, 2, 3, 0, 1, 2, 3); vmask8 r1 = a1 == b1; - EXPECT_EQ(0, mask(r1)); + EXPECT_EQ(0u, mask(r1)); EXPECT_EQ(false, any(r1)); EXPECT_EQ(false, all(r1)); vint8 a2(1, 2, 3, 4, 1, 2, 3, 4); vint8 b2(1, 0, 0, 0, 1, 0, 0, 0); vmask8 r2 = a2 == b2; - EXPECT_EQ(0x11, mask(r2)); + EXPECT_EQ(0x11u, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vint8 a3(1, 2, 3, 4, 1, 2, 3, 4); vint8 b3(1, 0, 3, 0, 1, 0, 3, 0); vmask8 r3 = a3 == b3; - EXPECT_EQ(0x55, mask(r3)); + EXPECT_EQ(0x55u, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vint8 a4(1, 2, 3, 4, 1, 2, 3, 4); vmask8 r4 = a4 == a4; - EXPECT_EQ(0xFF, mask(r4)); + EXPECT_EQ(0xFFu, mask(r4)); EXPECT_EQ(true, any(r4)); EXPECT_EQ(true, all(r4)); } @@ -2898,27 +3022,27 @@ TEST(vint8, cne) vint8 a1(1, 2, 3, 4, 1, 2, 3, 4); vint8 b1(0, 1, 2, 3, 0, 1, 2, 3); vmask8 r1 = a1 != b1; - EXPECT_EQ(0xFF, mask(r1)); + EXPECT_EQ(0xFFu, mask(r1)); EXPECT_EQ(true, any(r1)); EXPECT_EQ(true, all(r1)); vint8 a2(1, 2, 3, 4, 1, 2, 3, 4); vint8 b2(1, 0, 0, 0, 1, 0, 0, 0); vmask8 r2 = a2 != b2; - EXPECT_EQ(0xEE, mask(r2)); + EXPECT_EQ(0xEEu, mask(r2)); EXPECT_EQ(true, any(r2)); EXPECT_EQ(false, all(r2)); vint8 a3(1, 2, 3, 4, 1, 2, 3, 4); vint8 b3(1, 0, 3, 0, 1, 0, 3, 0); vmask8 r3 = a3 != b3; - EXPECT_EQ(0xAA, mask(r3)); + EXPECT_EQ(0xAAu, mask(r3)); EXPECT_EQ(true, any(r3)); EXPECT_EQ(false, all(r3)); vint8 a4(1, 2, 3, 4, 1, 2, 3, 4); vmask8 r4 = a4 != a4; - EXPECT_EQ(0, mask(r4)); + EXPECT_EQ(0u, mask(r4)); EXPECT_EQ(false, any(r4)); EXPECT_EQ(false, all(r4)); } @@ -2929,7 +3053,7 @@ TEST(vint8, clt) vint8 a(1, 2, 3, 4, 1, 2, 3, 4); vint8 b(0, 3, 3, 5, 0, 3, 3, 5); vmask8 r = a < b; - EXPECT_EQ(0xAA, mask(r)); + EXPECT_EQ(0xAAu, mask(r)); } /** @brief Test vint8 cgt. */ @@ -2938,7 +3062,7 @@ TEST(vint8, cgt) vint8 a(1, 2, 3, 4, 1, 2, 3, 4); vint8 b(0, 3, 3, 5, 0, 3, 3, 5); vmask8 r = a > b; - EXPECT_EQ(0x11, mask(r)); + EXPECT_EQ(0x11u, mask(r)); } /** @brief Test vint8 min. */ @@ -2973,30 +3097,66 @@ TEST(vint8, max) EXPECT_EQ(r.lane<7>(), 5); } +/** @brief Test vint8 lsl. */ +TEST(vint8, lsl) +{ + vint8 a(1, 2, 4, -4, 1, 2, 4, -4); + a = lsl<0>(a); + EXPECT_EQ(a.lane<0>(), 1); + EXPECT_EQ(a.lane<1>(), 2); + EXPECT_EQ(a.lane<2>(), 4); + EXPECT_EQ(a.lane<3>(), static_cast(0xFFFFFFFC)); + EXPECT_EQ(a.lane<4>(), 1); + EXPECT_EQ(a.lane<5>(), 2); + EXPECT_EQ(a.lane<6>(), 4); + EXPECT_EQ(a.lane<7>(), static_cast(0xFFFFFFFC)); + + + a = lsl<1>(a); + EXPECT_EQ(a.lane<0>(), 2); + EXPECT_EQ(a.lane<1>(), 4); + EXPECT_EQ(a.lane<2>(), 8); + EXPECT_EQ(a.lane<3>(), static_cast(0xFFFFFFF8)); + EXPECT_EQ(a.lane<4>(), 2); + EXPECT_EQ(a.lane<5>(), 4); + EXPECT_EQ(a.lane<6>(), 8); + EXPECT_EQ(a.lane<7>(), static_cast(0xFFFFFFF8)); + + a = lsl<2>(a); + EXPECT_EQ(a.lane<0>(), 8); + EXPECT_EQ(a.lane<1>(), 16); + EXPECT_EQ(a.lane<2>(), 32); + EXPECT_EQ(a.lane<3>(), static_cast(0xFFFFFFE0)); + EXPECT_EQ(a.lane<4>(), 8); + EXPECT_EQ(a.lane<5>(), 16); + EXPECT_EQ(a.lane<6>(), 32); + EXPECT_EQ(a.lane<7>(), static_cast(0xFFFFFFE0)); +} + /** @brief Test vint8 lsr. */ TEST(vint8, lsr) { vint8 a(1, 2, 4, -4, 1, 2, 4, -4); a = lsr<0>(a); - EXPECT_EQ(a.lane<0>(), 1); - EXPECT_EQ(a.lane<1>(), 2); - EXPECT_EQ(a.lane<2>(), 4); - EXPECT_EQ(a.lane<3>(), 0xFFFFFFFC); - EXPECT_EQ(a.lane<4>(), 1); - EXPECT_EQ(a.lane<5>(), 2); - EXPECT_EQ(a.lane<6>(), 4); - EXPECT_EQ(a.lane<7>(), 0xFFFFFFFC); + EXPECT_EQ(a.lane<0>(), 1); + EXPECT_EQ(a.lane<1>(), 2); + EXPECT_EQ(a.lane<2>(), 4); + EXPECT_EQ(a.lane<3>(), static_cast(0xFFFFFFFC)); + EXPECT_EQ(a.lane<4>(), 1); + EXPECT_EQ(a.lane<5>(), 2); + EXPECT_EQ(a.lane<6>(), 4); + EXPECT_EQ(a.lane<7>(), static_cast(0xFFFFFFFC)); a = lsr<1>(a); - EXPECT_EQ(a.lane<0>(), 0); - EXPECT_EQ(a.lane<1>(), 1); - EXPECT_EQ(a.lane<2>(), 2); - EXPECT_EQ(a.lane<3>(), 0x7FFFFFFE); - EXPECT_EQ(a.lane<4>(), 0); - EXPECT_EQ(a.lane<5>(), 1); - EXPECT_EQ(a.lane<6>(), 2); - EXPECT_EQ(a.lane<7>(), 0x7FFFFFFE); + EXPECT_EQ(a.lane<0>(), 0); + EXPECT_EQ(a.lane<1>(), 1); + EXPECT_EQ(a.lane<2>(), 2); + EXPECT_EQ(a.lane<3>(), 0x7FFFFFFE); + EXPECT_EQ(a.lane<4>(), 0); + EXPECT_EQ(a.lane<5>(), 1); + EXPECT_EQ(a.lane<6>(), 2); + EXPECT_EQ(a.lane<7>(), 0x7FFFFFFE); a = lsr<2>(a); EXPECT_EQ(a.lane<0>(), 0); @@ -3134,11 +3294,77 @@ TEST(vint8, store_nbytes) { alignas(32) int out[2]; vint8 a(42, 314, 75, 90, 42, 314, 75, 90); - store_nbytes(a, (uint8_t*)&out); + store_nbytes(a, reinterpret_cast(&out)); EXPECT_EQ(out[0], 42); EXPECT_EQ(out[1], 314); } +/** @brief Test vint8 store_lanes_masked. */ +TEST(vint8, store_lanes_masked) +{ + uint8_t resulta[32] { 0 }; + + // Store nothing + vmask8 mask1 = vint8(0) == vint8(1); + vint8 data1 = vint8(1); + + store_lanes_masked(resulta, data1, mask1); + vint8 result1v = vint8::load(resulta); + vint8 expect1v = vint8::zero(); + EXPECT_TRUE(all(result1v == expect1v)); + + // Store half + vmask8 mask2 = vint8(1, 1, 1, 1, 0, 0, 0, 0) == vint8(1); + vint8 data2 = vint8(2); + + store_lanes_masked(resulta, data2, mask2); + vint8 result2v = vint8::load(resulta); + vint8 expect2v = vint8(2, 2, 2, 2, 0, 0, 0, 0); + EXPECT_TRUE(all(result2v == expect2v)); + + // Store all + vmask8 mask3 = vint8(1) == vint8(1); + vint8 data3 = vint8(3); + + store_lanes_masked(resulta, data3, mask3); + vint8 result3v = vint8::load(resulta); + vint8 expect3v = vint8(3); + EXPECT_TRUE(all(result3v == expect3v)); +} + +/** @brief Test vint8 store_lanes_masked to unaligned address. */ +TEST(vint8, store_lanes_masked_unaligned) +{ + uint8_t resulta[33] { 0 }; + + // Store nothing + vmask8 mask1 = vint8(0) == vint8(1); + vint8 data1 = vint8(1); + + store_lanes_masked(resulta + 1, data1, mask1); + vint8 result1v = vint8::load(resulta + 1); + vint8 expect1v = vint8::zero(); + EXPECT_TRUE(all(result1v == expect1v)); + + // Store half + vmask8 mask2 = vint8(1, 1, 1, 1, 0, 0, 0, 0) == vint8(1); + vint8 data2 = vint8(2); + + store_lanes_masked(resulta + 1, data2, mask2); + vint8 result2v = vint8::load(resulta + 1); + vint8 expect2v = vint8(2, 2, 2, 2, 0, 0, 0, 0); + EXPECT_TRUE(all(result2v == expect2v)); + + // Store all + vmask8 mask3 = vint8(1) == vint8(1); + vint8 data3 = vint8(3); + + store_lanes_masked(resulta + 1, data3, mask3); + vint8 result3v = vint8::load(resulta + 1); + vint8 expect3v = vint8(3); + EXPECT_TRUE(all(result3v == expect3v)); +} + /** @brief Test vint8 gatheri. */ TEST(vint8, gatheri) { @@ -3225,7 +3451,7 @@ TEST(vmask8, or) vmask8 m2 = m2a == m2b; vmask8 r = m1 | m2; - EXPECT_EQ(mask(r), 0xBB); + EXPECT_EQ(mask(r), 0xBBu); } /** @brief Test vmask8 and. */ @@ -3240,7 +3466,7 @@ TEST(vmask8, and) vmask8 m2 = m2a == m2b; vmask8 r = m1 & m2; - EXPECT_EQ(mask(r), 0x22); + EXPECT_EQ(mask(r), 0x22u); } /** @brief Test vmask8 xor. */ @@ -3255,7 +3481,7 @@ TEST(vmask8, xor) vmask8 m2 = m2a == m2b; vmask8 r = m1 ^ m2; - EXPECT_EQ(mask(r), 0x99); + EXPECT_EQ(mask(r), 0x99u); } /** @brief Test vmask8 not. */ @@ -3265,7 +3491,55 @@ TEST(vmask8, not) vfloat8 m1b(1, 1, 1, 1, 1, 1, 1, 1); vmask8 m1 = m1a == m1b; vmask8 r = ~m1; - EXPECT_EQ(mask(r), 0x55); + EXPECT_EQ(mask(r), 0x55u); +} + +/** @brief Test vint8 table permute. */ +TEST(vint8, vtable_8bt_32bi_32entry) +{ + vint4 table0(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f); + vint4 table1(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f); + + vint8 table0p, table1p; + vtable_prepare(table0, table1, table0p, table1p); + + vint8 index(0, 7, 4, 15, 16, 20, 23, 31); + + vint8 result = vtable_8bt_32bi(table0p, table1p, index); + + EXPECT_EQ(result.lane<0>(), 3); + EXPECT_EQ(result.lane<1>(), 4); + EXPECT_EQ(result.lane<2>(), 7); + EXPECT_EQ(result.lane<3>(), 12); + EXPECT_EQ(result.lane<4>(), 19); + EXPECT_EQ(result.lane<5>(), 23); + EXPECT_EQ(result.lane<6>(), 20); + EXPECT_EQ(result.lane<7>(), 28); +} + +/** @brief Test vint4 table permute. */ +TEST(vint8, vtable_8bt_32bi_64entry) +{ + vint4 table0(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f); + vint4 table1(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f); + vint4 table2(0x20212223, 0x24252627, 0x28292a2b, 0x2c2d2e2f); + vint4 table3(0x30313233, 0x34353637, 0x38393a3b, 0x3c3d3e3f); + + vint8 table0p, table1p, table2p, table3p; + vtable_prepare(table0, table1, table2, table3, table0p, table1p, table2p, table3p); + + vint8 index(0, 7, 4, 15, 16, 20, 38, 63); + + vint8 result = vtable_8bt_32bi(table0p, table1p, table2p, table3p, index); + + EXPECT_EQ(result.lane<0>(), 3); + EXPECT_EQ(result.lane<1>(), 4); + EXPECT_EQ(result.lane<2>(), 7); + EXPECT_EQ(result.lane<3>(), 12); + EXPECT_EQ(result.lane<4>(), 19); + EXPECT_EQ(result.lane<5>(), 23); + EXPECT_EQ(result.lane<6>(), 37); + EXPECT_EQ(result.lane<7>(), 60); } #endif diff --git a/Source/astcenc.h b/Source/astcenc.h index ac2b0c9f3e83e921d4fa283e7334cf9e9edd3baf..0df7534d796b9b394f46373b81b419a1089be46b 100644 --- a/Source/astcenc.h +++ b/Source/astcenc.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2020-2022 Arm Limited +// Copyright 2020-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -43,10 +43,18 @@ * for faster processing. The caller is responsible for creating the worker threads, and * synchronizing between images. * + * Extended instruction set support + * ================================ + * + * This library supports use of extended instruction sets, such as SSE4.1 and AVX2. These are + * enabled at compile time when building the library. There is no runtime checking in the core + * library that the instruction sets used are actually available. Checking compatibility is the + * responsibility of the calling code. + * * Threading * ========= * - * In pseudocode, the usage for manual user threading looks like this: + * In pseudo-code, the usage for manual user threading looks like this: * * // Configure the compressor run * astcenc_config my_config; @@ -74,7 +82,7 @@ * * The codec supports compressing single images, which can be either 2D images or volumetric 3D * images. Calling code is responsible for any handling of aggregate types, such as mipmap chains, - * texture arrays, or sliced 3D textures + * texture arrays, or sliced 3D textures. * * Images are passed in as an astcenc_image structure. Inputs can be either 8-bit unorm, 16-bit * half-float, or 32-bit float, as indicated by the data_type field. @@ -82,7 +90,7 @@ * Images can be any dimension; there is no requirement to be a multiple of the ASTC block size. * * Data is always passed in as 4 color components, and accessed as an array of 2D image slices. Data - * within an image slice is always tightly packed without padding. Addresing looks like this: + * within an image slice is always tightly packed without padding. Addressing looks like this: * * data[z_coord][y_coord * x_dim * 4 + x_coord * 4 ] // Red * data[z_coord][y_coord * x_dim * 4 + x_coord * 4 + 1] // Green @@ -112,8 +120,8 @@ * Input images must contain unit-length normalized and should be passed in using a two component * swizzle. The astcenc command line tool defaults to an RRRG swizzle, but some developers prefer * to use GGGR for compatability with BC5n which will work just as well. The Z component can be - * recovered programatically in shader code, using knowledge that the vector is unit length and that - * Z must be positive for a tangent-space normal map. + * recovered programmatically in shader code, using knowledge that the vector is unit length and + * that Z must be positive for a tangent-space normal map. * * Decompress-only usage * ===================== @@ -215,8 +223,6 @@ enum astcenc_error { ASTCENC_ERR_OUT_OF_MEM, /** @brief The call failed due to the build using fast math. */ ASTCENC_ERR_BAD_CPU_FLOAT, - /** @brief The call failed due to the build using an unsupported ISA. */ - ASTCENC_ERR_BAD_CPU_ISA, /** @brief The call failed due to an out-of-spec parameter. */ ASTCENC_ERR_BAD_PARAM, /** @brief The call failed due to an out-of-spec block size. */ @@ -233,6 +239,8 @@ enum astcenc_error { ASTCENC_ERR_BAD_CONTEXT, /** @brief The call failed due to unimplemented functionality. */ ASTCENC_ERR_NOT_IMPLEMENTED, + /** @brief The call failed due to an out-of-spec decode mode flag set. */ + ASTCENC_ERR_BAD_DECODE_MODE, #if defined(ASTCENC_DIAGNOSTICS) /** @brief The call failed due to an issue with diagnostic tracing. */ ASTCENC_ERR_DTRACE_FAILURE, @@ -265,9 +273,12 @@ static const float ASTCENC_PRE_FAST = 10.0f; /** @brief The medium quality search preset. */ static const float ASTCENC_PRE_MEDIUM = 60.0f; -/** @brief The throrough quality search preset. */ +/** @brief The thorough quality search preset. */ static const float ASTCENC_PRE_THOROUGH = 98.0f; +/** @brief The thorough quality search preset. */ +static const float ASTCENC_PRE_VERYTHOROUGH = 99.0f; + /** @brief The exhaustive, highest quality, search preset. */ static const float ASTCENC_PRE_EXHAUSTIVE = 100.0f; @@ -320,6 +331,11 @@ enum astcenc_type ASTCENC_TYPE_F32 = 2 }; +/** + * @brief Function pointer type for compression progress reporting callback. + */ +extern "C" typedef void (*astcenc_progress_callback)(float); + /** * @brief Enable normal map compression. * @@ -331,35 +347,17 @@ enum astcenc_type static const unsigned int ASTCENC_FLG_MAP_NORMAL = 1 << 0; /** - * @brief Enable mask map compression. - * - * Input data will be treated a multi-layer mask map, where is is desirable for the color components - * to be treated independently for the purposes of error analysis. - */ -static const unsigned int ASTCENC_FLG_MAP_MASK = 1 << 1; - -/** - * @brief Enable RGBM map compression. + * @brief Enable compression heuristics that assume use of decode_unorm8 decode mode. * - * Input data will be treated as HDR data that has been stored in an LDR RGBM-encoded wrapper - * format. Data must be preprocessed by the user to be in LDR RGBM format before calling the - * compression function, this flag is only used to control the use of RGBM-specific heuristics and - * error metrics. - * - * IMPORTANT: The ASTC format is prone to bad failure modes with unconstrained RGBM data; very small - * M values can round to zero due to quantization and result in black or white pixels. It is highly - * recommended that the minimum value of M used in the encoding is kept above a lower threshold (try - * 16 or 32). Applying this threshold reduces the number of very dark colors that can be - * represented, but is still higher precision than 8-bit LDR. + * The decode_unorm8 decode mode rounds differently to the decode_fp16 decode mode, so enabling this + * flag during compression will allow the compressor to use the correct rounding when selecting + * encodings. This will improve the compressed image quality if your application is using the + * decode_unorm8 decode mode, but will reduce image quality if using decode_fp16. * - * When this flag is set the value of @c rgbm_m_scale in the context must be set to the RGBM scale - * factor used during reconstruction. This defaults to 5 when in RGBM mode. - * - * It is recommended that the value of @c cw_a_weight is set to twice the value of the multiplier - * scale, ensuring that the M value is accurately encoded. This defaults to 10 when in RGBM mode, - * matching the default scale factor. + * Note that LDR_SRGB images will always use decode_unorm8 for the RGB channels, irrespective of + * this setting. */ -static const unsigned int ASTCENC_FLG_MAP_RGBM = 1 << 6; +static const unsigned int ASTCENC_FLG_USE_DECODE_UNORM8 = 1 << 1; /** * @brief Enable alpha weighting. @@ -396,15 +394,38 @@ static const unsigned int ASTCENC_FLG_DECOMPRESS_ONLY = 1 << 4; */ static const unsigned int ASTCENC_FLG_SELF_DECOMPRESS_ONLY = 1 << 5; +/** + * @brief Enable RGBM map compression. + * + * Input data will be treated as HDR data that has been stored in an LDR RGBM-encoded wrapper + * format. Data must be preprocessed by the user to be in LDR RGBM format before calling the + * compression function, this flag is only used to control the use of RGBM-specific heuristics and + * error metrics. + * + * IMPORTANT: The ASTC format is prone to bad failure modes with unconstrained RGBM data; very small + * M values can round to zero due to quantization and result in black or white pixels. It is highly + * recommended that the minimum value of M used in the encoding is kept above a lower threshold (try + * 16 or 32). Applying this threshold reduces the number of very dark colors that can be + * represented, but is still higher precision than 8-bit LDR. + * + * When this flag is set the value of @c rgbm_m_scale in the context must be set to the RGBM scale + * factor used during reconstruction. This defaults to 5 when in RGBM mode. + * + * It is recommended that the value of @c cw_a_weight is set to twice the value of the multiplier + * scale, ensuring that the M value is accurately encoded. This defaults to 10 when in RGBM mode, + * matching the default scale factor. + */ +static const unsigned int ASTCENC_FLG_MAP_RGBM = 1 << 6; + /** * @brief The bit mask of all valid flags. */ static const unsigned int ASTCENC_ALL_FLAGS = - ASTCENC_FLG_MAP_MASK | ASTCENC_FLG_MAP_NORMAL | ASTCENC_FLG_MAP_RGBM | ASTCENC_FLG_USE_ALPHA_WEIGHT | ASTCENC_FLG_USE_PERCEPTUAL | + ASTCENC_FLG_USE_DECODE_UNORM8 | ASTCENC_FLG_DECOMPRESS_ONLY | ASTCENC_FLG_SELF_DECOMPRESS_ONLY; @@ -452,7 +473,7 @@ struct astcenc_config * * It is recommended that this is set to 1 when using FLG_USE_ALPHA_WEIGHT on a texture that * will be sampled using linear texture filtering to minimize color bleed out of transparent - * texels that are adjcent to non-transparent texels. + * texels that are adjacent to non-transparent texels. */ unsigned int a_scale_radius; @@ -467,11 +488,25 @@ struct astcenc_config unsigned int tune_partition_count_limit; /** - * @brief The maximum number of partitions searched (-partitionindexlimit). + * @brief The maximum number of partitions searched (-2partitionindexlimit). + * + * Valid values are between 1 and 1024. + */ + unsigned int tune_2partition_index_limit; + + /** + * @brief The maximum number of partitions searched (-3partitionindexlimit). + * + * Valid values are between 1 and 1024. + */ + unsigned int tune_3partition_index_limit; + + /** + * @brief The maximum number of partitions searched (-4partitionindexlimit). * * Valid values are between 1 and 1024. */ - unsigned int tune_partition_index_limit; + unsigned int tune_4partition_index_limit; /** * @brief The maximum centile for block modes searched (-blockmodelimit). @@ -491,63 +526,87 @@ struct astcenc_config /** * @brief The number of trial candidates per mode search (-candidatelimit). * - * Valid values are between 1 and TUNE_MAX_TRIAL_CANDIDATES (default 4). + * Valid values are between 1 and TUNE_MAX_TRIAL_CANDIDATES. */ unsigned int tune_candidate_limit; /** - * @brief The dB threshold for stopping block search (-dblimit). + * @brief The number of trial partitionings per search (-2partitioncandidatelimit). * - * This option is ineffective for HDR textures. + * Valid values are between 1 and TUNE_MAX_PARTITIONING_CANDIDATES. */ - float tune_db_limit; + unsigned int tune_2partitioning_candidate_limit; + + /** + * @brief The number of trial partitionings per search (-3partitioncandidatelimit). + * + * Valid values are between 1 and TUNE_MAX_PARTITIONING_CANDIDATES. + */ + unsigned int tune_3partitioning_candidate_limit; + + /** + * @brief The number of trial partitionings per search (-4partitioncandidatelimit). + * + * Valid values are between 1 and TUNE_MAX_PARTITIONING_CANDIDATES. + */ + unsigned int tune_4partitioning_candidate_limit; /** - * @brief The amount of overshoot needed to early-out mode 0 fast path. + * @brief The dB threshold for stopping block search (-dblimit). * - * We have a fast-path for mode 0 (1 partition, 1 plane) which uses only essential block modes - * as an initital search. This can short-cut compression for simple blocks, but to avoid - * shortcutting too much we* force this to overshoot the MSE threshold needed to hit the - * block-local db_limit e.g. 1.0 = no overshoot, 2.0 = need half the error to trigger. + * This option is ineffective for HDR textures. */ - float tune_mode0_mse_overshoot; + float tune_db_limit; /** - * @brief The amount of overshoot needed to early-out refinement. + * @brief The amount of MSE overshoot needed to early-out trials. + * + * The first early-out is for 1 partition, 1 plane trials, where we try a minimal encode using + * the high probability block modes. This can short-cut compression for simple blocks. * - * The codec will refine block candidates iteratively to improve the encoding, based on the - * @c tune_refinement_limit count. Earlier implementations will use all refinement iterations, - * even if the target threshold is reached. This tuning parameter allows an early out, but with - * an overshoot MSE threshold. Setting this to 1.0 will early-out as soon as the target is hit, - * but does reduce image quality vs the default behavior of over-refinement. + * The second early-out is for refinement trials, where we can exit refinement once quality is + * reached. */ - float tune_refinement_mse_overshoot; + float tune_mse_overshoot; /** - * @brief The threshold for skipping 2.2/3.1/3.2/4.1 trials (-2partitionlimitfactor). + * @brief The threshold for skipping 3.1/4.1 trials (-2partitionlimitfactor). * * This option is further scaled for normal maps, so it skips less often. */ - float tune_2_partition_early_out_limit_factor; + float tune_2partition_early_out_limit_factor; /** - * @brief The threshold for skipping 3.2/4.1 trials (-3partitionlimitfactor). + * @brief The threshold for skipping 4.1 trials (-3partitionlimitfactor). * * This option is further scaled for normal maps, so it skips less often. */ - float tune_3_partition_early_out_limit_factor; + float tune_3partition_early_out_limit_factor; /** * @brief The threshold for skipping two weight planes (-2planelimitcorrelation). * * This option is ineffective for normal maps. */ - float tune_2_plane_early_out_limit_correlation; + float tune_2plane_early_out_limit_correlation; /** - * @brief The threshold below which (inclusive) we stop testing low/high/low+high cutoffs. + * @brief The config enable for the mode0 fast-path search. + * + * If this is set to TUNE_MIN_TEXELS_MODE0 or higher then the early-out fast mode0 + * search is enabled. This option is ineffective for 3D block sizes. + */ + float tune_search_mode0_enable; + + /** + * @brief The progress callback, can be @c nullptr. + * + * If this is specified the codec will peridocially report progress for + * compression as a percentage between 0 and 100. The callback is called from one + * of the compressor threads, so doing significant work in the callback will + * reduce compression performance. */ - unsigned int tune_low_weight_count_limit; + astcenc_progress_callback progress_callback; #if defined(ASTCENC_DIAGNOSTICS) /** @@ -811,7 +870,7 @@ ASTCENC_PUBLIC void astcenc_context_free( * advanced content packaging pipelines. * * @param context Codec context. - * @param data One block of compressesd ASTC data. + * @param data One block of compressed ASTC data. * @param info The output info structure to populate. * * @return @c ASTCENC_SUCCESS if the block was decoded, or an error otherwise. Note that this diff --git a/Source/astcenc_averages_and_directions.cpp b/Source/astcenc_averages_and_directions.cpp index 2ceb83dbc58f453f10b0ab3d83e2c05fdda4b444..dcff0d224b1bb1248c2340add6d3b646aea88a74 100644 --- a/Source/astcenc_averages_and_directions.cpp +++ b/Source/astcenc_averages_and_directions.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -390,8 +390,6 @@ void compute_avgs_and_dirs_4_comp( const image_block& blk, partition_metrics pm[BLOCK_MAX_PARTITIONS] ) { - float texel_weight = hadd_s(blk.channel_weight) / 4.0f; - int partition_count = pi.partition_count; promise(partition_count > 0); @@ -434,11 +432,6 @@ void compute_avgs_and_dirs_4_comp( sum_wp += select(zero, texel_datum, tdm3); } - sum_xp = sum_xp * texel_weight; - sum_yp = sum_yp * texel_weight; - sum_zp = sum_zp * texel_weight; - sum_wp = sum_wp * texel_weight; - vfloat4 prod_xp = dot(sum_xp, sum_xp); vfloat4 prod_yp = dot(sum_yp, sum_yp); vfloat4 prod_zp = dot(sum_zp, sum_zp); @@ -473,8 +466,6 @@ void compute_avgs_and_dirs_3_comp( vfloat4 partition_averages[BLOCK_MAX_PARTITIONS]; compute_partition_averages_rgba(pi, blk, partition_averages); - float texel_weight = hadd_s(blk.channel_weight.swz<0, 1, 2>()); - const float* data_vr = blk.data_r; const float* data_vg = blk.data_g; const float* data_vb = blk.data_b; @@ -482,8 +473,6 @@ void compute_avgs_and_dirs_3_comp( // TODO: Data-driven permute would be useful to avoid this ... if (omitted_component == 0) { - texel_weight = hadd_s(blk.channel_weight.swz<1, 2, 3>()); - partition_averages[0] = partition_averages[0].swz<1, 2, 3>(); partition_averages[1] = partition_averages[1].swz<1, 2, 3>(); partition_averages[2] = partition_averages[2].swz<1, 2, 3>(); @@ -495,8 +484,6 @@ void compute_avgs_and_dirs_3_comp( } else if (omitted_component == 1) { - texel_weight = hadd_s(blk.channel_weight.swz<0, 2, 3>()); - partition_averages[0] = partition_averages[0].swz<0, 2, 3>(); partition_averages[1] = partition_averages[1].swz<0, 2, 3>(); partition_averages[2] = partition_averages[2].swz<0, 2, 3>(); @@ -507,8 +494,6 @@ void compute_avgs_and_dirs_3_comp( } else if (omitted_component == 2) { - texel_weight = hadd_s(blk.channel_weight.swz<0, 1, 3>()); - partition_averages[0] = partition_averages[0].swz<0, 1, 3>(); partition_averages[1] = partition_averages[1].swz<0, 1, 3>(); partition_averages[2] = partition_averages[2].swz<0, 1, 3>(); @@ -524,8 +509,6 @@ void compute_avgs_and_dirs_3_comp( partition_averages[3] = partition_averages[3].swz<0, 1, 2>(); } - texel_weight = texel_weight * (1.0f / 3.0f); - unsigned int partition_count = pi.partition_count; promise(partition_count > 0); @@ -563,10 +546,6 @@ void compute_avgs_and_dirs_3_comp( sum_zp += select(zero, texel_datum, tdm2); } - sum_xp = sum_xp * texel_weight; - sum_yp = sum_yp * texel_weight; - sum_zp = sum_zp * texel_weight; - vfloat4 prod_xp = dot(sum_xp, sum_xp); vfloat4 prod_yp = dot(sum_yp, sum_yp); vfloat4 prod_zp = dot(sum_zp, sum_zp); @@ -591,8 +570,6 @@ void compute_avgs_and_dirs_3_comp_rgb( const image_block& blk, partition_metrics pm[BLOCK_MAX_PARTITIONS] ) { - float texel_weight = hadd_s(blk.channel_weight.swz<0, 1, 2>()) * (1.0f / 3.0f); - unsigned int partition_count = pi.partition_count; promise(partition_count > 0); @@ -632,10 +609,6 @@ void compute_avgs_and_dirs_3_comp_rgb( sum_zp += select(zero, texel_datum, tdm2); } - sum_xp = sum_xp * texel_weight; - sum_yp = sum_yp * texel_weight; - sum_zp = sum_zp * texel_weight; - vfloat4 prod_xp = dot(sum_xp, sum_xp); vfloat4 prod_yp = dot(sum_yp, sum_yp); vfloat4 prod_zp = dot(sum_zp, sum_zp); @@ -662,7 +635,6 @@ void compute_avgs_and_dirs_2_comp( unsigned int component2, partition_metrics pm[BLOCK_MAX_PARTITIONS] ) { - float texel_weight; vfloat4 average; const float* data_vr = nullptr; @@ -670,7 +642,6 @@ void compute_avgs_and_dirs_2_comp( if (component1 == 0 && component2 == 1) { - texel_weight = hadd_s(blk.channel_weight.swz<0, 1>()) / 2.0f; average = blk.data_mean.swz<0, 1>(); data_vr = blk.data_r; @@ -678,7 +649,6 @@ void compute_avgs_and_dirs_2_comp( } else if (component1 == 0 && component2 == 2) { - texel_weight = hadd_s(blk.channel_weight.swz<0, 2>()) / 2.0f; average = blk.data_mean.swz<0, 2>(); data_vr = blk.data_r; @@ -688,7 +658,6 @@ void compute_avgs_and_dirs_2_comp( { assert(component1 == 1 && component2 == 2); - texel_weight = hadd_s(blk.channel_weight.swz<1, 2>()) / 2.0f; average = blk.data_mean.swz<1, 2>(); data_vr = blk.data_g; @@ -714,7 +683,7 @@ void compute_avgs_and_dirs_2_comp( average += vfloat2(data_vr[iwt], data_vg[iwt]); } - average = average * (1.0f / static_cast(texel_count)); + average = average / static_cast(texel_count); } pm[partition].avg = average; @@ -737,9 +706,6 @@ void compute_avgs_and_dirs_2_comp( sum_yp += select(zero, texel_datum, tdm1); } - sum_xp = sum_xp * texel_weight; - sum_yp = sum_yp * texel_weight; - vfloat4 prod_xp = dot(sum_xp, sum_xp); vfloat4 prod_yp = dot(sum_yp, sum_yp); @@ -759,8 +725,7 @@ void compute_error_squared_rgba( const image_block& blk, const processed_line4 uncor_plines[BLOCK_MAX_PARTITIONS], const processed_line4 samec_plines[BLOCK_MAX_PARTITIONS], - float uncor_lengths[BLOCK_MAX_PARTITIONS], - float samec_lengths[BLOCK_MAX_PARTITIONS], + float line_lengths[BLOCK_MAX_PARTITIONS], float& uncor_error, float& samec_error ) { @@ -774,12 +739,6 @@ void compute_error_squared_rgba( { const uint8_t *texel_indexes = pi.texels_of_partition[partition]; - float uncor_loparam = 1e10f; - float uncor_hiparam = -1e10f; - - float samec_loparam = 1e10f; - float samec_hiparam = -1e10f; - processed_line4 l_uncor = uncor_plines[partition]; processed_line4 l_samec = samec_plines[partition]; @@ -807,9 +766,6 @@ void compute_error_squared_rgba( vfloat uncor_loparamv(1e10f); vfloat uncor_hiparamv(-1e10f); - vfloat samec_loparamv(1e10f); - vfloat samec_hiparamv(-1e10f); - vfloat ew_r(blk.channel_weight.lane<0>()); vfloat ew_g(blk.channel_weight.lane<1>()); vfloat ew_b(blk.channel_weight.lane<2>()); @@ -822,17 +778,17 @@ void compute_error_squared_rgba( for (unsigned int i = 0; i < texel_count; i += ASTCENC_SIMD_WIDTH) { vmask mask = lane_ids < vint(texel_count); - vint texel_idxs(&(texel_indexes[i])); + vint texel_idxs(texel_indexes + i); vfloat data_r = gatherf(blk.data_r, texel_idxs); vfloat data_g = gatherf(blk.data_g, texel_idxs); vfloat data_b = gatherf(blk.data_b, texel_idxs); vfloat data_a = gatherf(blk.data_a, texel_idxs); - vfloat uncor_param = (data_r * l_uncor_bs0) - + (data_g * l_uncor_bs1) - + (data_b * l_uncor_bs2) - + (data_a * l_uncor_bs3); + vfloat uncor_param = (data_r * l_uncor_bs0) + + (data_g * l_uncor_bs1) + + (data_b * l_uncor_bs2) + + (data_a * l_uncor_bs3); uncor_loparamv = min(uncor_param, uncor_loparamv); uncor_hiparamv = max(uncor_param, uncor_hiparamv); @@ -859,9 +815,6 @@ void compute_error_squared_rgba( + (data_b * l_samec_bs2) + (data_a * l_samec_bs3); - samec_loparamv = min(samec_param, samec_loparamv); - samec_hiparamv = max(samec_param, samec_hiparamv); - vfloat samec_dist0 = samec_param * l_samec_bs0 - data_r; vfloat samec_dist1 = samec_param * l_samec_bs1 - data_g; vfloat samec_dist2 = samec_param * l_samec_bs2 - data_b; @@ -877,18 +830,9 @@ void compute_error_squared_rgba( lane_ids += vint(ASTCENC_SIMD_WIDTH); } - uncor_loparam = hmin_s(uncor_loparamv); - uncor_hiparam = hmax_s(uncor_hiparamv); - - samec_loparam = hmin_s(samec_loparamv); - samec_hiparam = hmax_s(samec_hiparamv); - - float uncor_linelen = uncor_hiparam - uncor_loparam; - float samec_linelen = samec_hiparam - samec_loparam; - // Turn very small numbers and NaNs into a small number - uncor_lengths[partition] = astc::max(uncor_linelen, 1e-7f); - samec_lengths[partition] = astc::max(samec_linelen, 1e-7f); + float uncor_linelen = hmax_s(uncor_hiparamv) - hmin_s(uncor_loparamv); + line_lengths[partition] = astc::max(uncor_linelen, 1e-7f); } uncor_error = hadd_s(uncor_errorsumv); @@ -916,19 +860,9 @@ void compute_error_squared_rgb( unsigned int texel_count = pi.partition_texel_count[partition]; promise(texel_count > 0); - float uncor_loparam = 1e10f; - float uncor_hiparam = -1e10f; - - float samec_loparam = 1e10f; - float samec_hiparam = -1e10f; - processed_line3 l_uncor = pl.uncor_pline; processed_line3 l_samec = pl.samec_pline; - // This implementation is an example vectorization of this function. - // It works for - the codec is a 2-4% faster than not vectorizing - but - // the benefit is limited by the use of gathers and register pressure - // Vectorize some useful scalar inputs vfloat l_uncor_bs0(l_uncor.bs.lane<0>()); vfloat l_uncor_bs1(l_uncor.bs.lane<1>()); @@ -947,9 +881,6 @@ void compute_error_squared_rgb( vfloat uncor_loparamv(1e10f); vfloat uncor_hiparamv(-1e10f); - vfloat samec_loparamv(1e10f); - vfloat samec_hiparamv(-1e10f); - vfloat ew_r(blk.channel_weight.lane<0>()); vfloat ew_g(blk.channel_weight.lane<1>()); vfloat ew_b(blk.channel_weight.lane<2>()); @@ -961,15 +892,15 @@ void compute_error_squared_rgb( for (unsigned int i = 0; i < texel_count; i += ASTCENC_SIMD_WIDTH) { vmask mask = lane_ids < vint(texel_count); - vint texel_idxs(&(texel_indexes[i])); + vint texel_idxs(texel_indexes + i); vfloat data_r = gatherf(blk.data_r, texel_idxs); vfloat data_g = gatherf(blk.data_g, texel_idxs); vfloat data_b = gatherf(blk.data_b, texel_idxs); - vfloat uncor_param = (data_r * l_uncor_bs0) - + (data_g * l_uncor_bs1) - + (data_b * l_uncor_bs2); + vfloat uncor_param = (data_r * l_uncor_bs0) + + (data_g * l_uncor_bs1) + + (data_b * l_uncor_bs2); uncor_loparamv = min(uncor_param, uncor_loparamv); uncor_hiparamv = max(uncor_param, uncor_hiparamv); @@ -992,9 +923,6 @@ void compute_error_squared_rgb( + (data_g * l_samec_bs1) + (data_b * l_samec_bs2); - samec_loparamv = min(samec_param, samec_loparamv); - samec_hiparamv = max(samec_param, samec_hiparamv); - vfloat samec_dist0 = samec_param * l_samec_bs0 - data_r; vfloat samec_dist1 = samec_param * l_samec_bs1 - data_g; vfloat samec_dist2 = samec_param * l_samec_bs2 - data_b; @@ -1008,18 +936,9 @@ void compute_error_squared_rgb( lane_ids += vint(ASTCENC_SIMD_WIDTH); } - uncor_loparam = hmin_s(uncor_loparamv); - uncor_hiparam = hmax_s(uncor_hiparamv); - - samec_loparam = hmin_s(samec_loparamv); - samec_hiparam = hmax_s(samec_hiparamv); - - float uncor_linelen = uncor_hiparam - uncor_loparam; - float samec_linelen = samec_hiparam - samec_loparam; - // Turn very small numbers and NaNs into a small number - pl.uncor_line_len = astc::max(uncor_linelen, 1e-7f); - pl.samec_line_len = astc::max(samec_linelen, 1e-7f); + float uncor_linelen = hmax_s(uncor_hiparamv) - hmin_s(uncor_loparamv); + pl.line_length = astc::max(uncor_linelen, 1e-7f); } uncor_error = hadd_s(uncor_errorsumv); diff --git a/Source/astcenc_block_sizes.cpp b/Source/astcenc_block_sizes.cpp index 84d9e3464c22d940e39a8a5887e9b94a6f3ee7c1..3f395433cb17de21b46587bb7ecec502f759c5c0 100644 --- a/Source/astcenc_block_sizes.cpp +++ b/Source/astcenc_block_sizes.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -330,17 +330,17 @@ static void init_decimation_info_2d( for (unsigned int j = 0; j < wb.weight_count_of_texel[i]; j++) { - di.texel_weights_int_4t[j][i] = wb.weights_of_texel[i][j]; - di.texel_weights_float_4t[j][i] = static_cast(wb.weights_of_texel[i][j]) * (1.0f / WEIGHTS_TEXEL_SUM); - di.texel_weights_4t[j][i] = wb.grid_weights_of_texel[i][j]; + di.texel_weight_contribs_int_tr[j][i] = wb.weights_of_texel[i][j]; + di.texel_weight_contribs_float_tr[j][i] = static_cast(wb.weights_of_texel[i][j]) * (1.0f / WEIGHTS_TEXEL_SUM); + di.texel_weights_tr[j][i] = wb.grid_weights_of_texel[i][j]; } // Init all 4 entries so we can rely on zeros for vectorization for (unsigned int j = wb.weight_count_of_texel[i]; j < 4; j++) { - di.texel_weights_int_4t[j][i] = 0; - di.texel_weights_float_4t[j][i] = 0.0f; - di.texel_weights_4t[j][i] = 0; + di.texel_weight_contribs_int_tr[j][i] = 0; + di.texel_weight_contribs_float_tr[j][i] = 0.0f; + di.texel_weights_tr[j][i] = 0; } } @@ -356,43 +356,30 @@ static void init_decimation_info_2d( uint8_t texel = wb.texels_of_weight[i][j]; // Create transposed versions of these for better vectorization - di.weight_texel[j][i] = texel; - di.weights_flt[j][i] = static_cast(wb.texel_weights_of_weight[i][j]); + di.weight_texels_tr[j][i] = texel; + di.weights_texel_contribs_tr[j][i] = static_cast(wb.texel_weights_of_weight[i][j]); - // perform a layer of array unrolling. An aspect of this unrolling is that - // one of the texel-weight indexes is an identity-mapped index; we will use this - // fact to reorder the indexes so that the first one is the identity index. - int swap_idx = -1; + // Store the per-texel contribution of this weight for each texel it contributes to + di.texel_contrib_for_weight[j][i] = 0.0f; for (unsigned int k = 0; k < 4; k++) { - uint8_t dttw = di.texel_weights_4t[k][texel]; - float dttwf = di.texel_weights_float_4t[k][texel]; + uint8_t dttw = di.texel_weights_tr[k][texel]; + float dttwf = di.texel_weight_contribs_float_tr[k][texel]; if (dttw == i && dttwf != 0.0f) { - swap_idx = k; + di.texel_contrib_for_weight[j][i] = di.texel_weight_contribs_float_tr[k][texel]; + break; } - di.texel_weights_texel[i][j][k] = dttw; - di.texel_weights_float_texel[i][j][k] = dttwf; - } - - if (swap_idx != 0) - { - uint8_t vi = di.texel_weights_texel[i][j][0]; - float vf = di.texel_weights_float_texel[i][j][0]; - di.texel_weights_texel[i][j][0] = di.texel_weights_texel[i][j][swap_idx]; - di.texel_weights_float_texel[i][j][0] = di.texel_weights_float_texel[i][j][swap_idx]; - di.texel_weights_texel[i][j][swap_idx] = vi; - di.texel_weights_float_texel[i][j][swap_idx] = vf; } } // Initialize array tail so we can over-fetch with SIMD later to avoid loop tails // Match last texel in active lane in SIMD group, for better gathers - uint8_t last_texel = di.weight_texel[texel_count_wt - 1][i]; + uint8_t last_texel = di.weight_texels_tr[texel_count_wt - 1][i]; for (unsigned int j = texel_count_wt; j < max_texel_count_of_weight; j++) { - di.weight_texel[j][i] = last_texel; - di.weights_flt[j][i] = 0.0f; + di.weight_texels_tr[j][i] = last_texel; + di.weights_texel_contribs_tr[j][i] = 0.0f; } } @@ -404,16 +391,16 @@ static void init_decimation_info_2d( for (unsigned int j = 0; j < 4; j++) { - di.texel_weights_float_4t[j][i] = 0; - di.texel_weights_4t[j][i] = 0; - di.texel_weights_int_4t[j][i] = 0; + di.texel_weight_contribs_float_tr[j][i] = 0; + di.texel_weights_tr[j][i] = 0; + di.texel_weight_contribs_int_tr[j][i] = 0; } } // Initialize array tail so we can over-fetch with SIMD later to avoid loop tails // Match last texel in active lane in SIMD group, for better gathers unsigned int last_texel_count_wt = wb.texel_count_of_weight[weights_per_block - 1]; - uint8_t last_texel = di.weight_texel[last_texel_count_wt - 1][weights_per_block - 1]; + uint8_t last_texel = di.weight_texels_tr[last_texel_count_wt - 1][weights_per_block - 1]; unsigned int weights_per_block_simd = round_up_to_simd_multiple_vla(weights_per_block); for (unsigned int i = weights_per_block; i < weights_per_block_simd; i++) @@ -422,8 +409,8 @@ static void init_decimation_info_2d( for (unsigned int j = 0; j < max_texel_count_of_weight; j++) { - di.weight_texel[j][i] = last_texel; - di.weights_flt[j][i] = 0.0f; + di.weight_texels_tr[j][i] = last_texel; + di.weights_texel_contribs_tr[j][i] = 0.0f; } } @@ -600,16 +587,16 @@ static void init_decimation_info_3d( // Init all 4 entries so we can rely on zeros for vectorization for (unsigned int j = 0; j < 4; j++) { - di.texel_weights_int_4t[j][i] = 0; - di.texel_weights_float_4t[j][i] = 0.0f; - di.texel_weights_4t[j][i] = 0; + di.texel_weight_contribs_int_tr[j][i] = 0; + di.texel_weight_contribs_float_tr[j][i] = 0.0f; + di.texel_weights_tr[j][i] = 0; } for (unsigned int j = 0; j < wb.weight_count_of_texel[i]; j++) { - di.texel_weights_int_4t[j][i] = wb.weights_of_texel[i][j]; - di.texel_weights_float_4t[j][i] = static_cast(wb.weights_of_texel[i][j]) * (1.0f / WEIGHTS_TEXEL_SUM); - di.texel_weights_4t[j][i] = wb.grid_weights_of_texel[i][j]; + di.texel_weight_contribs_int_tr[j][i] = wb.weights_of_texel[i][j]; + di.texel_weight_contribs_float_tr[j][i] = static_cast(wb.weights_of_texel[i][j]) * (1.0f / WEIGHTS_TEXEL_SUM); + di.texel_weights_tr[j][i] = wb.grid_weights_of_texel[i][j]; } } @@ -625,43 +612,30 @@ static void init_decimation_info_3d( unsigned int texel = wb.texels_of_weight[i][j]; // Create transposed versions of these for better vectorization - di.weight_texel[j][i] = static_cast(texel); - di.weights_flt[j][i] = static_cast(wb.texel_weights_of_weight[i][j]); + di.weight_texels_tr[j][i] = static_cast(texel); + di.weights_texel_contribs_tr[j][i] = static_cast(wb.texel_weights_of_weight[i][j]); - // perform a layer of array unrolling. An aspect of this unrolling is that - // one of the texel-weight indexes is an identity-mapped index; we will use this - // fact to reorder the indexes so that the first one is the identity index. - int swap_idx = -1; + // Store the per-texel contribution of this weight for each texel it contributes to + di.texel_contrib_for_weight[j][i] = 0.0f; for (unsigned int k = 0; k < 4; k++) { - uint8_t dttw = di.texel_weights_4t[k][texel]; - float dttwf = di.texel_weights_float_4t[k][texel]; + uint8_t dttw = di.texel_weights_tr[k][texel]; + float dttwf = di.texel_weight_contribs_float_tr[k][texel]; if (dttw == i && dttwf != 0.0f) { - swap_idx = k; + di.texel_contrib_for_weight[j][i] = di.texel_weight_contribs_float_tr[k][texel]; + break; } - di.texel_weights_texel[i][j][k] = dttw; - di.texel_weights_float_texel[i][j][k] = dttwf; - } - - if (swap_idx != 0) - { - uint8_t vi = di.texel_weights_texel[i][j][0]; - float vf = di.texel_weights_float_texel[i][j][0]; - di.texel_weights_texel[i][j][0] = di.texel_weights_texel[i][j][swap_idx]; - di.texel_weights_float_texel[i][j][0] = di.texel_weights_float_texel[i][j][swap_idx]; - di.texel_weights_texel[i][j][swap_idx] = vi; - di.texel_weights_float_texel[i][j][swap_idx] = vf; } } // Initialize array tail so we can over-fetch with SIMD later to avoid loop tails // Match last texel in active lane in SIMD group, for better gathers - uint8_t last_texel = di.weight_texel[texel_count_wt - 1][i]; + uint8_t last_texel = di.weight_texels_tr[texel_count_wt - 1][i]; for (unsigned int j = texel_count_wt; j < max_texel_count_of_weight; j++) { - di.weight_texel[j][i] = last_texel; - di.weights_flt[j][i] = 0.0f; + di.weight_texels_tr[j][i] = last_texel; + di.weights_texel_contribs_tr[j][i] = 0.0f; } } @@ -673,16 +647,16 @@ static void init_decimation_info_3d( for (unsigned int j = 0; j < 4; j++) { - di.texel_weights_float_4t[j][i] = 0; - di.texel_weights_4t[j][i] = 0; - di.texel_weights_int_4t[j][i] = 0; + di.texel_weight_contribs_float_tr[j][i] = 0; + di.texel_weights_tr[j][i] = 0; + di.texel_weight_contribs_int_tr[j][i] = 0; } } // Initialize array tail so we can over-fetch with SIMD later to avoid loop tails // Match last texel in active lane in SIMD group, for better gathers int last_texel_count_wt = wb.texel_count_of_weight[weights_per_block - 1]; - uint8_t last_texel = di.weight_texel[last_texel_count_wt - 1][weights_per_block - 1]; + uint8_t last_texel = di.weight_texels_tr[last_texel_count_wt - 1][weights_per_block - 1]; unsigned int weights_per_block_simd = round_up_to_simd_multiple_vla(weights_per_block); for (unsigned int i = weights_per_block; i < weights_per_block_simd; i++) @@ -691,8 +665,8 @@ static void init_decimation_info_3d( for (int j = 0; j < max_texel_count_of_weight; j++) { - di.weight_texel[j][i] = last_texel; - di.weights_flt[j][i] = 0.0f; + di.weight_texels_tr[j][i] = last_texel; + di.weights_texel_contribs_tr[j][i] = 0.0f; } } @@ -802,8 +776,8 @@ static void construct_dt_entry_2d( assert(maxprec_1plane >= 0 || maxprec_2planes >= 0); bsd.decimation_modes[index].maxprec_1plane = static_cast(maxprec_1plane); bsd.decimation_modes[index].maxprec_2planes = static_cast(maxprec_2planes); - bsd.decimation_modes[index].ref_1_plane = 0; - bsd.decimation_modes[index].ref_2_planes = 0; + bsd.decimation_modes[index].refprec_1plane = 0; + bsd.decimation_modes[index].refprec_2planes = 0; } /** @@ -957,23 +931,24 @@ static void construct_block_size_descriptor_2d( } auto& bm = bsd.block_modes[packed_bm_idx]; + + bm.decimation_mode = static_cast(decimation_mode); + bm.quant_mode = static_cast(quant_mode); + bm.is_dual_plane = static_cast(is_dual_plane); + bm.weight_bits = static_cast(weight_bits); + bm.mode_index = static_cast(i); + auto& dm = bsd.decimation_modes[decimation_mode]; if (is_dual_plane) { - dm.ref_2_planes = 1; + dm.set_ref_2plane(bm.get_weight_quant_mode()); } else { - dm.ref_1_plane = 1; + dm.set_ref_1plane(bm.get_weight_quant_mode()); } - bm.decimation_mode = static_cast(decimation_mode); - bm.quant_mode = static_cast(quant_mode); - bm.is_dual_plane = static_cast(is_dual_plane); - bm.weight_bits = static_cast(weight_bits); - bm.mode_index = static_cast(i); - bsd.block_mode_packed_index[i] = static_cast(packed_bm_idx); packed_bm_idx++; @@ -1002,8 +977,8 @@ static void construct_block_size_descriptor_2d( { bsd.decimation_modes[i].maxprec_1plane = -1; bsd.decimation_modes[i].maxprec_2planes = -1; - bsd.decimation_modes[i].ref_1_plane = 0; - bsd.decimation_modes[i].ref_2_planes = 0; + bsd.decimation_modes[i].refprec_1plane = 0; + bsd.decimation_modes[i].refprec_2planes = 0; } // Determine the texels to use for kmeans clustering. @@ -1013,7 +988,7 @@ static void construct_block_size_descriptor_2d( } /** - * @brief Allocate block modes and decimation tables for a single £D block size. + * @brief Allocate block modes and decimation tables for a single 3D block size. * * TODO: This function doesn't include all of the heuristics that we use for 2D block sizes such as * the percentile mode cutoffs. If 3D becomes more widely used we should look at this. @@ -1088,8 +1063,8 @@ static void construct_block_size_descriptor_3d( bsd.decimation_modes[decimation_mode_count].maxprec_1plane = static_cast(maxprec_1plane); bsd.decimation_modes[decimation_mode_count].maxprec_2planes = static_cast(maxprec_2planes); - bsd.decimation_modes[decimation_mode_count].ref_1_plane = maxprec_1plane == -1 ? 0 : 1; - bsd.decimation_modes[decimation_mode_count].ref_2_planes = maxprec_2planes == -1 ? 0 : 1; + bsd.decimation_modes[decimation_mode_count].refprec_1plane = maxprec_1plane == -1 ? 0 : 0xFFFF; + bsd.decimation_modes[decimation_mode_count].refprec_2planes = maxprec_2planes == -1 ? 0 : 0xFFFF; decimation_mode_count++; } } @@ -1100,15 +1075,14 @@ static void construct_block_size_descriptor_3d( { bsd.decimation_modes[i].maxprec_1plane = -1; bsd.decimation_modes[i].maxprec_2planes = -1; - bsd.decimation_modes[i].ref_1_plane = 0; - bsd.decimation_modes[i].ref_2_planes = 0; + bsd.decimation_modes[i].refprec_1plane = 0; + bsd.decimation_modes[i].refprec_2planes = 0; } bsd.decimation_mode_count_always = 0; // Skipped for 3D modes bsd.decimation_mode_count_selected = decimation_mode_count; bsd.decimation_mode_count_all = decimation_mode_count; - // Construct the list of block formats // Construct the list of block formats referencing the decimation tables // Clear the list to a known-bad value diff --git a/Source/astcenc_color_quantize.cpp b/Source/astcenc_color_quantize.cpp index ed495fc9050c10217f849d2ffbf17417b4aa7def..4ac0aff58dcc72aa9f93f6f92f56400c30b0209b 100644 --- a/Source/astcenc_color_quantize.cpp +++ b/Source/astcenc_color_quantize.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -40,55 +40,117 @@ #include "astcenc_internal.h" +/** + * @brief Compute the error of an LDR RGB or RGBA encoding. + * + * @param uquant0 The original endpoint 0 color. + * @param uquant1 The original endpoint 1 color. + * @param quant0 The unpacked quantized endpoint 0 color. + * @param quant1 The unpacked quantized endpoint 1 color. + * + * @return The MSE of the encoding. + */ +static float get_rgba_encoding_error( + vfloat4 uquant0, + vfloat4 uquant1, + vint4 quant0, + vint4 quant1 +) { + vfloat4 error0 = uquant0 - int_to_float(quant0); + vfloat4 error1 = uquant1 - int_to_float(quant1); + return hadd_s(error0 * error0 + error1 * error1); +} + /** * @brief Determine the quantized value given a quantization level. * * @param quant_level The quantization level to use. - * @param value The value to convert. This may be outside of the 0-255 range and will be - * clamped before the value is looked up. + * @param value The value to convert. This must be in the 0-255 range. * - * @return The encoded quantized value. These are not necessarily in the order; the compressor - * scrambles the values slightly to make hardware implementation easier. + * @return The unpacked quantized value, returned in 0-255 range. */ -static inline int quant_color_clamp( +static inline uint8_t quant_color( quant_method quant_level, int value ) { - value = astc::clamp(value, 0, 255); - return color_quant_tables[quant_level - QUANT_6][value]; + int index = value * 2 + 1; + return color_unquant_to_uquant_tables[quant_level - QUANT_6][index]; } /** * @brief Determine the quantized value given a quantization level. * * @param quant_level The quantization level to use. - * @param value The value to convert. This may be outside of the 0-255 range and will be - * clamped before the value is looked up. + * @param value The value to convert. This must be in the 0-255 range. * - * @return The encoded quantized value. These are not necessarily in the order; the compressor - * scrambles the values slightly to make hardware implementation easier. + * @return The unpacked quantized value, returned in 0-255 range. */ -static inline int quant_color( +static inline vint4 quant_color3( quant_method quant_level, - int value + vint4 value ) { - return color_quant_tables[quant_level - QUANT_6][value]; + vint4 index = value * 2 + 1; + return vint4( + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<0>()], + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<1>()], + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<2>()], + 0); } /** - * @brief Determine the unquantized value given a quantization level. + * @brief Determine the quantized value given a quantization level and residual. * * @param quant_level The quantization level to use. - * @param value The value to convert. + * @param value The value to convert. This must be in the 0-255 range. + * @param valuef The original value before rounding, used to compute a residual. * - * @return The encoded quantized value. These are not necessarily in the order; the compressor - * scrambles the values slightly to make hardware implementation easier. + * @return The unpacked quantized value, returned in 0-255 range. */ -static inline int unquant_color( +static inline uint8_t quant_color( quant_method quant_level, - int value + int value, + float valuef +) { + int index = value * 2; + + // Compute the residual to determine if we should round down or up ties. + // Test should be residual >= 0, but empirical testing shows small bias helps. + float residual = valuef - static_cast(value); + if (residual >= -0.1f) + { + index++; + } + + return color_unquant_to_uquant_tables[quant_level - QUANT_6][index]; +} + +/** + * @brief Determine the quantized value given a quantization level and residual. + * + * @param quant_level The quantization level to use. + * @param value The value to convert. This must be in the 0-255 range. + * @param valuef The original value before rounding, used to compute a residual. + * + * @return The unpacked quantized value, returned in 0-255 range. + */ +static inline vint4 quant_color3( + quant_method quant_level, + vint4 value, + vfloat4 valuef ) { - return color_unquant_tables[quant_level - QUANT_6][value]; + vint4 index = value * 2; + + // Compute the residual to determine if we should round down or up ties. + // Test should be residual >= 0, but empirical testing shows small bias helps. + vfloat4 residual = valuef - int_to_float(value); + vmask4 mask = residual >= vfloat4(-0.1f); + index = select(index, index + 1, mask); + + return vint4( + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<0>()], + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<1>()], + color_unquant_to_uquant_tables[quant_level - QUANT_6][index.lane<2>()], + 0); } /** @@ -100,55 +162,33 @@ static inline int unquant_color( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r0, r1, g0, g1, b0, b1). + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. * @param quant_level The quantization level to use. */ static void quantize_rgb( vfloat4 color0, vfloat4 color1, - uint8_t output[6], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; + vint4 color0i, color1i; + vfloat4 nudge(0.2f); - float r0 = astc::clamp255f(color0.lane<0>() * scale); - float g0 = astc::clamp255f(color0.lane<1>() * scale); - float b0 = astc::clamp255f(color0.lane<2>() * scale); - - float r1 = astc::clamp255f(color1.lane<0>() * scale); - float g1 = astc::clamp255f(color1.lane<1>() * scale); - float b1 = astc::clamp255f(color1.lane<2>() * scale); - - int ri0, gi0, bi0, ri1, gi1, bi1; - int ri0b, gi0b, bi0b, ri1b, gi1b, bi1b; - float rgb0_addon = 0.5f; - float rgb1_addon = 0.5f; do { - ri0 = quant_color_clamp(quant_level, astc::flt2int_rd(r0 + rgb0_addon)); - gi0 = quant_color_clamp(quant_level, astc::flt2int_rd(g0 + rgb0_addon)); - bi0 = quant_color_clamp(quant_level, astc::flt2int_rd(b0 + rgb0_addon)); - ri1 = quant_color_clamp(quant_level, astc::flt2int_rd(r1 + rgb1_addon)); - gi1 = quant_color_clamp(quant_level, astc::flt2int_rd(g1 + rgb1_addon)); - bi1 = quant_color_clamp(quant_level, astc::flt2int_rd(b1 + rgb1_addon)); - - ri0b = unquant_color(quant_level, ri0); - gi0b = unquant_color(quant_level, gi0); - bi0b = unquant_color(quant_level, bi0); - ri1b = unquant_color(quant_level, ri1); - gi1b = unquant_color(quant_level, gi1); - bi1b = unquant_color(quant_level, bi1); - - rgb0_addon -= 0.2f; - rgb1_addon += 0.2f; - } while (ri0b + gi0b + bi0b > ri1b + gi1b + bi1b); - - output[0] = static_cast(ri0); - output[1] = static_cast(ri1); - output[2] = static_cast(gi0); - output[3] = static_cast(gi1); - output[4] = static_cast(bi0); - output[5] = static_cast(bi1); + vint4 color0q = max(float_to_int_rtn(color0), vint4(0)); + color0i = quant_color3(quant_level, color0q, color0); + color0 = color0 - nudge; + + vint4 color1q = min(float_to_int_rtn(color1), vint4(255)); + color1i = quant_color3(quant_level, color1q, color1); + color1 = color1 + nudge; + } while (hadd_rgb_s(color0i) > hadd_rgb_s(color1i)); + + color0_out = color0i; + color1_out = color1i; } /** @@ -161,24 +201,24 @@ static void quantize_rgb( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r0, r1, g0, g1, b0, b1, a0, a1). + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. * @param quant_level The quantization level to use. */ static void quantize_rgba( vfloat4 color0, vfloat4 color1, - uint8_t output[8], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; + quantize_rgb(color0, color1, color0_out, color1_out, quant_level); - float a0 = astc::clamp255f(color0.lane<3>() * scale); - float a1 = astc::clamp255f(color1.lane<3>() * scale); - - output[6] = quant_color(quant_level, astc::flt2int_rtn(a0)); - output[7] = quant_color(quant_level, astc::flt2int_rtn(a1)); + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); - quantize_rgb(color0, color1, output, quant_level); + color0_out.set_lane<3>(quant_color(quant_level, astc::flt2int_rtn(a0), a0)); + color1_out.set_lane<3>(quant_color(quant_level, astc::flt2int_rtn(a1), a1)); } /** @@ -188,7 +228,8 @@ static void quantize_rgba( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r1, r0, g1, g0, b1, b0). + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. @@ -196,63 +237,35 @@ static void quantize_rgba( static bool try_quantize_rgb_blue_contract( vfloat4 color0, vfloat4 color1, - uint8_t output[6], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; - - float r0 = color0.lane<0>() * scale; - float g0 = color0.lane<1>() * scale; - float b0 = color0.lane<2>() * scale; - - float r1 = color1.lane<0>() * scale; - float g1 = color1.lane<1>() * scale; - float b1 = color1.lane<2>() * scale; - - // Apply inverse blue-contraction. This can produce an overflow; which means BC cannot be used. - r0 += (r0 - b0); - g0 += (g0 - b0); - r1 += (r1 - b1); - g1 += (g1 - b1); - - if (r0 < 0.0f || r0 > 255.0f || g0 < 0.0f || g0 > 255.0f || b0 < 0.0f || b0 > 255.0f || - r1 < 0.0f || r1 > 255.0f || g1 < 0.0f || g1 > 255.0f || b1 < 0.0f || b1 > 255.0f) + // Apply inverse blue-contraction + color0 += color0 - color0.swz<2, 2, 2, 3>(); + color1 += color1 - color1.swz<2, 2, 2, 3>(); + + // If anything overflows BC cannot be used + vmask4 color0_error = (color0 < vfloat4(0.0f)) | (color0 > vfloat4(255.0f)); + vmask4 color1_error = (color1 < vfloat4(0.0f)) | (color1 > vfloat4(255.0f)); + if (any(color0_error | color1_error)) { return false; } - // Quantize the inverse-blue-contracted color - int ri0 = quant_color(quant_level, astc::flt2int_rtn(r0)); - int gi0 = quant_color(quant_level, astc::flt2int_rtn(g0)); - int bi0 = quant_color(quant_level, astc::flt2int_rtn(b0)); - - int ri1 = quant_color(quant_level, astc::flt2int_rtn(r1)); - int gi1 = quant_color(quant_level, astc::flt2int_rtn(g1)); - int bi1 = quant_color(quant_level, astc::flt2int_rtn(b1)); - - // Then unquantize again - int ru0 = unquant_color(quant_level, ri0); - int gu0 = unquant_color(quant_level, gi0); - int bu0 = unquant_color(quant_level, bi0); - - int ru1 = unquant_color(quant_level, ri1); - int gu1 = unquant_color(quant_level, gi1); - int bu1 = unquant_color(quant_level, bi1); + // Quantize the inverse blue-contracted color + vint4 color0i = quant_color3(quant_level, float_to_int_rtn(color0), color0); + vint4 color1i = quant_color3(quant_level, float_to_int_rtn(color1), color1); - // If color #1 is not larger than color #0 then blue-contraction cannot be used. Note that - // blue-contraction and quantization change this order, which is why we must test aftwards. - if (ru1 + gu1 + bu1 <= ru0 + gu0 + bu0) + // If color #1 is not larger than color #0 then blue-contraction cannot be used + // We must test afterwards because quantization can change the order + if (hadd_rgb_s(color1i) <= hadd_rgb_s(color0i)) { return false; } - output[0] = static_cast(ri1); - output[1] = static_cast(ri0); - output[2] = static_cast(gi1); - output[3] = static_cast(gi0); - output[4] = static_cast(bi1); - output[5] = static_cast(bi0); - + color0_out = color1i; + color1_out = color0i; return true; } @@ -263,26 +276,31 @@ static bool try_quantize_rgb_blue_contract( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r1, r0, g1, g0, b1, b0, a1, a0). + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. */ -static int try_quantize_rgba_blue_contract( +static bool try_quantize_rgba_blue_contract( vfloat4 color0, vfloat4 color1, - uint8_t output[8], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; + if (try_quantize_rgb_blue_contract(color0, color1, color0_out, color1_out, quant_level)) + { + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); - float a0 = astc::clamp255f(color0.lane<3>() * scale); - float a1 = astc::clamp255f(color1.lane<3>() * scale); + color0_out.set_lane<3>(quant_color(quant_level, astc::flt2int_rtn(a1), a1)); + color1_out.set_lane<3>(quant_color(quant_level, astc::flt2int_rtn(a0), a0)); - output[6] = quant_color(quant_level, astc::flt2int_rtn(a1)); - output[7] = quant_color(quant_level, astc::flt2int_rtn(a0)); + return true; + } - return try_quantize_rgb_blue_contract(color0, color1, output, quant_level); + return false; } /** @@ -294,7 +312,8 @@ static int try_quantize_rgba_blue_contract( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r0, r1, g0, g1, b0, b1). + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. @@ -302,277 +321,166 @@ static int try_quantize_rgba_blue_contract( static bool try_quantize_rgb_delta( vfloat4 color0, vfloat4 color1, - uint8_t output[6], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; - - float r0 = astc::clamp255f(color0.lane<0>() * scale); - float g0 = astc::clamp255f(color0.lane<1>() * scale); - float b0 = astc::clamp255f(color0.lane<2>() * scale); - - float r1 = astc::clamp255f(color1.lane<0>() * scale); - float g1 = astc::clamp255f(color1.lane<1>() * scale); - float b1 = astc::clamp255f(color1.lane<2>() * scale); - - // Transform r0 to unorm9 - int r0a = astc::flt2int_rtn(r0); - int g0a = astc::flt2int_rtn(g0); - int b0a = astc::flt2int_rtn(b0); - - r0a <<= 1; - g0a <<= 1; - b0a <<= 1; + // Transform color0 to unorm9 + vint4 color0a = float_to_int_rtn(color0); + color0.set_lane<3>(0.0f); + color0a = lsl<1>(color0a); // Mask off the top bit - int r0b = r0a & 0xFF; - int g0b = g0a & 0xFF; - int b0b = b0a & 0xFF; + vint4 color0b = color0a & 0xFF; // Quantize then unquantize in order to get a value that we take differences against - int r0be = quant_color(quant_level, r0b); - int g0be = quant_color(quant_level, g0b); - int b0be = quant_color(quant_level, b0b); - - r0b = unquant_color(quant_level, r0be); - g0b = unquant_color(quant_level, g0be); - b0b = unquant_color(quant_level, b0be); - - r0b |= r0a & 0x100; - g0b |= g0a & 0x100; - b0b |= b0a & 0x100; + vint4 color0be = quant_color3(quant_level, color0b); + color0b = color0be | (color0a & 0x100); // Get hold of the second value - int r1d = astc::flt2int_rtn(r1); - int g1d = astc::flt2int_rtn(g1); - int b1d = astc::flt2int_rtn(b1); - - r1d <<= 1; - g1d <<= 1; - b1d <<= 1; + vint4 color1d = float_to_int_rtn(color1); + color1d = lsl<1>(color1d); // ... and take differences - r1d -= r0b; - g1d -= g0b; - b1d -= b0b; + color1d = color1d - color0b; + color1d.set_lane<3>(0); // Check if the difference is too large to be encodable - if (r1d > 63 || g1d > 63 || b1d > 63 || r1d < -64 || g1d < -64 || b1d < -64) + if (any((color1d > vint4(63)) | (color1d < vint4(-64)))) { return false; } // Insert top bit of the base into the offset - r1d &= 0x7F; - g1d &= 0x7F; - b1d &= 0x7F; - - r1d |= (r0b & 0x100) >> 1; - g1d |= (g0b & 0x100) >> 1; - b1d |= (b0b & 0x100) >> 1; + color1d = color1d & 0x7F; + color1d = color1d | lsr<1>(color0b & 0x100); // Then quantize and unquantize; if this causes either top two bits to flip, then encoding fails // since we have then corrupted either the top bit of the base or the sign bit of the offset - int r1de = quant_color(quant_level, r1d); - int g1de = quant_color(quant_level, g1d); - int b1de = quant_color(quant_level, b1d); - - int r1du = unquant_color(quant_level, r1de); - int g1du = unquant_color(quant_level, g1de); - int b1du = unquant_color(quant_level, b1de); + vint4 color1de = quant_color3(quant_level, color1d); - if (((r1d ^ r1du) | (g1d ^ g1du) | (b1d ^ b1du)) & 0xC0) + vint4 color_flips = (color1d ^ color1de) & 0xC0; + color_flips.set_lane<3>(0); + if (any(color_flips != vint4::zero())) { return false; } - // Check that the sum of the encoded offsets is nonnegative, else encoding fails - r1du &= 0x7f; - g1du &= 0x7f; - b1du &= 0x7f; - - if (r1du & 0x40) - { - r1du -= 0x80; - } - - if (g1du & 0x40) - { - g1du -= 0x80; - } - - if (b1du & 0x40) - { - b1du -= 0x80; - } - - if (r1du + g1du + b1du < 0) + // If the sum of offsets triggers blue-contraction then encoding fails + vint4 ep0 = color0be; + vint4 ep1 = color1de; + bit_transfer_signed(ep1, ep0); + if (hadd_rgb_s(ep1) < 0) { return false; } // Check that the offsets produce legitimate sums as well - r1du += r0b; - g1du += g0b; - b1du += b0b; - if (r1du < 0 || r1du > 0x1FF || g1du < 0 || g1du > 0x1FF || b1du < 0 || b1du > 0x1FF) + ep0 = ep0 + ep1; + if (any((ep0 < vint4(0)) | (ep0 > vint4(0xFF)))) { return false; } - output[0] = static_cast(r0be); - output[1] = static_cast(r1de); - output[2] = static_cast(g0be); - output[3] = static_cast(g1de); - output[4] = static_cast(b0be); - output[5] = static_cast(b1de); - + color0_out = color0be; + color1_out = color1de; return true; } +/** + * @brief Try to quantize an LDR RGB color using delta encoding and blue-contraction. + * + * Blue-contraction is only usable if encoded color 1 RGB is larger than color 0 RGB. + * + * @param color0 The input unquantized color0 endpoint. + * @param color1 The input unquantized color1 endpoint. + * @param[out] color0_out The output quantized color0 endpoint. + * @param[out] color1_out The output quantized color1 endpoint. + * @param quant_level The quantization level to use. + * + * @return Returns @c false on failure, @c true on success. + */ static bool try_quantize_rgb_delta_blue_contract( vfloat4 color0, vfloat4 color1, - uint8_t output[6], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { // Note: Switch around endpoint colors already at start - float scale = 1.0f / 257.0f; - - float r1 = color0.lane<0>() * scale; - float g1 = color0.lane<1>() * scale; - float b1 = color0.lane<2>() * scale; + std::swap(color0, color1); - float r0 = color1.lane<0>() * scale; - float g0 = color1.lane<1>() * scale; - float b0 = color1.lane<2>() * scale; + // Apply inverse blue-contraction + color0 += color0 - color0.swz<2, 2, 2, 3>(); + color1 += color1 - color1.swz<2, 2, 2, 3>(); - // Apply inverse blue-contraction. This can produce an overflow; which means BC cannot be used. - r0 += (r0 - b0); - g0 += (g0 - b0); - r1 += (r1 - b1); - g1 += (g1 - b1); - - if (r0 < 0.0f || r0 > 255.0f || g0 < 0.0f || g0 > 255.0f || b0 < 0.0f || b0 > 255.0f || - r1 < 0.0f || r1 > 255.0f || g1 < 0.0f || g1 > 255.0f || b1 < 0.0f || b1 > 255.0f) + // If anything overflows BC cannot be used + vmask4 color0_error = (color0 < vfloat4(0.0f)) | (color0 > vfloat4(255.0f)); + vmask4 color1_error = (color1 < vfloat4(0.0f)) | (color1 > vfloat4(255.0f)); + if (any(color0_error | color1_error)) { return false; } - // Transform r0 to unorm9 - int r0a = astc::flt2int_rtn(r0); - int g0a = astc::flt2int_rtn(g0); - int b0a = astc::flt2int_rtn(b0); - r0a <<= 1; - g0a <<= 1; - b0a <<= 1; + // Transform color0 to unorm9 + vint4 color0a = float_to_int_rtn(color0); + color0.set_lane<3>(0.0f); + color0a = lsl<1>(color0a); // Mask off the top bit - int r0b = r0a & 0xFF; - int g0b = g0a & 0xFF; - int b0b = b0a & 0xFF; - - // Quantize, then unquantize in order to get a value that we take differences against. - int r0be = quant_color(quant_level, r0b); - int g0be = quant_color(quant_level, g0b); - int b0be = quant_color(quant_level, b0b); - - r0b = unquant_color(quant_level, r0be); - g0b = unquant_color(quant_level, g0be); - b0b = unquant_color(quant_level, b0be); + vint4 color0b = color0a & 0xFF; - r0b |= r0a & 0x100; - g0b |= g0a & 0x100; - b0b |= b0a & 0x100; + // Quantize then unquantize in order to get a value that we take differences against + vint4 color0be = quant_color3(quant_level, color0b); + color0b = color0be | (color0a & 0x100); // Get hold of the second value - int r1d = astc::flt2int_rtn(r1); - int g1d = astc::flt2int_rtn(g1); - int b1d = astc::flt2int_rtn(b1); - - r1d <<= 1; - g1d <<= 1; - b1d <<= 1; + vint4 color1d = float_to_int_rtn(color1); + color1d = lsl<1>(color1d); - // .. and take differences! - r1d -= r0b; - g1d -= g0b; - b1d -= b0b; + // ... and take differences + color1d = color1d - color0b; + color1d.set_lane<3>(0); // Check if the difference is too large to be encodable - if (r1d > 63 || g1d > 63 || b1d > 63 || r1d < -64 || g1d < -64 || b1d < -64) + if (any((color1d > vint4(63)) | (color1d < vint4(-64)))) { return false; } // Insert top bit of the base into the offset - r1d &= 0x7F; - g1d &= 0x7F; - b1d &= 0x7F; - - r1d |= (r0b & 0x100) >> 1; - g1d |= (g0b & 0x100) >> 1; - b1d |= (b0b & 0x100) >> 1; - - // Then quantize and unquantize; if this causes any of the top two bits to flip, - // then encoding fails, since we have then corrupted either the top bit of the base - // or the sign bit of the offset. - int r1de = quant_color(quant_level, r1d); - int g1de = quant_color(quant_level, g1d); - int b1de = quant_color(quant_level, b1d); - - int r1du = unquant_color(quant_level, r1de); - int g1du = unquant_color(quant_level, g1de); - int b1du = unquant_color(quant_level, b1de); - - if (((r1d ^ r1du) | (g1d ^ g1du) | (b1d ^ b1du)) & 0xC0) - { - return false; - } + color1d = color1d & 0x7F; + color1d = color1d | lsr<1>(color0b & 0x100); - // Check that the sum of the encoded offsets is negative, else encoding fails - // Note that this is inverse of the test for non-blue-contracted RGB. - r1du &= 0x7f; - g1du &= 0x7f; - b1du &= 0x7f; - - if (r1du & 0x40) - { - r1du -= 0x80; - } - - if (g1du & 0x40) - { - g1du -= 0x80; - } + // Then quantize and unquantize; if this causes either top two bits to flip, then encoding fails + // since we have then corrupted either the top bit of the base or the sign bit of the offset + vint4 color1de = quant_color3(quant_level, color1d); - if (b1du & 0x40) + vint4 color_flips = (color1d ^ color1de) & 0xC0; + color_flips.set_lane<3>(0); + if (any(color_flips != vint4::zero())) { - b1du -= 0x80; + return false; } - if (r1du + g1du + b1du >= 0) + // If the sum of offsets does not trigger blue-contraction then encoding fails + vint4 ep0 = color0be; + vint4 ep1 = color1de; + bit_transfer_signed(ep1, ep0); + if (hadd_rgb_s(ep1) >= 0) { return false; } // Check that the offsets produce legitimate sums as well - r1du += r0b; - g1du += g0b; - b1du += b0b; - - if (r1du < 0 || r1du > 0x1FF || g1du < 0 || g1du > 0x1FF || b1du < 0 || b1du > 0x1FF) + ep0 = ep0 + ep1; + if (any((ep0 < vint4(0)) | (ep0 > vint4(0xFF)))) { return false; } - output[0] = static_cast(r0be); - output[1] = static_cast(r1de); - output[2] = static_cast(g0be); - output[3] = static_cast(g1de); - output[4] = static_cast(b0be); - output[5] = static_cast(b1de); - + color0_out = color0be; + color1_out = color1de; return true; } @@ -587,7 +495,8 @@ static bool try_quantize_rgb_delta_blue_contract( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (x, x, x, x, x, x, a0, a1). + * @param[out] color0_out The output quantized color0 endpoint; must preserve lane 0/1/2. + * @param[out] color1_out The output quantized color1 endpoint; must preserve lane 0/1/2. * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. @@ -595,19 +504,18 @@ static bool try_quantize_rgb_delta_blue_contract( static bool try_quantize_alpha_delta( vfloat4 color0, vfloat4 color1, - uint8_t output[8], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - float scale = 1.0f / 257.0f; - - float a0 = astc::clamp255f(color0.lane<3>() * scale); - float a1 = astc::clamp255f(color1.lane<3>() * scale); + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); int a0a = astc::flt2int_rtn(a0); a0a <<= 1; int a0b = a0a & 0xFF; int a0be = quant_color(quant_level, a0b); - a0b = unquant_color(quant_level, a0be); + a0b = a0be; a0b |= a0a & 0x100; int a1d = astc::flt2int_rtn(a1); a1d <<= 1; @@ -622,7 +530,7 @@ static bool try_quantize_alpha_delta( a1d |= (a0b & 0x100) >> 1; int a1de = quant_color(quant_level, a1d); - int a1du = unquant_color(quant_level, a1de); + int a1du = a1de; if ((a1d ^ a1du) & 0xC0) { return false; @@ -640,8 +548,8 @@ static bool try_quantize_alpha_delta( return false; } - output[6] = static_cast(a0be); - output[7] = static_cast(a1de); + color0_out.set_lane<3>(a0be); + color1_out.set_lane<3>(a1de); return true; } @@ -668,13 +576,11 @@ static bool try_quantize_luminance_alpha_delta( uint8_t output[4], quant_method quant_level ) { - float scale = 1.0f / 257.0f; + float l0 = hadd_rgb_s(color0) * (1.0f / 3.0f); + float l1 = hadd_rgb_s(color1) * (1.0f / 3.0f); - float l0 = astc::clamp255f(hadd_rgb_s(color0) * ((1.0f / 3.0f) * scale)); - float l1 = astc::clamp255f(hadd_rgb_s(color1) * ((1.0f / 3.0f) * scale)); - - float a0 = astc::clamp255f(color0.lane<3>() * scale); - float a1 = astc::clamp255f(color1.lane<3>() * scale); + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); int l0a = astc::flt2int_rtn(l0); int a0a = astc::flt2int_rtn(a0); @@ -685,8 +591,8 @@ static bool try_quantize_luminance_alpha_delta( int a0b = a0a & 0xFF; int l0be = quant_color(quant_level, l0b); int a0be = quant_color(quant_level, a0b); - l0b = unquant_color(quant_level, l0be); - a0b = unquant_color(quant_level, a0be); + l0b = l0be; + a0b = a0be; l0b |= l0a & 0x100; a0b |= a0a & 0x100; @@ -714,8 +620,8 @@ static bool try_quantize_luminance_alpha_delta( int l1de = quant_color(quant_level, l1d); int a1de = quant_color(quant_level, a1d); - int l1du = unquant_color(quant_level, l1de); - int a1du = unquant_color(quant_level, a1de); + int l1du = l1de; + int a1du = a1de; if ((l1d ^ l1du) & 0xC0) { @@ -772,7 +678,8 @@ static bool try_quantize_luminance_alpha_delta( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r0, r1, b0, b1, g0, g1, a0, a1). + * @param[out] color0_out The output quantized color0 endpoint + * @param[out] color1_out The output quantized color1 endpoint * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. @@ -780,14 +687,14 @@ static bool try_quantize_luminance_alpha_delta( static bool try_quantize_rgba_delta( vfloat4 color0, vfloat4 color1, - uint8_t output[8], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { - return try_quantize_rgb_delta(color0, color1, output, quant_level) && - try_quantize_alpha_delta(color0, color1, output, quant_level); + return try_quantize_rgb_delta(color0, color1, color0_out, color1_out, quant_level) && + try_quantize_alpha_delta(color0, color1, color0_out, color1_out, quant_level); } - /** * @brief Try to quantize an LDR RGBA color using delta and blue contract encoding. * @@ -799,7 +706,8 @@ static bool try_quantize_rgba_delta( * * @param color0 The input unquantized color0 endpoint. * @param color1 The input unquantized color1 endpoint. - * @param[out] output The output endpoints, returned as (r0, r1, b0, b1, g0, g1, a0, a1). + * @param[out] color0_out The output quantized color0 endpoint + * @param[out] color1_out The output quantized color1 endpoint * @param quant_level The quantization level to use. * * @return Returns @c false on failure, @c true on success. @@ -807,12 +715,13 @@ static bool try_quantize_rgba_delta( static bool try_quantize_rgba_delta_blue_contract( vfloat4 color0, vfloat4 color1, - uint8_t output[8], + vint4& color0_out, + vint4& color1_out, quant_method quant_level ) { // Note that we swap the color0 and color1 ordering for alpha to match RGB blue-contract - return try_quantize_rgb_delta_blue_contract(color0, color1, output, quant_level) && - try_quantize_alpha_delta(color1, color0, output, quant_level); + return try_quantize_rgb_delta_blue_contract(color0, color1, color0_out, color1_out, quant_level) && + try_quantize_alpha_delta(color1, color0, color0_out, color1_out, quant_level); } /** @@ -833,16 +742,12 @@ static void quantize_rgbs( float g = astc::clamp255f(color.lane<1>() * scale); float b = astc::clamp255f(color.lane<2>() * scale); - int ri = quant_color(quant_level, astc::flt2int_rtn(r)); - int gi = quant_color(quant_level, astc::flt2int_rtn(g)); - int bi = quant_color(quant_level, astc::flt2int_rtn(b)); - - int ru = unquant_color(quant_level, ri); - int gu = unquant_color(quant_level, gi); - int bu = unquant_color(quant_level, bi); + int ri = quant_color(quant_level, astc::flt2int_rtn(r), r); + int gi = quant_color(quant_level, astc::flt2int_rtn(g), g); + int bi = quant_color(quant_level, astc::flt2int_rtn(b), b); float oldcolorsum = hadd_rgb_s(color) * scale; - float newcolorsum = static_cast(ru + gu + bu); + float newcolorsum = static_cast(ri + gi + bi); float scalea = astc::clamp1f(color.lane<3>() * (oldcolorsum + 1e-10f) / (newcolorsum + 1e-10f)); int scale_idx = astc::flt2int_rtn(scalea * 256.0f); @@ -857,6 +762,8 @@ static void quantize_rgbs( /** * @brief Quantize an LDR RGBA color using scale encoding. * + * @param color0 The input unquantized color0 alpha endpoint. + * @param color1 The input unquantized color1 alpha endpoint. * @param color The input unquantized color endpoint and scale factor. * @param[out] output The output endpoints, returned as (r0, g0, b0, s, a0, a1). * @param quant_level The quantization level to use. @@ -868,13 +775,11 @@ static void quantize_rgbs_alpha( uint8_t output[6], quant_method quant_level ) { - float scale = 1.0f / 257.0f; + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); - float a0 = astc::clamp255f(color0.lane<3>() * scale); - float a1 = astc::clamp255f(color1.lane<3>() * scale); - - output[4] = quant_color(quant_level, astc::flt2int_rtn(a0)); - output[5] = quant_color(quant_level, astc::flt2int_rtn(a1)); + output[4] = quant_color(quant_level, astc::flt2int_rtn(a0), a0); + output[5] = quant_color(quant_level, astc::flt2int_rtn(a1), a1); quantize_rgbs(color, output, quant_level); } @@ -893,13 +798,8 @@ static void quantize_luminance( uint8_t output[2], quant_method quant_level ) { - float scale = 1.0f / 257.0f; - - color0 = color0 * scale; - color1 = color1 * scale; - - float lum0 = astc::clamp255f(hadd_rgb_s(color0) * (1.0f / 3.0f)); - float lum1 = astc::clamp255f(hadd_rgb_s(color1) * (1.0f / 3.0f)); + float lum0 = hadd_rgb_s(color0) * (1.0f / 3.0f); + float lum1 = hadd_rgb_s(color1) * (1.0f / 3.0f); if (lum0 > lum1) { @@ -908,8 +808,8 @@ static void quantize_luminance( lum1 = avg; } - output[0] = quant_color(quant_level, astc::flt2int_rtn(lum0)); - output[1] = quant_color(quant_level, astc::flt2int_rtn(lum1)); + output[0] = quant_color(quant_level, astc::flt2int_rtn(lum0), lum0); + output[1] = quant_color(quant_level, astc::flt2int_rtn(lum1), lum1); } /** @@ -926,59 +826,16 @@ static void quantize_luminance_alpha( uint8_t output[4], quant_method quant_level ) { - float scale = 1.0f / 257.0f; - - color0 = color0 * scale; - color1 = color1 * scale; - - float lum0 = astc::clamp255f(hadd_rgb_s(color0) * (1.0f / 3.0f)); - float lum1 = astc::clamp255f(hadd_rgb_s(color1) * (1.0f / 3.0f)); - - float a0 = astc::clamp255f(color0.lane<3>()); - float a1 = astc::clamp255f(color1.lane<3>()); - - // If endpoints are close then pull apart slightly; this gives > 8 bit normal map precision. - if (quant_level > 18) - { - if (fabsf(lum0 - lum1) < 3.0f) - { - if (lum0 < lum1) - { - lum0 -= 0.5f; - lum1 += 0.5f; - } - else - { - lum0 += 0.5f; - lum1 -= 0.5f; - } - - lum0 = astc::clamp255f(lum0); - lum1 = astc::clamp255f(lum1); - } - - if (fabsf(a0 - a1) < 3.0f) - { - if (a0 < a1) - { - a0 -= 0.5f; - a1 += 0.5f; - } - else - { - a0 += 0.5f; - a1 -= 0.5f; - } + float lum0 = hadd_rgb_s(color0) * (1.0f / 3.0f); + float lum1 = hadd_rgb_s(color1) * (1.0f / 3.0f); - a0 = astc::clamp255f(a0); - a1 = astc::clamp255f(a1); - } - } + float a0 = color0.lane<3>(); + float a1 = color1.lane<3>(); - output[0] = quant_color(quant_level, astc::flt2int_rtn(lum0)); - output[1] = quant_color(quant_level, astc::flt2int_rtn(lum1)); - output[2] = quant_color(quant_level, astc::flt2int_rtn(a0)); - output[3] = quant_color(quant_level, astc::flt2int_rtn(a1)); + output[0] = quant_color(quant_level, astc::flt2int_rtn(lum0), lum0); + output[1] = quant_color(quant_level, astc::flt2int_rtn(lum1), lum1); + output[2] = quant_color(quant_level, astc::flt2int_rtn(a0), a0); + output[3] = quant_color(quant_level, astc::flt2int_rtn(a1), a1); } /** @@ -987,33 +844,29 @@ static void quantize_luminance_alpha( * @param quant_level The quantization level to use. * @param value The input unquantized value. * @param[out] quant_value The quantized value. - * @param[out] unquant_value The unquantized value after quantization. */ static inline void quantize_and_unquantize_retain_top_two_bits( quant_method quant_level, uint8_t value, - uint8_t& quant_value, - uint8_t& unquant_value + uint8_t& quant_value ) { int perform_loop; uint8_t quantval; - uint8_t uquantval; do { quantval = quant_color(quant_level, value); - uquantval = unquant_color(quant_level, quantval); // Perform looping if the top two bits were modified by quant/unquant - perform_loop = (value & 0xC0) != (uquantval & 0xC0); + perform_loop = (value & 0xC0) != (quantval & 0xC0); - if ((uquantval & 0xC0) > (value & 0xC0)) + if ((quantval & 0xC0) > (value & 0xC0)) { // Quant/unquant rounded UP so that the top two bits changed; // decrement the input in hopes that this will avoid rounding up. value--; } - else if ((uquantval & 0xC0) < (value & 0xC0)) + else if ((quantval & 0xC0) < (value & 0xC0)) { // Quant/unquant rounded DOWN so that the top two bits changed; // decrement the input in hopes that this will avoid rounding down. @@ -1022,7 +875,6 @@ static inline void quantize_and_unquantize_retain_top_two_bits( } while (perform_loop); quant_value = quantval; - unquant_value = uquantval; } /** @@ -1030,34 +882,29 @@ static inline void quantize_and_unquantize_retain_top_two_bits( * * @param quant_level The quantization level to use. * @param value The input unquantized value. - * @param[out] quant_value The quantized value. - * @param[out] unquant_value The unquantized value after quantization. + * @param[out] quant_value The quantized value in 0-255 range. */ static inline void quantize_and_unquantize_retain_top_four_bits( quant_method quant_level, uint8_t value, - uint8_t& quant_value, - uint8_t& unquant_value + uint8_t& quant_value ) { uint8_t perform_loop; uint8_t quantval; - uint8_t uquantval; do { quantval = quant_color(quant_level, value); - uquantval = unquant_color(quant_level, quantval); - // Perform looping if the top four bits were modified by quant/unquant - perform_loop = (value & 0xF0) != (uquantval & 0xF0); + perform_loop = (value & 0xF0) != (quantval & 0xF0); - if ((uquantval & 0xF0) > (value & 0xF0)) + if ((quantval & 0xF0) > (value & 0xF0)) { // Quant/unquant rounded UP so that the top four bits changed; // decrement the input value in hopes that this will avoid rounding up. value--; } - else if ((uquantval & 0xF0) < (value & 0xF0)) + else if ((quantval & 0xF0) < (value & 0xF0)) { // Quant/unquant rounded DOWN so that the top four bits changed; // decrement the input value in hopes that this will avoid rounding down. @@ -1066,7 +913,6 @@ static inline void quantize_and_unquantize_retain_top_four_bits( } while (perform_loop); quant_value = quantval; - unquant_value = uquantval; } /** @@ -1177,11 +1023,10 @@ static void quantize_hdr_rgbo( r_lowbits |= (mode_enc & 3) << 6; uint8_t r_quantval; - uint8_t r_uquantval; quantize_and_unquantize_retain_top_two_bits( - quant_level, static_cast(r_lowbits), r_quantval, r_uquantval); + quant_level, static_cast(r_lowbits), r_quantval); - r_intval = (r_intval & ~0x3f) | (r_uquantval & 0x3f); + r_intval = (r_intval & ~0x3f) | (r_quantval & 0x3f); float r_fval = static_cast(r_intval) * mode_rscale; // Recompute G and B, then quantize and unquantize them @@ -1277,16 +1122,14 @@ static void quantize_hdr_rgbo( uint8_t g_quantval; uint8_t b_quantval; - uint8_t g_uquantval; - uint8_t b_uquantval; quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(g_lowbits), g_quantval, g_uquantval); + quant_level, static_cast(g_lowbits), g_quantval); quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(b_lowbits), b_quantval, b_uquantval); + quant_level, static_cast(b_lowbits), b_quantval); - g_intval = (g_intval & ~0x1f) | (g_uquantval & 0x1f); - b_intval = (b_intval & ~0x1f) | (b_uquantval & 0x1f); + g_intval = (g_intval & ~0x1f) | (g_quantval & 0x1f); + b_intval = (b_intval & ~0x1f) | (b_quantval & 0x1f); g_fval = static_cast(g_intval) * mode_rscale; b_fval = static_cast(b_intval) * mode_rscale; @@ -1350,10 +1193,9 @@ static void quantize_hdr_rgbo( s_lowbits |= bit4 << 7; uint8_t s_quantval; - uint8_t s_uquantval; quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(s_lowbits), s_quantval, s_uquantval); + quant_level, static_cast(s_lowbits), s_quantval); output[0] = r_quantval; output[1] = g_quantval; @@ -1393,9 +1235,8 @@ static void quantize_hdr_rgbo( for (uint8_t i = 0; i < 4; i++) { - uint8_t dummy; quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(encvals[i]), output[i], dummy); + quant_level, static_cast(encvals[i]), output[i]); } return; @@ -1535,7 +1376,7 @@ static void quantize_hdr_rgb( int a_lowbits = a_intval & 0xFF; int a_quantval = quant_color(quant_level, a_lowbits); - int a_uquantval = unquant_color(quant_level, a_quantval); + int a_uquantval = a_quantval; a_intval = (a_intval & ~0xFF) | a_uquantval; float a_fval = static_cast(a_intval) * mode_rscale; @@ -1556,12 +1397,11 @@ static void quantize_hdr_rgb( c_lowbits |= (a_intval & 0x100) >> 2; uint8_t c_quantval; - uint8_t c_uquantval; quantize_and_unquantize_retain_top_two_bits( - quant_level, static_cast(c_lowbits), c_quantval, c_uquantval); + quant_level, static_cast(c_lowbits), c_quantval); - c_intval = (c_intval & ~0x3F) | (c_uquantval & 0x3F); + c_intval = (c_intval & ~0x3F) | (c_quantval & 0x3F); c_fval = static_cast(c_intval) * mode_rscale; // Recompute B0 and B1, then quantize and unquantize them @@ -1625,16 +1465,14 @@ static void quantize_hdr_rgb( uint8_t b0_quantval; uint8_t b1_quantval; - uint8_t b0_uquantval; - uint8_t b1_uquantval; quantize_and_unquantize_retain_top_two_bits( - quant_level, static_cast(b0_lowbits), b0_quantval, b0_uquantval); + quant_level, static_cast(b0_lowbits), b0_quantval); quantize_and_unquantize_retain_top_two_bits( - quant_level, static_cast(b1_lowbits), b1_quantval, b1_uquantval); + quant_level, static_cast(b1_lowbits), b1_quantval); - b0_intval = (b0_intval & ~0x3f) | (b0_uquantval & 0x3f); - b1_intval = (b1_intval & ~0x3f) | (b1_uquantval & 0x3f); + b0_intval = (b0_intval & ~0x3f) | (b0_quantval & 0x3f); + b1_intval = (b1_intval & ~0x3f) | (b1_quantval & 0x3f); b0_fval = static_cast(b0_intval) * mode_rscale; b1_fval = static_cast(b1_intval) * mode_rscale; @@ -1722,13 +1560,11 @@ static void quantize_hdr_rgb( uint8_t d0_quantval; uint8_t d1_quantval; - uint8_t d0_uquantval; - uint8_t d1_uquantval; quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(d0_lowbits), d0_quantval, d0_uquantval); + quant_level, static_cast(d0_lowbits), d0_quantval); quantize_and_unquantize_retain_top_four_bits( - quant_level, static_cast(d1_lowbits), d1_quantval, d1_uquantval); + quant_level, static_cast(d1_lowbits), d1_quantval); output[0] = static_cast(a_quantval); output[1] = c_quantval; @@ -1764,10 +1600,9 @@ static void quantize_hdr_rgb( for (int i = 4; i < 6; i++) { - uint8_t dummy; int idx = astc::flt2int_rtn(vals[i] * 1.0f / 512.0f) + 128; quantize_and_unquantize_retain_top_two_bits( - quant_level, static_cast(idx), output[i], dummy); + quant_level, static_cast(idx), output[i]); } return; @@ -1792,8 +1627,8 @@ static void quantize_hdr_rgb_ldr_alpha( float a0 = astc::clamp255f(color0.lane<3>() * scale); float a1 = astc::clamp255f(color1.lane<3>() * scale); - output[6] = quant_color(quant_level, astc::flt2int_rtn(a0)); - output[7] = quant_color(quant_level, astc::flt2int_rtn(a1)); + output[6] = quant_color(quant_level, astc::flt2int_rtn(a0), a0); + output[7] = quant_color(quant_level, astc::flt2int_rtn(a1), a1); quantize_hdr_rgb(color0, color1, output, quant_level); } @@ -1919,7 +1754,7 @@ static bool try_quantize_hdr_luminance_small_range( v0 = lowval & 0x7F; v0e = quant_color(quant_level, v0); - v0d = unquant_color(quant_level, v0e); + v0d = v0e; if (v0d < 0x80) { @@ -1929,7 +1764,7 @@ static bool try_quantize_hdr_luminance_small_range( { v1 = ((lowval >> 3) & 0xF0) | diffval; v1e = quant_color(quant_level, v1); - v1d = unquant_color(quant_level, v1e); + v1d = v1e; if ((v1d & 0xF0) == (v1 & 0xF0)) { output[0] = static_cast(v0e); @@ -1948,7 +1783,7 @@ static bool try_quantize_hdr_luminance_small_range( v0 = (lowval & 0x7F) | 0x80; v0e = quant_color(quant_level, v0); - v0d = unquant_color(quant_level, v0e); + v0d = v0e; if ((v0d & 0x80) == 0) { return false; @@ -1963,7 +1798,7 @@ static bool try_quantize_hdr_luminance_small_range( v1 = ((lowval >> 2) & 0xE0) | diffval; v1e = quant_color(quant_level, v1); - v1d = unquant_color(quant_level, v1e); + v1d = v1e; if ((v1d & 0xE0) != (v1 & 0xE0)) { return false; @@ -2007,7 +1842,7 @@ static void quantize_hdr_alpha( v6 = (val0 & 0x7F) | ((i & 1) << 7); v6e = quant_color(quant_level, v6); - v6d = unquant_color(quant_level, v6e); + v6d = v6e; if ((v6 ^ v6d) & 0x80) { @@ -2026,7 +1861,7 @@ static void quantize_hdr_alpha( v7 = ((i & 2) << 6) | ((val0 >> 7) << (6 - i)) | (diffval & mask); v7e = quant_color(quant_level, v7); - v7d = unquant_color(quant_level, v7e); + v7d = v7e; static const int testbits[3] { 0xE0, 0xF0, 0xF8 }; @@ -2083,58 +1918,170 @@ uint8_t pack_color_endpoints( ) { assert(QUANT_6 <= quant_level && quant_level <= QUANT_256); - // We do not support negative colors - color0 = max(color0, 0.0f); - color1 = max(color1, 0.0f); + // Clamp colors to a valid LDR range + // Note that HDR has a lower max, handled in the conversion functions + color0 = clamp(0.0f, 65535.0f, color0); + color1 = clamp(0.0f, 65535.0f, color1); + + // Pre-scale the LDR value we need to the 0-255 quantizable range + vfloat4 color0_ldr = color0 * (1.0f / 257.0f); + vfloat4 color1_ldr = color1 * (1.0f / 257.0f); uint8_t retval = 0; + float best_error = ERROR_CALC_DEFAULT; + vint4 color0_out, color1_out; + vint4 color0_out2, color1_out2; switch (format) { case FMT_RGB: - if (quant_level <= 18) + if (quant_level <= QUANT_160) { - if (try_quantize_rgb_delta_blue_contract(color0, color1, output, quant_level)) + if (try_quantize_rgb_delta_blue_contract(color0_ldr, color1_ldr, color0_out, color1_out, quant_level)) { + vint4 color0_unpack; + vint4 color1_unpack; + rgba_delta_unpack(color0_out, color1_out, color0_unpack, color1_unpack); + retval = FMT_RGB_DELTA; - break; + best_error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); } - if (try_quantize_rgb_delta(color0, color1, output, quant_level)) + + if (try_quantize_rgb_delta(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level)) { - retval = FMT_RGB_DELTA; - break; + vint4 color0_unpack; + vint4 color1_unpack; + rgba_delta_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGB_DELTA; + best_error = error; + color0_out = color0_out2; + color1_out = color1_out2; + } } } - if (try_quantize_rgb_blue_contract(color0, color1, output, quant_level)) + + if (quant_level < QUANT_256) { - retval = FMT_RGB; - break; + if (try_quantize_rgb_blue_contract(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level)) + { + vint4 color0_unpack; + vint4 color1_unpack; + rgba_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGB; + best_error = error; + color0_out = color0_out2; + color1_out = color1_out2; + } + } } - quantize_rgb(color0, color1, output, quant_level); - retval = FMT_RGB; + + { + quantize_rgb(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level); + + vint4 color0_unpack; + vint4 color1_unpack; + rgba_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGB; + color0_out = color0_out2; + color1_out = color1_out2; + } + } + + // TODO: Can we vectorize this? + output[0] = static_cast(color0_out.lane<0>()); + output[1] = static_cast(color1_out.lane<0>()); + output[2] = static_cast(color0_out.lane<1>()); + output[3] = static_cast(color1_out.lane<1>()); + output[4] = static_cast(color0_out.lane<2>()); + output[5] = static_cast(color1_out.lane<2>()); break; case FMT_RGBA: - if ((privateProfile == HIGH_QUALITY_PROFILE) && (quant_level <= 18)) // only full quality profile to try + if ((privateProfile == HIGH_QUALITY_PROFILE) && (quant_level <= QUANT_160)) // only full quality profile to try { - if (try_quantize_rgba_delta_blue_contract(color0, color1, output, quant_level)) + if (try_quantize_rgba_delta_blue_contract(color0_ldr, color1_ldr, color0_out, color1_out, quant_level)) { + vint4 color0_unpack; + vint4 color1_unpack; + rgba_delta_unpack(color0_out, color1_out, color0_unpack, color1_unpack); + retval = FMT_RGBA_DELTA; - break; + best_error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); } - if (try_quantize_rgba_delta(color0, color1, output, quant_level)) + + if (try_quantize_rgba_delta(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level)) { - retval = FMT_RGBA_DELTA; - break; + vint4 color0_unpack; + vint4 color1_unpack; + rgba_delta_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGBA_DELTA; + best_error = error; + color0_out = color0_out2; + color1_out = color1_out2; + } } } - if (try_quantize_rgba_blue_contract(color0, color1, output, quant_level)) + + if (quant_level < QUANT_256) { - retval = FMT_RGBA; - break; + if (try_quantize_rgba_blue_contract(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level)) + { + vint4 color0_unpack; + vint4 color1_unpack; + rgba_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGBA; + best_error = error; + color0_out = color0_out2; + color1_out = color1_out2; + } + } } - quantize_rgba(color0, color1, output, quant_level); - retval = FMT_RGBA; + + { + quantize_rgba(color0_ldr, color1_ldr, color0_out2, color1_out2, quant_level); + + vint4 color0_unpack; + vint4 color1_unpack; + rgba_unpack(color0_out2, color1_out2, color0_unpack, color1_unpack); + + float error = get_rgba_encoding_error(color0_ldr, color1_ldr, color0_unpack, color1_unpack); + if (error < best_error) + { + retval = FMT_RGBA; + color0_out = color0_out2; + color1_out = color1_out2; + } + } + + // TODO: Can we vectorize this? + output[0] = static_cast(color0_out.lane<0>()); + output[1] = static_cast(color1_out.lane<0>()); + output[2] = static_cast(color0_out.lane<1>()); + output[3] = static_cast(color1_out.lane<1>()); + output[4] = static_cast(color0_out.lane<2>()); + output[5] = static_cast(color1_out.lane<2>()); + output[6] = static_cast(color0_out.lane<3>()); + output[7] = static_cast(color1_out.lane<3>()); break; case FMT_RGB_SCALE: @@ -2153,7 +2100,7 @@ uint8_t pack_color_endpoints( break; case FMT_RGB_SCALE_ALPHA: - quantize_rgbs_alpha(color0, color1, rgbs_color, output, quant_level); + quantize_rgbs_alpha(color0_ldr, color1_ldr, rgbs_color, output, quant_level); retval = FMT_RGB_SCALE_ALPHA; break; @@ -2169,20 +2116,20 @@ uint8_t pack_color_endpoints( break; case FMT_LUMINANCE: - quantize_luminance(color0, color1, output, quant_level); + quantize_luminance(color0_ldr, color1_ldr, output, quant_level); retval = FMT_LUMINANCE; break; case FMT_LUMINANCE_ALPHA: if (quant_level <= 18) { - if (try_quantize_luminance_alpha_delta(color0, color1, output, quant_level)) + if (try_quantize_luminance_alpha_delta(color0_ldr, color1_ldr, output, quant_level)) { retval = FMT_LUMINANCE_ALPHA_DELTA; break; } } - quantize_luminance_alpha(color0, color1, output, quant_level); + quantize_luminance_alpha(color0_ldr, color1_ldr, output, quant_level); retval = FMT_LUMINANCE_ALPHA; break; diff --git a/Source/astcenc_color_unquantize.cpp b/Source/astcenc_color_unquantize.cpp index bb02d81bc07d355b78023d89119513153a70dc6b..2daa515e731926c87c479eaf26bca1a5f5a6701a 100644 --- a/Source/astcenc_color_unquantize.cpp +++ b/Source/astcenc_color_unquantize.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -23,43 +23,6 @@ #include "astcenc_internal.h" -/** - * @brief Unquantize a color. - * - * This function uses a lookup table as the quantization is encoded to make - * hardware implementations easier, and is not a simple lerp. - * - * @param quant_level The quantization level to use. - * @param inputq The input quantized color. - * - * @return The unquantized color. - */ -static ASTCENC_SIMD_INLINE vint4 unquant_color( - quant_method quant_level, - vint4 inputq -) { - const uint8_t* unq = color_unquant_tables[quant_level - QUANT_6]; - return vint4(unq[inputq.lane<0>()], unq[inputq.lane<1>()], - unq[inputq.lane<2>()], unq[inputq.lane<3>()]); -} - -/** - * @brief Determine the quantized value given a quantization level. - * - * @param quant_level The quantization level to use. - * @param value The value to convert. This may be outside of the 0-255 range and will be - * clamped before the value is looked up. - * - * @return The encoded quantized value. These are not necessarily in the order; the compressor - * scrambles the values slightly to make hardware implementation easier. - */ -static inline int unquant_color( - quant_method quant_level, - int value -) { - return color_unquant_tables[quant_level - QUANT_6][value]; -} - /** * @brief Un-blue-contract a color. * @@ -77,35 +40,14 @@ static ASTCENC_SIMD_INLINE vint4 uncontract_color( return select(input, bc0, mask); } -/** - * @brief Unpack an LDR RGBA color that uses delta encoding. - * - * @param input0q The raw quantized endpoint 0 color. - * @param input1q The raw quantized endpoint 1 color deltas. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. - */ -static void rgba_delta_unpack( - vint4 input0q, - vint4 input1q, - quant_method quant_level, +void rgba_delta_unpack( + vint4 input0, + vint4 input1, vint4& output0, vint4& output1 ) { - // Unquantize color endpoints - vint4 input0 = unquant_color(quant_level, input0q); - vint4 input1 = unquant_color(quant_level, input1q); - - // Perform bit-transfer - input0 = input0 | lsl<1>(input1 & 0x80); - input1 = input1 & 0x7F; - vmask4 mask = (input1 & 0x40) != vint4::zero(); - input1 = select(input1, input1 - 0x80, mask); - - // Scale - input0 = asr<1>(input0); - input1 = asr<1>(input1); + // Apply bit transfer + bit_transfer_signed(input1, input0); // Apply blue-uncontraction if needed int rgb_sum = hadd_rgb_s(input1); @@ -126,44 +68,28 @@ static void rgba_delta_unpack( * * Output alpha set to 255. * - * @param input0q The raw quantized endpoint 0 color. - * @param input1q The raw quantized endpoint 1 color deltas. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input0 The packed endpoint 0 color. + * @param input1 The packed endpoint 1 color deltas. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void rgb_delta_unpack( - vint4 input0q, - vint4 input1q, - quant_method quant_level, + vint4 input0, + vint4 input1, vint4& output0, vint4& output1 ) { - rgba_delta_unpack(input0q, input1q, quant_level, output0, output1); + rgba_delta_unpack(input0, input1, output0, output1); output0.set_lane<3>(255); output1.set_lane<3>(255); } -/** - * @brief Unpack an LDR RGBA color that uses direct encoding. - * - * @param input0q The raw quantized endpoint 0 color. - * @param input1q The raw quantized endpoint 1 color. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. - */ -static void rgba_unpack( - vint4 input0q, - vint4 input1q, - quant_method quant_level, +void rgba_unpack( + vint4 input0, + vint4 input1, vint4& output0, vint4& output1 ) { - // Unquantize color endpoints - vint4 input0 = unquant_color(quant_level, input0q); - vint4 input1 = unquant_color(quant_level, input1q); - // Apply blue-uncontraction if needed if (hadd_rgb_s(input0) > hadd_rgb_s(input1)) { @@ -181,20 +107,18 @@ static void rgba_unpack( * * Output alpha set to 255. * - * @param input0q The raw quantized endpoint 0 color. - * @param input1q The raw quantized endpoint 1 color. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input0 The packed endpoint 0 color. + * @param input1 The packed endpoint 1 color. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void rgb_unpack( - vint4 input0q, - vint4 input1q, - quant_method quant_level, + vint4 input0, + vint4 input1, vint4& output0, vint4& output1 ) { - rgba_unpack(input0q, input1q, quant_level, output0, output1); + rgba_unpack(input0, input1, output0, output1); output0.set_lane<3>(255); output1.set_lane<3>(255); } @@ -204,31 +128,24 @@ static void rgb_unpack( * * Note only the RGB channels use the scaled encoding, alpha uses direct. * - * @param input0q The raw quantized endpoint 0 color. - * @param alpha1q The raw quantized endpoint 1 alpha value. - * @param scaleq The raw quantized scale. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input0 The packed endpoint 0 color. + * @param alpha1 The packed endpoint 1 alpha value. + * @param scale The packed quantized scale. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void rgb_scale_alpha_unpack( - vint4 input0q, - uint8_t alpha1q, - uint8_t scaleq, - quant_method quant_level, + vint4 input0, + uint8_t alpha1, + uint8_t scale, vint4& output0, vint4& output1 ) { - // Unquantize color endpoints - vint4 input = unquant_color(quant_level, input0q); - uint8_t alpha1 = unquant_color(quant_level, alpha1q); - uint8_t scale = unquant_color(quant_level, scaleq); - - output1 = input; + output1 = input0; output1.set_lane<3>(alpha1); - output0 = asr<8>(input * scale); - output0.set_lane<3>(input.lane<3>()); + output0 = asr<8>(input0 * scale); + output0.set_lane<3>(input0.lane<3>()); } /** @@ -236,26 +153,21 @@ static void rgb_scale_alpha_unpack( * * Output alpha is 255. * - * @param input0q The raw quantized endpoint 0 color. - * @param scaleq The raw quantized scale. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input0 The packed endpoint 0 color. + * @param scale The packed scale. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void rgb_scale_unpack( - vint4 input0q, - int scaleq, - quant_method quant_level, + vint4 input0, + int scale, vint4& output0, vint4& output1 ) { - vint4 input = unquant_color(quant_level, input0q); - int scale = unquant_color(quant_level, scaleq); - - output1 = input; + output1 = input0; output1.set_lane<3>(255); - output0 = asr<8>(input * scale); + output0 = asr<8>(input0 * scale); output0.set_lane<3>(255); } @@ -264,19 +176,17 @@ static void rgb_scale_unpack( * * Output alpha is 255. * - * @param input The raw quantized endpoints. - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void luminance_unpack( const uint8_t input[2], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int lum0 = unquant_color(quant_level, input[0]); - int lum1 = unquant_color(quant_level, input[1]); + int lum0 = input[0]; + int lum1 = input[1]; output0 = vint4(lum0, lum0, lum0, 255); output1 = vint4(lum1, lum1, lum1, 255); } @@ -286,19 +196,17 @@ static void luminance_unpack( * * Output alpha is 255. * - * @param input The raw quantized endpoints (L0, L1). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (L0, L1). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void luminance_delta_unpack( const uint8_t input[2], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int v0 = unquant_color(quant_level, input[0]); - int v1 = unquant_color(quant_level, input[1]); + int v0 = input[0]; + int v1 = input[1]; int l0 = (v0 >> 2) | (v1 & 0xC0); int l1 = l0 + (v1 & 0x3F); @@ -311,21 +219,19 @@ static void luminance_delta_unpack( /** * @brief Unpack an LDR LA color that uses direct encoding. * - * @param input The raw quantized endpoints (L0, L1, A0, A1). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (L0, L1, A0, A1). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void luminance_alpha_unpack( const uint8_t input[4], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int lum0 = unquant_color(quant_level, input[0]); - int lum1 = unquant_color(quant_level, input[1]); - int alpha0 = unquant_color(quant_level, input[2]); - int alpha1 = unquant_color(quant_level, input[3]); + int lum0 = input[0]; + int lum1 = input[1]; + int alpha0 = input[2]; + int alpha1 = input[3]; output0 = vint4(lum0, lum0, lum0, alpha0); output1 = vint4(lum1, lum1, lum1, alpha1); } @@ -333,30 +239,34 @@ static void luminance_alpha_unpack( /** * @brief Unpack an LDR LA color that uses delta encoding. * - * @param input The raw quantized endpoints (L0, L1, A0, A1). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (L0, L1, A0, A1). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void luminance_alpha_delta_unpack( const uint8_t input[4], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int lum0 = unquant_color(quant_level, input[0]); - int lum1 = unquant_color(quant_level, input[1]); - int alpha0 = unquant_color(quant_level, input[2]); - int alpha1 = unquant_color(quant_level, input[3]); + int lum0 = input[0]; + int lum1 = input[1]; + int alpha0 = input[2]; + int alpha1 = input[3]; lum0 |= (lum1 & 0x80) << 1; alpha0 |= (alpha1 & 0x80) << 1; lum1 &= 0x7F; alpha1 &= 0x7F; + if (lum1 & 0x40) + { lum1 -= 0x80; + } + if (alpha1 & 0x40) + { alpha1 -= 0x80; + } lum0 >>= 1; lum1 >>= 1; @@ -375,21 +285,19 @@ static void luminance_alpha_delta_unpack( /** * @brief Unpack an HDR RGB + offset encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_rgbo_unpack( const uint8_t input[4], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int v0 = unquant_color(quant_level, input[0]); - int v1 = unquant_color(quant_level, input[1]); - int v2 = unquant_color(quant_level, input[2]); - int v3 = unquant_color(quant_level, input[3]); + int v0 = input[0]; + int v1 = input[1]; + int v2 = input[2]; + int v3 = input[3]; int modeval = ((v0 & 0xC0) >> 6) | (((v1 & 0x80) >> 7) << 2) | (((v2 & 0x80) >> 7) << 3); @@ -527,24 +435,22 @@ static void hdr_rgbo_unpack( /** * @brief Unpack an HDR RGB direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_rgb_unpack( const uint8_t input[6], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int v0 = unquant_color(quant_level, input[0]); - int v1 = unquant_color(quant_level, input[1]); - int v2 = unquant_color(quant_level, input[2]); - int v3 = unquant_color(quant_level, input[3]); - int v4 = unquant_color(quant_level, input[4]); - int v5 = unquant_color(quant_level, input[5]); + int v0 = input[0]; + int v1 = input[1]; + int v2 = input[2]; + int v3 = input[3]; + int v4 = input[4]; + int v5 = input[5]; // extract all the fixed-placement bitfields int modeval = ((v1 & 0x80) >> 7) | (((v2 & 0x80) >> 7) << 1) | (((v3 & 0x80) >> 7) << 2); @@ -695,21 +601,19 @@ static void hdr_rgb_unpack( /** * @brief Unpack an HDR RGB + LDR A direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_rgb_ldr_alpha_unpack( const uint8_t input[8], - quant_method quant_level, vint4& output0, vint4& output1 ) { - hdr_rgb_unpack(input, quant_level, output0, output1); + hdr_rgb_unpack(input, output0, output1); - int v6 = unquant_color(quant_level, input[6]); - int v7 = unquant_color(quant_level, input[7]); + int v6 = input[6]; + int v7 = input[7]; output0.set_lane<3>(v6); output1.set_lane<3>(v7); } @@ -717,19 +621,17 @@ static void hdr_rgb_ldr_alpha_unpack( /** * @brief Unpack an HDR L (small range) direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_luminance_small_range_unpack( const uint8_t input[2], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int v0 = unquant_color(quant_level, input[0]); - int v1 = unquant_color(quant_level, input[1]); + int v0 = input[0]; + int v1 = input[1]; int y0, y1; if (v0 & 0x80) @@ -745,7 +647,9 @@ static void hdr_luminance_small_range_unpack( y1 += y0; if (y1 > 0xFFF) + { y1 = 0xFFF; + } output0 = vint4(y0 << 4, y0 << 4, y0 << 4, 0x7800); output1 = vint4(y1 << 4, y1 << 4, y1 << 4, 0x7800); @@ -754,19 +658,17 @@ static void hdr_luminance_small_range_unpack( /** * @brief Unpack an HDR L (large range) direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_luminance_large_range_unpack( const uint8_t input[2], - quant_method quant_level, vint4& output0, vint4& output1 ) { - int v0 = unquant_color(quant_level, input[0]); - int v1 = unquant_color(quant_level, input[1]); + int v0 = input[0]; + int v1 = input[1]; int y0, y1; if (v1 >= v0) @@ -787,20 +689,18 @@ static void hdr_luminance_large_range_unpack( /** * @brief Unpack an HDR A direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_alpha_unpack( const uint8_t input[2], - quant_method quant_level, int& output0, int& output1 ) { - int v6 = unquant_color(quant_level, input[0]); - int v7 = unquant_color(quant_level, input[1]); + int v6 = input[0]; + int v7 = input[1]; int selector = ((v6 >> 7) & 1) | ((v7 >> 6) & 2); v6 &= 0x7F; @@ -821,9 +721,13 @@ static void hdr_alpha_unpack( v7 += v6; if (v7 < 0) + { v7 = 0; + } else if (v7 > 0xFFF) + { v7 = 0xFFF; + } output0 = v6; output1 = v7; @@ -836,21 +740,19 @@ static void hdr_alpha_unpack( /** * @brief Unpack an HDR RGBA direct encoding. * - * @param input The raw quantized endpoints (packed and modal). - * @param quant_level The quantization level to use. - * @param[out] output0 The unpacked and unquantized endpoint 0 color. - * @param[out] output1 The unpacked and unquantized endpoint 1 color. + * @param input The packed endpoints (packed and modal). + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. */ static void hdr_rgb_hdr_alpha_unpack( const uint8_t input[8], - quant_method quant_level, vint4& output0, vint4& output1 ) { - hdr_rgb_unpack(input, quant_level, output0, output1); + hdr_rgb_unpack(input, output0, output1); int alpha0, alpha1; - hdr_alpha_unpack(input + 6, quant_level, alpha0, alpha1); + hdr_alpha_unpack(input + 6, alpha0, alpha1); output0.set_lane<3>(alpha0); output1.set_lane<3>(alpha1); @@ -860,7 +762,6 @@ static void hdr_rgb_hdr_alpha_unpack( void unpack_color_endpoints( astcenc_profile decode_mode, int format, - quant_method quant_level, const uint8_t* input, bool& rgb_hdr, bool& alpha_hdr, @@ -876,38 +777,38 @@ void unpack_color_endpoints( switch (format) { case FMT_LUMINANCE: - luminance_unpack(input, quant_level, output0, output1); + luminance_unpack(input, output0, output1); break; case FMT_LUMINANCE_DELTA: - luminance_delta_unpack(input, quant_level, output0, output1); + luminance_delta_unpack(input, output0, output1); break; case FMT_HDR_LUMINANCE_SMALL_RANGE: rgb_hdr = true; alpha_hdr_default = true; - hdr_luminance_small_range_unpack(input, quant_level, output0, output1); + hdr_luminance_small_range_unpack(input, output0, output1); break; case FMT_HDR_LUMINANCE_LARGE_RANGE: rgb_hdr = true; alpha_hdr_default = true; - hdr_luminance_large_range_unpack(input, quant_level, output0, output1); + hdr_luminance_large_range_unpack(input, output0, output1); break; case FMT_LUMINANCE_ALPHA: - luminance_alpha_unpack(input, quant_level, output0, output1); + luminance_alpha_unpack(input, output0, output1); break; case FMT_LUMINANCE_ALPHA_DELTA: - luminance_alpha_delta_unpack(input, quant_level, output0, output1); + luminance_alpha_delta_unpack(input, output0, output1); break; case FMT_RGB_SCALE: { vint4 input0q(input[0], input[1], input[2], 0); uint8_t scale = input[3]; - rgb_scale_unpack(input0q, scale, quant_level, output0, output1); + rgb_scale_unpack(input0q, scale, output0, output1); } break; @@ -916,21 +817,21 @@ void unpack_color_endpoints( vint4 input0q(input[0], input[1], input[2], input[4]); uint8_t alpha1q = input[5]; uint8_t scaleq = input[3]; - rgb_scale_alpha_unpack(input0q, alpha1q, scaleq, quant_level, output0, output1); + rgb_scale_alpha_unpack(input0q, alpha1q, scaleq, output0, output1); } break; case FMT_HDR_RGB_SCALE: rgb_hdr = true; alpha_hdr_default = true; - hdr_rgbo_unpack(input, quant_level,output0, output1); + hdr_rgbo_unpack(input, output0, output1); break; case FMT_RGB: { vint4 input0q(input[0], input[2], input[4], 0); vint4 input1q(input[1], input[3], input[5], 0); - rgb_unpack(input0q, input1q, quant_level, output0, output1); + rgb_unpack(input0q, input1q, output0, output1); } break; @@ -938,21 +839,21 @@ void unpack_color_endpoints( { vint4 input0q(input[0], input[2], input[4], 0); vint4 input1q(input[1], input[3], input[5], 0); - rgb_delta_unpack(input0q, input1q, quant_level, output0, output1); + rgb_delta_unpack(input0q, input1q, output0, output1); } break; case FMT_HDR_RGB: rgb_hdr = true; alpha_hdr_default = true; - hdr_rgb_unpack(input, quant_level, output0, output1); + hdr_rgb_unpack(input, output0, output1); break; case FMT_RGBA: { vint4 input0q(input[0], input[2], input[4], input[6]); vint4 input1q(input[1], input[3], input[5], input[7]); - rgba_unpack(input0q, input1q, quant_level, output0, output1); + rgba_unpack(input0q, input1q, output0, output1); } break; @@ -960,19 +861,19 @@ void unpack_color_endpoints( { vint4 input0q(input[0], input[2], input[4], input[6]); vint4 input1q(input[1], input[3], input[5], input[7]); - rgba_delta_unpack(input0q, input1q, quant_level, output0, output1); + rgba_delta_unpack(input0q, input1q, output0, output1); } break; case FMT_HDR_RGB_LDR_ALPHA: rgb_hdr = true; - hdr_rgb_ldr_alpha_unpack(input, quant_level, output0, output1); + hdr_rgb_ldr_alpha_unpack(input, output0, output1); break; case FMT_HDR_RGBA: rgb_hdr = true; alpha_hdr = true; - hdr_rgb_hdr_alpha_unpack(input, quant_level, output0, output1); + hdr_rgb_hdr_alpha_unpack(input, output0, output1); break; } @@ -993,32 +894,55 @@ void unpack_color_endpoints( } } - vint4 ldr_scale(257); - vint4 hdr_scale(1); - vint4 output_scale = ldr_scale; + // Handle endpoint errors and expansion - // An LDR profile image - if ((decode_mode == ASTCENC_PRF_LDR) || - (decode_mode == ASTCENC_PRF_LDR_SRGB)) + // Linear LDR 8-bit endpoints are expanded to 16-bit by replication + if (decode_mode == ASTCENC_PRF_LDR) { - // Also matches HDR alpha, as cannot have HDR alpha without HDR RGB - if (rgb_hdr == true) + // Error color - HDR endpoint in an LDR encoding + if (rgb_hdr || alpha_hdr) { - output0 = vint4(0xFF00, 0x0000, 0xFF00, 0xFF00); - output1 = vint4(0xFF00, 0x0000, 0xFF00, 0xFF00); - output_scale = hdr_scale; + output0 = vint4(0xFF, 0x00, 0xFF, 0xFF); + output1 = vint4(0xFF, 0x00, 0xFF, 0xFF); + rgb_hdr = false; + alpha_hdr = false; + } + output0 = output0 * 257; + output1 = output1 * 257; + } + // sRGB LDR 8-bit endpoints are expanded to 16 bit by: + // - RGB = shift left by 8 bits and OR with 0x80 + // - A = replication + else if (decode_mode == ASTCENC_PRF_LDR_SRGB) + { + // Error color - HDR endpoint in an LDR encoding + if (rgb_hdr || alpha_hdr) + { + output0 = vint4(0xFF, 0x00, 0xFF, 0xFF); + output1 = vint4(0xFF, 0x00, 0xFF, 0xFF); rgb_hdr = false; alpha_hdr = false; } + + vmask4 mask(true, true, true, false); + + vint4 output0rgb = lsl<8>(output0) | vint4(0x80); + vint4 output0a = output0 * 257; + output0 = select(output0a, output0rgb, mask); + + vint4 output1rgb = lsl<8>(output1) | vint4(0x80); + vint4 output1a = output1 * 257; + output1 = select(output1a, output1rgb, mask); } - // An HDR profile image + // An HDR profile decode, but may be using linear LDR endpoints + // Linear LDR 8-bit endpoints are expanded to 16-bit by replication + // HDR endpoints are already 16-bit else { vmask4 hdr_lanes(rgb_hdr, rgb_hdr, rgb_hdr, alpha_hdr); - output_scale = select(ldr_scale, hdr_scale, hdr_lanes); + vint4 output_scale = select(vint4(257), vint4(1), hdr_lanes); + output0 = output0 * output_scale; + output1 = output1 * output_scale; } - - output0 = output0 * output_scale; - output1 = output1 * output_scale; } diff --git a/Source/astcenc_compress_symbolic.cpp b/Source/astcenc_compress_symbolic.cpp index 35bb26979a2feca5066337a2fddd884c14f97baa..2560f544faca7fe49ed13a0ac0c9b20fef0762ed 100644 --- a/Source/astcenc_compress_symbolic.cpp +++ b/Source/astcenc_compress_symbolic.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -79,10 +79,10 @@ static bool realign_weights_undecimated( // Get the quantization table const block_mode& bm = bsd.get_block_mode(scb.block_mode); unsigned int weight_quant_level = bm.quant_mode; - const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[weight_quant_level]); + const quant_and_transfer_table& qat = quant_and_xfer_tables[weight_quant_level]; unsigned int max_plane = bm.is_dual_plane; - int plane2_component = bm.is_dual_plane ? scb.plane2_component : -1; + int plane2_component = scb.plane2_component; vmask4 plane_mask = vint4::lane_id() == vint4(plane2_component); // Decode the color endpoints @@ -99,14 +99,13 @@ static bool realign_weights_undecimated( { unpack_color_endpoints(decode_mode, scb.color_formats[pa_idx], - scb.get_color_quant_mode(), scb.color_values[pa_idx], rgb_hdr, alpha_hdr, endpnt0[pa_idx], endpnt1[pa_idx]); } - uint8_t* dec_weights_quant_pvalue = scb.weights; + uint8_t* dec_weights_uquant = scb.weights; bool adjustments = false; // For each plane and partition ... @@ -126,50 +125,48 @@ static bool realign_weights_undecimated( promise(bsd.texel_count > 0); for (unsigned int texel = 0; texel < bsd.texel_count; texel++) { - int uqw = qat->unquantized_value[dec_weights_quant_pvalue[texel]]; + int uqw = dec_weights_uquant[texel]; - uint32_t prev_and_next = qat->prev_next_values[uqw]; - int prev_wt_uq = prev_and_next & 0xFF; - int next_wt_uq = (prev_and_next >> 8) & 0xFF; + uint32_t prev_and_next = qat.prev_next_values[uqw]; + int uqw_down = prev_and_next & 0xFF; + int uqw_up = (prev_and_next >> 8) & 0xFF; // Interpolate the colors to create the diffs - unsigned int partition = pi.partition_of_texel[texel]; - - float plane_weight = static_cast(uqw); - float plane_up_weight = static_cast(next_wt_uq - uqw); - float plane_down_weight = static_cast(prev_wt_uq - uqw); + float weight_base = static_cast(uqw); + float weight_down = static_cast(uqw_down - uqw); + float weight_up = static_cast(uqw_up - uqw); + unsigned int partition = pi.partition_of_texel[texel]; vfloat4 color_offset = offset[partition]; vfloat4 color_base = endpnt0f[partition]; - vfloat4 color = color_base + color_offset * plane_weight; - + vfloat4 color = color_base + color_offset * weight_base; vfloat4 orig_color = blk.texel(texel); vfloat4 error_weight = blk.channel_weight; vfloat4 color_diff = color - orig_color; - vfloat4 color_up_diff = color_diff + color_offset * plane_up_weight; - vfloat4 color_down_diff = color_diff + color_offset * plane_down_weight; + vfloat4 color_diff_down = color_diff + color_offset * weight_down; + vfloat4 color_diff_up = color_diff + color_offset * weight_up; - float current_error = dot_s(color_diff * color_diff, error_weight); - float up_error = dot_s(color_up_diff * color_up_diff, error_weight); - float down_error = dot_s(color_down_diff * color_down_diff, error_weight); + float error_base = dot_s(color_diff * color_diff, error_weight); + float error_down = dot_s(color_diff_down * color_diff_down, error_weight); + float error_up = dot_s(color_diff_up * color_diff_up, error_weight); // Check if the prev or next error is better, and if so use it - if ((up_error < current_error) && (up_error < down_error)) + if ((error_up < error_base) && (error_up < error_down) && (uqw < 64)) { - dec_weights_quant_pvalue[texel] = static_cast((prev_and_next >> 24) & 0xFF); + dec_weights_uquant[texel] = static_cast(uqw_up); adjustments = true; } - else if (down_error < current_error) + else if ((error_down < error_base) && (uqw > 0)) { - dec_weights_quant_pvalue[texel] = static_cast((prev_and_next >> 16) & 0xFF); + dec_weights_uquant[texel] = static_cast(uqw_down); adjustments = true; } } // Prepare iteration for plane 2 - dec_weights_quant_pvalue += WEIGHTS_PLANE2_OFFSET; + dec_weights_uquant += WEIGHTS_PLANE2_OFFSET; plane_mask = ~plane_mask; } @@ -201,7 +198,7 @@ static bool realign_weights_decimated( // Get the quantization table const block_mode& bm = bsd.get_block_mode(scb.block_mode); unsigned int weight_quant_level = bm.quant_mode; - const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[weight_quant_level]); + const quant_and_transfer_table& qat = quant_and_xfer_tables[weight_quant_level]; // Get the decimation table const decimation_info& di = bsd.get_decimation_info(bm.decimation_mode); @@ -209,7 +206,7 @@ static bool realign_weights_decimated( assert(weight_count != bsd.texel_count); unsigned int max_plane = bm.is_dual_plane; - int plane2_component = bm.is_dual_plane ? scb.plane2_component : -1; + int plane2_component = scb.plane2_component; vmask4 plane_mask = vint4::lane_id() == vint4(plane2_component); // Decode the color endpoints @@ -227,16 +224,13 @@ static bool realign_weights_decimated( { unpack_color_endpoints(decode_mode, scb.color_formats[pa_idx], - scb.get_color_quant_mode(), scb.color_values[pa_idx], rgb_hdr, alpha_hdr, endpnt0[pa_idx], endpnt1[pa_idx]); } - uint8_t uq_pl_weights[BLOCK_MAX_WEIGHTS]; - float uq_pl_weightsf[BLOCK_MAX_WEIGHTS]; - uint8_t* dec_weights_quant_pvalue = scb.weights; + uint8_t* dec_weights_uquant = scb.weights; bool adjustments = false; // For each plane and partition ... @@ -253,97 +247,90 @@ static bool realign_weights_decimated( } // Create an unquantized weight grid for this decimation level - for (unsigned int we_idx = 0; we_idx < weight_count; we_idx++) + ASTCENC_ALIGNAS float uq_weightsf[BLOCK_MAX_WEIGHTS]; + for (unsigned int we_idx = 0; we_idx < weight_count; we_idx += ASTCENC_SIMD_WIDTH) { - uq_pl_weights[we_idx] = qat->unquantized_value[dec_weights_quant_pvalue[we_idx]]; - uq_pl_weightsf[we_idx] = static_cast(uq_pl_weights[we_idx]); + vint unquant_value(dec_weights_uquant + we_idx); + vfloat unquant_valuef = int_to_float(unquant_value); + storea(unquant_valuef, uq_weightsf + we_idx); } // For each weight compute previous, current, and next errors for (unsigned int we_idx = 0; we_idx < weight_count; we_idx++) { - unsigned int uqw = uq_pl_weights[we_idx]; - float uqwf = uq_pl_weightsf[we_idx]; + int uqw = dec_weights_uquant[we_idx]; + uint32_t prev_and_next = qat.prev_next_values[uqw]; - uint32_t prev_and_next = qat->prev_next_values[uqw]; - unsigned int prev_wt_uq = prev_and_next & 0xFF; - unsigned int next_wt_uq = (prev_and_next >> 8) & 0xFF; + float uqw_base = uq_weightsf[we_idx]; + float uqw_down = static_cast(prev_and_next & 0xFF); + float uqw_up = static_cast((prev_and_next >> 8) & 0xFF); - float uqw_next_dif = static_cast(next_wt_uq) - uqwf; - float uqw_prev_dif = static_cast(prev_wt_uq) - uqwf; + float uqw_diff_down = uqw_down - uqw_base; + float uqw_diff_up = uqw_up - uqw_base; - vfloat4 current_errorv = vfloat4::zero(); - vfloat4 up_errorv = vfloat4::zero(); - vfloat4 down_errorv = vfloat4::zero(); + vfloat4 error_basev = vfloat4::zero(); + vfloat4 error_downv = vfloat4::zero(); + vfloat4 error_upv = vfloat4::zero(); // Interpolate the colors to create the diffs unsigned int texels_to_evaluate = di.weight_texel_count[we_idx]; promise(texels_to_evaluate > 0); for (unsigned int te_idx = 0; te_idx < texels_to_evaluate; te_idx++) { - unsigned int texel = di.weight_texel[te_idx][we_idx]; - float weight_base = uqwf; - - const uint8_t *texel_weights = di.texel_weights_texel[we_idx][te_idx]; - const float *texel_weights_float = di.texel_weights_float_texel[we_idx][te_idx]; - float twf0 = texel_weights_float[0]; + unsigned int texel = di.weight_texels_tr[te_idx][we_idx]; - weight_base = (uqwf * twf0 - + uq_pl_weightsf[texel_weights[1]] * texel_weights_float[1]) - + (uq_pl_weightsf[texel_weights[2]] * texel_weights_float[2] - + uq_pl_weightsf[texel_weights[3]] * texel_weights_float[3]); + float tw_base = di.texel_contrib_for_weight[te_idx][we_idx]; - unsigned int partition = pi.partition_of_texel[texel]; + float weight_base = (uq_weightsf[di.texel_weights_tr[0][texel]] * di.texel_weight_contribs_float_tr[0][texel] + + uq_weightsf[di.texel_weights_tr[1][texel]] * di.texel_weight_contribs_float_tr[1][texel]) + + (uq_weightsf[di.texel_weights_tr[2][texel]] * di.texel_weight_contribs_float_tr[2][texel] + + uq_weightsf[di.texel_weights_tr[3][texel]] * di.texel_weight_contribs_float_tr[3][texel]); // Ideally this is integer rounded, but IQ gain it isn't worth the overhead - // float plane_weight = astc::flt_rd(weight_base + 0.5f); - // float plane_up_weight = astc::flt_rd(weight_base + 0.5f + uqw_next_dif * twf0) - plane_weight; - // float plane_down_weight = astc::flt_rd(weight_base + 0.5f + uqw_prev_dif * twf0) - plane_weight; - - float plane_weight = weight_base; - float plane_up_weight = weight_base + uqw_next_dif * twf0 - plane_weight; - float plane_down_weight = weight_base + uqw_prev_dif * twf0 - plane_weight; + // float weight = astc::flt_rd(weight_base + 0.5f); + // float weight_down = astc::flt_rd(weight_base + 0.5f + uqw_diff_down * tw_base) - weight; + // float weight_up = astc::flt_rd(weight_base + 0.5f + uqw_diff_up * tw_base) - weight; + float weight_down = weight_base + uqw_diff_down * tw_base - weight_base; + float weight_up = weight_base + uqw_diff_up * tw_base - weight_base; + unsigned int partition = pi.partition_of_texel[texel]; vfloat4 color_offset = offset[partition]; vfloat4 color_base = endpnt0f[partition]; - vfloat4 color = color_base + color_offset * plane_weight; - - vfloat4 orig_color = blk.texel(texel); + vfloat4 color = color_base + color_offset * weight_base; + vfloat4 orig_color = blk.texel(texel); vfloat4 color_diff = color - orig_color; - vfloat4 color_up_diff = color_diff + color_offset * plane_up_weight; - vfloat4 color_down_diff = color_diff + color_offset * plane_down_weight; + vfloat4 color_down_diff = color_diff + color_offset * weight_down; + vfloat4 color_up_diff = color_diff + color_offset * weight_up; - current_errorv += color_diff * color_diff; - up_errorv += color_up_diff * color_up_diff; - down_errorv += color_down_diff * color_down_diff; + error_basev += color_diff * color_diff; + error_downv += color_down_diff * color_down_diff; + error_upv += color_up_diff * color_up_diff; } vfloat4 error_weight = blk.channel_weight; - float current_error = hadd_s(current_errorv * error_weight); - float up_error = hadd_s(up_errorv * error_weight); - float down_error = hadd_s(down_errorv * error_weight); + float error_base = hadd_s(error_basev * error_weight); + float error_down = hadd_s(error_downv * error_weight); + float error_up = hadd_s(error_upv * error_weight); // Check if the prev or next error is better, and if so use it - if ((up_error < current_error) && (up_error < down_error)) + if ((error_up < error_base) && (error_up < error_down) && (uqw < 64)) { - uq_pl_weights[we_idx] = static_cast(next_wt_uq); - uq_pl_weightsf[we_idx] = static_cast(next_wt_uq); - dec_weights_quant_pvalue[we_idx] = static_cast((prev_and_next >> 24) & 0xFF); + uq_weightsf[we_idx] = uqw_up; + dec_weights_uquant[we_idx] = static_cast(uqw_up); adjustments = true; } - else if (down_error < current_error) + else if ((error_down < error_base) && (uqw > 0)) { - uq_pl_weights[we_idx] = static_cast(prev_wt_uq); - uq_pl_weightsf[we_idx] = static_cast(prev_wt_uq); - dec_weights_quant_pvalue[we_idx] = static_cast((prev_and_next >> 16) & 0xFF); + uq_weightsf[we_idx] = uqw_down; + dec_weights_uquant[we_idx] = static_cast(uqw_down); adjustments = true; } } // Prepare iteration for plane 2 - dec_weights_quant_pvalue += WEIGHTS_PLANE2_OFFSET; + dec_weights_uquant += WEIGHTS_PLANE2_OFFSET; plane_mask = ~plane_mask; } @@ -373,12 +360,15 @@ static float compress_symbolic_block_for_partition_1plane( unsigned int partition_count, unsigned int partition_index, symbolic_compressed_block& scb, - compression_working_buffers& tmpbuf + compression_working_buffers& tmpbuf, + int quant_limit ) { promise(partition_count > 0); promise(config.tune_candidate_limit > 0); promise(config.tune_refinement_limit > 0); + int max_weight_quant = astc::min(static_cast(QUANT_32), quant_limit); + auto compute_difference = &compute_symbolic_block_difference_1plane; if ((partition_count == 1) && !(config.flags & ASTCENC_FLG_MAP_RGBM)) { @@ -389,13 +379,11 @@ static float compress_symbolic_block_for_partition_1plane( // Compute ideal weights and endpoint colors, with no quantization or decimation endpoints_and_weights& ei = tmpbuf.ei1; - endpoints_and_weights *eix = tmpbuf.eix1; compute_ideal_colors_and_weights_1plane(blk, pi, ei); // Compute ideal weights and endpoint colors for every decimation - float *dec_weights_ideal_value = tmpbuf.dec_weights_ideal_value; - float *dec_weights_quant_uvalue = tmpbuf.dec_weights_quant_uvalue; - uint8_t *dec_weights_quant_pvalue = tmpbuf.dec_weights_quant_pvalue; + float* dec_weights_ideal = tmpbuf.dec_weights_ideal; + uint8_t* dec_weights_uquant = tmpbuf.dec_weights_uquant; // For each decimation mode, compute an ideal set of weights with no quantization unsigned int max_decimation_modes = only_always ? bsd.decimation_mode_count_always @@ -404,7 +392,7 @@ static float compress_symbolic_block_for_partition_1plane( for (unsigned int i = 0; i < max_decimation_modes; i++) { const auto& dm = bsd.get_decimation_mode(i); - if (!dm.ref_1_plane) + if (!dm.is_ref_1plane(static_cast(max_weight_quant))) { continue; } @@ -413,9 +401,8 @@ static float compress_symbolic_block_for_partition_1plane( compute_ideal_weights_for_decimation( ei, - eix[i], di, - dec_weights_ideal_value + i * BLOCK_MAX_WEIGHTS); + dec_weights_ideal + i * BLOCK_MAX_WEIGHTS); } // Compute maximum colors for the endpoints and ideal weights, then for each endpoint and ideal @@ -433,14 +420,11 @@ static float compress_symbolic_block_for_partition_1plane( // For each mode, use the angular method to compute a shift compute_angular_endpoints_1plane( - config.tune_low_weight_count_limit, - only_always, bsd, - dec_weights_ideal_value, - tmpbuf); + only_always, bsd, dec_weights_ideal, max_weight_quant, tmpbuf); float* weight_low_value = tmpbuf.weight_low_value1; float* weight_high_value = tmpbuf.weight_high_value1; - int* qwt_bitcounts = tmpbuf.qwt_bitcounts; + int8_t* qwt_bitcounts = tmpbuf.qwt_bitcounts; float* qwt_errors = tmpbuf.qwt_errors; // For each mode (which specifies a decimation and a quantization): @@ -456,9 +440,16 @@ static float compress_symbolic_block_for_partition_1plane( unsigned int max_block_modes = only_always ? bsd.block_mode_count_1plane_always : bsd.block_mode_count_1plane_selected; promise(max_block_modes > 0); - for (unsigned int i = 0; i < max_block_modes; ++i) + for (unsigned int i = 0; i < max_block_modes; i++) { const block_mode& bm = bsd.block_modes[i]; + + if (bm.quant_mode > max_weight_quant) + { + qwt_errors[i] = 1e38f; + continue; + } + assert(!bm.is_dual_plane); int bitcount = free_bits_for_partition_count[partition_count - 1] - bm.weight_bits; if (bitcount <= 0) @@ -475,26 +466,28 @@ static float compress_symbolic_block_for_partition_1plane( int decimation_mode = bm.decimation_mode; const auto& di = bsd.get_decimation_info(decimation_mode); - qwt_bitcounts[i] = bitcount; + qwt_bitcounts[i] = static_cast(bitcount); + + ASTCENC_ALIGNAS float dec_weights_uquantf[BLOCK_MAX_WEIGHTS]; // Generate the optimized set of weights for the weight mode compute_quantized_weights_for_decimation( di, weight_low_value[i], weight_high_value[i], - dec_weights_ideal_value + BLOCK_MAX_WEIGHTS * decimation_mode, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i, - dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * i, + dec_weights_ideal + BLOCK_MAX_WEIGHTS * decimation_mode, + dec_weights_uquantf, + dec_weights_uquant + BLOCK_MAX_WEIGHTS * i, bm.get_weight_quant_mode()); // Compute weight quantization errors for the block mode qwt_errors[i] = compute_error_of_weight_set_1plane( - eix[decimation_mode], + ei, di, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i); + dec_weights_uquantf); } // Decide the optimal combination of color endpoint encodings and weight encodings - int partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS]; + uint8_t partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS]; int block_mode_index[TUNE_MAX_TRIAL_CANDIDATES]; quant_method color_quant_level[TUNE_MAX_TRIAL_CANDIDATES]; @@ -520,22 +513,22 @@ static float compress_symbolic_block_for_partition_1plane( const block_mode& qw_bm = bsd.block_modes[bm_packed_index]; int decimation_mode = qw_bm.decimation_mode; - int weight_quant_mode = qw_bm.quant_mode; const auto& di = bsd.get_decimation_info(decimation_mode); promise(di.weight_count > 0); trace_add_data("weight_x", di.weight_x); trace_add_data("weight_y", di.weight_y); trace_add_data("weight_z", di.weight_z); - trace_add_data("weight_quant", weight_quant_mode); + trace_add_data("weight_quant", qw_bm.quant_mode); // Recompute the ideal color endpoints before storing them vfloat4 rgbs_colors[BLOCK_MAX_PARTITIONS]; vfloat4 rgbo_colors[BLOCK_MAX_PARTITIONS]; symbolic_compressed_block workscb; + endpoints workep = ei.ep; - uint8_t* u8_weight_src = dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * bm_packed_index; + uint8_t* u8_weight_src = dec_weights_uquant + BLOCK_MAX_WEIGHTS * bm_packed_index; for (unsigned int j = 0; j < di.weight_count; j++) { @@ -545,52 +538,56 @@ static float compress_symbolic_block_for_partition_1plane( for (unsigned int l = 0; l < config.tune_refinement_limit; l++) { recompute_ideal_colors_1plane( - blk, pi, di, - weight_quant_mode, workscb.weights, - eix[decimation_mode].ep, rgbs_colors, rgbo_colors); + blk, pi, di, workscb.weights, + workep, rgbs_colors, rgbo_colors); - // Quantize the chosen color + // Quantize the chosen color, tracking if worth trying the mod value + bool all_same = color_quant_level[i] != color_quant_level_mod[i]; for (unsigned int j = 0; j < partition_count; j++) { workscb.color_formats[j] = pack_color_endpoints( privateProfile, - eix[decimation_mode].ep.endpt0[j], - eix[decimation_mode].ep.endpt1[j], + workep.endpt0[j], + workep.endpt1[j], rgbs_colors[j], rgbo_colors[j], partition_format_specifiers[i][j], workscb.color_values[j], color_quant_level[i]); + + all_same = all_same && workscb.color_formats[j] == workscb.color_formats[0]; } // If all the color endpoint modes are the same, we get a few more bits to store colors; // let's see if we can take advantage of this: requantize all the colors and see if the // endpoint modes remain the same. workscb.color_formats_matched = 0; - - if ((partition_count >= 2 && workscb.color_formats[0] == workscb.color_formats[1] - && color_quant_level[i] != color_quant_level_mod[i]) - && (partition_count == 2 || (workscb.color_formats[0] == workscb.color_formats[2] - && (partition_count == 3 || (workscb.color_formats[0] == workscb.color_formats[3]))))) + if (partition_count >= 2 && all_same) { - uint8_t colorvals[BLOCK_MAX_PARTITIONS][12]; + uint8_t colorvals[BLOCK_MAX_PARTITIONS][8]; uint8_t color_formats_mod[BLOCK_MAX_PARTITIONS] { 0 }; + bool all_same_mod = true; for (unsigned int j = 0; j < partition_count; j++) { color_formats_mod[j] = pack_color_endpoints( privateProfile, - eix[decimation_mode].ep.endpt0[j], - eix[decimation_mode].ep.endpt1[j], + workep.endpt0[j], + workep.endpt1[j], rgbs_colors[j], rgbo_colors[j], partition_format_specifiers[i][j], colorvals[j], color_quant_level_mod[i]); + + // Early out as soon as it's no longer possible to use mod + if (color_formats_mod[j] != color_formats_mod[0]) + { + all_same_mod = false; + break; + } } - if (color_formats_mod[0] == color_formats_mod[1] - && (partition_count == 2 || (color_formats_mod[0] == color_formats_mod[2] - && (partition_count == 3 || (color_formats_mod[0] == color_formats_mod[3]))))) + if (all_same_mod) { workscb.color_formats_matched = 1; for (unsigned int j = 0; j < BLOCK_MAX_PARTITIONS; j++) @@ -631,12 +628,12 @@ static float compress_symbolic_block_for_partition_1plane( trace_add_data("error_prerealign", errorval); best_errorval_in_mode = astc::min(errorval, best_errorval_in_mode); - // Average refinement improvement is 3.5% per iteration (allow 5%), but the first - // iteration can help more so we give it a extra 10% leeway. Use this knowledge to + // Average refinement improvement is 3.5% per iteration (allow 4.5%), but the first + // iteration can help more so we give it a extra 8% leeway. Use this knowledge to // drive a heuristic to skip blocks that are unlikely to catch up with the best // block we have already. unsigned int iters_remaining = config.tune_refinement_limit - l; - float threshold = (0.05f * static_cast(iters_remaining)) + 1.1f; + float threshold = (0.045f * static_cast(iters_remaining)) + 1.08f; if (errorval > (threshold * best_errorval_in_scb)) { break; @@ -681,10 +678,10 @@ static float compress_symbolic_block_for_partition_1plane( best_errorval_in_mode = astc::min(errorval, best_errorval_in_mode); // Average refinement improvement is 3.5% per iteration, so skip blocks that are - // unlikely to catch up with the best block we have already. Assume a 5% per step to + // unlikely to catch up with the best block we have already. Assume a 4.5% per step to // give benefit of the doubt ... unsigned int iters_remaining = config.tune_refinement_limit - 1 - l; - float threshold = (0.05f * static_cast(iters_remaining)) + 1.0f; + float threshold = (0.045f * static_cast(iters_remaining)) + 1.0f; if (errorval > (threshold * best_errorval_in_scb)) { break; @@ -733,29 +730,30 @@ static float compress_symbolic_block_for_partition_2planes( float tune_errorval_threshold, unsigned int plane2_component, symbolic_compressed_block& scb, - compression_working_buffers& tmpbuf + compression_working_buffers& tmpbuf, + int quant_limit ) { promise(config.tune_candidate_limit > 0); promise(config.tune_refinement_limit > 0); promise(bsd.decimation_mode_count_selected > 0); + int max_weight_quant = astc::min(static_cast(QUANT_32), quant_limit); + // Compute ideal weights and endpoint colors, with no quantization or decimation endpoints_and_weights& ei1 = tmpbuf.ei1; endpoints_and_weights& ei2 = tmpbuf.ei2; - endpoints_and_weights* eix1 = tmpbuf.eix1; - endpoints_and_weights* eix2 = tmpbuf.eix2; + compute_ideal_colors_and_weights_2planes(bsd, blk, plane2_component, ei1, ei2); // Compute ideal weights and endpoint colors for every decimation - float *dec_weights_ideal_value = tmpbuf.dec_weights_ideal_value; - float *dec_weights_quant_uvalue = tmpbuf.dec_weights_quant_uvalue; - uint8_t *dec_weights_quant_pvalue = tmpbuf.dec_weights_quant_pvalue; + float* dec_weights_ideal = tmpbuf.dec_weights_ideal; + uint8_t* dec_weights_uquant = tmpbuf.dec_weights_uquant; // For each decimation mode, compute an ideal set of weights with no quantization for (unsigned int i = 0; i < bsd.decimation_mode_count_selected; i++) { const auto& dm = bsd.get_decimation_mode(i); - if (!dm.ref_2_planes) + if (!dm.is_ref_2plane(static_cast(max_weight_quant))) { continue; } @@ -764,15 +762,13 @@ static float compress_symbolic_block_for_partition_2planes( compute_ideal_weights_for_decimation( ei1, - eix1[i], di, - dec_weights_ideal_value + i * BLOCK_MAX_WEIGHTS); + dec_weights_ideal + i * BLOCK_MAX_WEIGHTS); compute_ideal_weights_for_decimation( ei2, - eix2[i], di, - dec_weights_ideal_value + i * BLOCK_MAX_WEIGHTS + WEIGHTS_PLANE2_OFFSET); + dec_weights_ideal + i * BLOCK_MAX_WEIGHTS + WEIGHTS_PLANE2_OFFSET); } // Compute maximum colors for the endpoints and ideal weights, then for each endpoint and ideal @@ -800,9 +796,7 @@ static float compress_symbolic_block_for_partition_2planes( float min_wt_cutoff2 = hmin_s(select(err_max, min_ep2, err_mask)); compute_angular_endpoints_2planes( - config.tune_low_weight_count_limit, - bsd, dec_weights_ideal_value, - tmpbuf); + bsd, dec_weights_ideal, max_weight_quant, tmpbuf); // For each mode (which specifies a decimation and a quantization): // * Compute number of bits needed for the quantized weights @@ -814,7 +808,7 @@ static float compress_symbolic_block_for_partition_2planes( float* weight_low_value2 = tmpbuf.weight_low_value2; float* weight_high_value2 = tmpbuf.weight_high_value2; - int* qwt_bitcounts = tmpbuf.qwt_bitcounts; + int8_t* qwt_bitcounts = tmpbuf.qwt_bitcounts; float* qwt_errors = tmpbuf.qwt_errors; unsigned int start_2plane = bsd.block_mode_count_1plane_selected; @@ -825,7 +819,13 @@ static float compress_symbolic_block_for_partition_2planes( const block_mode& bm = bsd.block_modes[i]; assert(bm.is_dual_plane); - qwt_bitcounts[i] = 109 - bm.weight_bits; + if (bm.quant_mode > max_weight_quant) + { + qwt_errors[i] = 1e38f; + continue; + } + + qwt_bitcounts[i] = static_cast(109 - bm.weight_bits); if (weight_high_value1[i] > 1.02f * min_wt_cutoff1) { @@ -840,36 +840,38 @@ static float compress_symbolic_block_for_partition_2planes( unsigned int decimation_mode = bm.decimation_mode; const auto& di = bsd.get_decimation_info(decimation_mode); + ASTCENC_ALIGNAS float dec_weights_uquantf[BLOCK_MAX_WEIGHTS]; + // Generate the optimized set of weights for the mode compute_quantized_weights_for_decimation( di, weight_low_value1[i], weight_high_value1[i], - dec_weights_ideal_value + BLOCK_MAX_WEIGHTS * decimation_mode, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i, - dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * i, + dec_weights_ideal + BLOCK_MAX_WEIGHTS * decimation_mode, + dec_weights_uquantf, + dec_weights_uquant + BLOCK_MAX_WEIGHTS * i, bm.get_weight_quant_mode()); compute_quantized_weights_for_decimation( di, weight_low_value2[i], weight_high_value2[i], - dec_weights_ideal_value + BLOCK_MAX_WEIGHTS * decimation_mode + WEIGHTS_PLANE2_OFFSET, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i + WEIGHTS_PLANE2_OFFSET, - dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * i + WEIGHTS_PLANE2_OFFSET, + dec_weights_ideal + BLOCK_MAX_WEIGHTS * decimation_mode + WEIGHTS_PLANE2_OFFSET, + dec_weights_uquantf + WEIGHTS_PLANE2_OFFSET, + dec_weights_uquant + BLOCK_MAX_WEIGHTS * i + WEIGHTS_PLANE2_OFFSET, bm.get_weight_quant_mode()); // Compute weight quantization errors for the block mode qwt_errors[i] = compute_error_of_weight_set_2planes( - eix1[decimation_mode], - eix2[decimation_mode], + ei1, + ei2, di, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i, - dec_weights_quant_uvalue + BLOCK_MAX_WEIGHTS * i + WEIGHTS_PLANE2_OFFSET); + dec_weights_uquantf, + dec_weights_uquantf + WEIGHTS_PLANE2_OFFSET); } // Decide the optimal combination of color endpoint encodings and weight encodings - int partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS]; + uint8_t partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS]; int block_mode_index[TUNE_MAX_TRIAL_CANDIDATES]; quant_method color_quant_level[TUNE_MAX_TRIAL_CANDIDATES]; @@ -901,25 +903,22 @@ static float compress_symbolic_block_for_partition_2planes( const block_mode& qw_bm = bsd.block_modes[bm_packed_index]; int decimation_mode = qw_bm.decimation_mode; - int weight_quant_mode = qw_bm.quant_mode; const auto& di = bsd.get_decimation_info(decimation_mode); promise(di.weight_count > 0); trace_add_data("weight_x", di.weight_x); trace_add_data("weight_y", di.weight_y); trace_add_data("weight_z", di.weight_z); - trace_add_data("weight_quant", weight_quant_mode); - - // Recompute the ideal color endpoints before storing them. - merge_endpoints(eix1[decimation_mode].ep, eix2[decimation_mode].ep, plane2_component, epm); + trace_add_data("weight_quant", qw_bm.quant_mode); vfloat4 rgbs_color; vfloat4 rgbo_color; symbolic_compressed_block workscb; + endpoints workep = epm; - uint8_t* u8_weight1_src = dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * bm_packed_index; - uint8_t* u8_weight2_src = dec_weights_quant_pvalue + BLOCK_MAX_WEIGHTS * bm_packed_index + WEIGHTS_PLANE2_OFFSET; + uint8_t* u8_weight1_src = dec_weights_uquant + BLOCK_MAX_WEIGHTS * bm_packed_index; + uint8_t* u8_weight2_src = dec_weights_uquant + BLOCK_MAX_WEIGHTS * bm_packed_index + WEIGHTS_PLANE2_OFFSET; for (int j = 0; j < di.weight_count; j++) { @@ -930,15 +929,15 @@ static float compress_symbolic_block_for_partition_2planes( for (unsigned int l = 0; l < config.tune_refinement_limit; l++) { recompute_ideal_colors_2planes( - blk, bsd, di, weight_quant_mode, + blk, bsd, di, workscb.weights, workscb.weights + WEIGHTS_PLANE2_OFFSET, - epm, rgbs_color, rgbo_color, plane2_component); + workep, rgbs_color, rgbo_color, plane2_component); // Quantize the chosen color workscb.color_formats[0] = pack_color_endpoints( privateProfile, - epm.endpt0[0], - epm.endpt1[0], + workep.endpt0[0], + workep.endpt1[0], rgbs_color, rgbo_color, partition_format_specifiers[i][0], workscb.color_values[0], @@ -966,12 +965,12 @@ static float compress_symbolic_block_for_partition_2planes( trace_add_data("error_prerealign", errorval); best_errorval_in_mode = astc::min(errorval, best_errorval_in_mode); - // Average refinement improvement is 3.5% per iteration (allow 5%), but the first - // iteration can help more so we give it a extra 10% leeway. Use this knowledge to + // Average refinement improvement is 3.5% per iteration (allow 4.5%), but the first + // iteration can help more so we give it a extra 8% leeway. Use this knowledge to // drive a heuristic to skip blocks that are unlikely to catch up with the best // block we have already. unsigned int iters_remaining = config.tune_refinement_limit - l; - float threshold = (0.05f * static_cast(iters_remaining)) + 1.1f; + float threshold = (0.045f * static_cast(iters_remaining)) + 1.08f; if (errorval > (threshold * best_errorval_in_scb)) { break; @@ -1017,10 +1016,10 @@ static float compress_symbolic_block_for_partition_2planes( best_errorval_in_mode = astc::min(errorval, best_errorval_in_mode); // Average refinement improvement is 3.5% per iteration, so skip blocks that are - // unlikely to catch up with the best block we have already. Assume a 5% per step to + // unlikely to catch up with the best block we have already. Assume a 4.5% per step to // give benefit of the doubt ... unsigned int iters_remaining = config.tune_refinement_limit - 1 - l; - float threshold = (0.05f * static_cast(iters_remaining)) + 1.0f; + float threshold = (0.045f * static_cast(iters_remaining)) + 1.0f; if (errorval > (threshold * best_errorval_in_scb)) { break; @@ -1132,12 +1131,13 @@ static float prepare_block_statistics( aa_var -= as * (as * rpt); - rg_cov *= astc::rsqrt(astc::max(rr_var * gg_var, 1e-30f)); - rb_cov *= astc::rsqrt(astc::max(rr_var * bb_var, 1e-30f)); - ra_cov *= astc::rsqrt(astc::max(rr_var * aa_var, 1e-30f)); - gb_cov *= astc::rsqrt(astc::max(gg_var * bb_var, 1e-30f)); - ga_cov *= astc::rsqrt(astc::max(gg_var * aa_var, 1e-30f)); - ba_cov *= astc::rsqrt(astc::max(bb_var * aa_var, 1e-30f)); + // These will give a NaN if a channel is constant - these are fixed up in the next step + rg_cov *= astc::rsqrt(rr_var * gg_var); + rb_cov *= astc::rsqrt(rr_var * bb_var); + ra_cov *= astc::rsqrt(rr_var * aa_var); + gb_cov *= astc::rsqrt(gg_var * bb_var); + ga_cov *= astc::rsqrt(gg_var * aa_var); + ba_cov *= astc::rsqrt(bb_var * aa_var); if (astc::isnan(rg_cov)) rg_cov = 1.0f; if (astc::isnan(rb_cov)) rb_cov = 1.0f; @@ -1146,7 +1146,7 @@ static float prepare_block_statistics( if (astc::isnan(ga_cov)) ga_cov = 1.0f; if (astc::isnan(ba_cov)) ba_cov = 1.0f; - float lowest_correlation = astc::min(fabsf(rg_cov), fabsf(rb_cov)); + float lowest_correlation = astc::min(fabsf(rg_cov), fabsf(rb_cov)); lowest_correlation = astc::min(lowest_correlation, fabsf(ra_cov)); lowest_correlation = astc::min(lowest_correlation, fabsf(gb_cov)); lowest_correlation = astc::min(lowest_correlation, fabsf(ga_cov)); @@ -1173,9 +1173,9 @@ static float prepare_block_statistics( /* See header for documentation. */ void compress_block( - const astcenc_context& ctx, + const astcenc_contexti& ctx, const image_block& blk, - physical_compressed_block& pcb, + uint8_t pcb[16], #if QUALITY_CONTROL compression_working_buffers& tmpbuf, bool calQualityEnable, @@ -1206,16 +1206,28 @@ void compress_block( bool block_skip_two_plane = false; int max_partitions = (ctx.config.privateProfile == HIGH_SPEED_PROFILE) ? 1 : ctx.config.tune_partition_count_limit; + unsigned int requested_partition_indices[3] { + ctx.config.tune_2partition_index_limit, + ctx.config.tune_3partition_index_limit, + ctx.config.tune_4partition_index_limit + }; + + unsigned int requested_partition_trials[3] { + ctx.config.tune_2partitioning_candidate_limit, + ctx.config.tune_3partitioning_candidate_limit, + ctx.config.tune_4partitioning_candidate_limit + }; + #if defined(ASTCENC_DIAGNOSTICS) // Do this early in diagnostic builds so we can dump uniform metrics // for every block. Do it later in release builds to avoid redundant work! - float error_weight_sum = hadd_s(blk.channel_weight) * bsd->texel_count; + float error_weight_sum = hadd_s(blk.channel_weight) * bsd.texel_count; float error_threshold = ctx.config.tune_db_limit * error_weight_sum * block_is_l_scale * block_is_la_scale; - lowest_correl = prepare_block_statistics(bsd->texel_count, blk); + lowest_correl = prepare_block_statistics(bsd.texel_count, blk); trace_add_data("lowest_correl", lowest_correl); trace_add_data("tune_error_threshold", error_threshold); #endif @@ -1228,6 +1240,7 @@ void compress_block( trace_add_data("plane_count", 1); scb.partition_count = 0; + // Encode as FP16 if using HDR if ((decode_mode == ASTCENC_PRF_HDR) || (decode_mode == ASTCENC_PRF_HDR_RGB_LDR_A)) @@ -1244,6 +1257,7 @@ void compress_block( vint4 color_u16 = float_to_int_rtn(color_f32); store(color_u16, scb.constant_color); } + trace_add_data("exit", "quality hit"); if (ctx.config.privateProfile == HIGH_SPEED_PROFILE) { @@ -1258,7 +1272,7 @@ void compress_block( for (int w = 0; w < 16; w++) { // weights num is 16 when block mode is HIGH_SPEED_PROFILE_BLOCK_MODE scb.weights[w] = 0; } - for (int pixel = 0; pixel < BLOCK_MAX_COMPONENTS; pixel++) { // scb.constant_color[pixel] is 16 bit + for (unsigned int pixel = 0; pixel < BLOCK_MAX_COMPONENTS; pixel++) { // scb.constant_color[pixel] is 16 bit scb.color_values[0][pixel << 1] = scb.constant_color[pixel] & BYTE_MASK; // low byte scb.color_values[0][(pixel << 1) + 1] = (scb.constant_color[pixel] >> 8) & BYTE_MASK; // high byte } @@ -1291,8 +1305,8 @@ void compress_block( float exit_thresholds_for_pcount[BLOCK_MAX_PARTITIONS] { 0.0f, - ctx.config.tune_2_partition_early_out_limit_factor, - ctx.config.tune_3_partition_early_out_limit_factor, + ctx.config.tune_2partition_early_out_limit_factor, + ctx.config.tune_3partition_early_out_limit_factor, 0.0f }; @@ -1304,19 +1318,21 @@ void compress_block( // compression and slightly reduces image quality. float errorval_mult[2] { - 1.0f / ctx.config.tune_mode0_mse_overshoot, + 1.0f / ctx.config.tune_mse_overshoot, 1.0f }; - static const float errorval_overshoot = 1.0f / ctx.config.tune_refinement_mse_overshoot; + static const float errorval_overshoot = 1.0f / ctx.config.tune_mse_overshoot; - // Only enable MODE0 fast path (trial 0) if 2D and more than 25 texels + // Only enable MODE0 fast path if enabled + // Never enable for 3D blocks as no "always" block modes are available int start_trial = 1; - if ((bsd.texel_count >= TUNE_MIN_TEXELS_MODE0_FASTPATH) && (bsd.zdim == 1)) + if ((ctx.config.tune_search_mode0_enable >= TUNE_MIN_SEARCH_MODE0) && (bsd.zdim == 1)) { start_trial = 0; } + int quant_limit = QUANT_32; for (int i = start_trial; i < 2; i++) { TRACE_NODE(node1, "pass"); @@ -1328,7 +1344,11 @@ void compress_block( ctx.config.privateProfile, ctx.config, bsd, blk, i == 0, error_threshold * errorval_mult[i] * errorval_overshoot, - 1, 0, scb, tmpbuf); + 1, 0, scb, tmpbuf, QUANT_32); + + // Record the quant level so we can use the filter later searches + const auto& bm = bsd.get_block_mode(scb.block_mode); + quant_limit = bm.get_weight_quant_mode(); best_errorvals_for_pcount[0] = astc::min(best_errorvals_for_pcount[0], errorval); if ((ctx.config.privateProfile == HIGH_SPEED_PROFILE) || (errorval < (error_threshold * errorval_mult[i]))) @@ -1342,7 +1362,7 @@ void compress_block( lowest_correl = prepare_block_statistics(bsd.texel_count, blk); #endif - block_skip_two_plane = lowest_correl > ctx.config.tune_2_plane_early_out_limit_correlation; + block_skip_two_plane = lowest_correl > ctx.config.tune_2plane_early_out_limit_correlation; // Test the four possible 1-partition, 2-planes modes. Do this in reverse, as // alpha is the most likely to be non-correlated if it is present in the data. @@ -1359,7 +1379,7 @@ void compress_block( if (block_skip_two_plane) { - trace_add_data("skip", "tune_2_plane_early_out_limit_correlation"); + trace_add_data("skip", "tune_2plane_early_out_limit_correlation"); continue; } @@ -1378,11 +1398,11 @@ void compress_block( float errorval = compress_symbolic_block_for_partition_2planes( ctx.config.privateProfile, ctx.config, bsd, blk, error_threshold * errorval_overshoot, - i, scb, tmpbuf); + i, scb, tmpbuf, quant_limit); // If attempting two planes is much worse than the best one plane result // then further two plane searches are unlikely to help so move on ... - if (errorval > (best_errorvals_for_pcount[0] * 2.0f)) + if (errorval > (best_errorvals_for_pcount[0] * 1.85f)) { break; } @@ -1397,13 +1417,19 @@ void compress_block( // Find best blocks for 2, 3 and 4 partitions for (int partition_count = 2; partition_count <= max_partitions; partition_count++) { - unsigned int partition_indices[2] { 0 }; + unsigned int partition_indices[TUNE_MAX_PARTITIONING_CANDIDATES]; + + unsigned int requested_indices = requested_partition_indices[partition_count - 2]; - find_best_partition_candidates(bsd, blk, partition_count, - ctx.config.tune_partition_index_limit, - partition_indices); + unsigned int requested_trials = requested_partition_trials[partition_count - 2]; + requested_trials = astc::min(requested_trials, requested_indices); - for (unsigned int i = 0; i < 2; i++) + unsigned int actual_trials = find_best_partition_candidates( + bsd, blk, partition_count, requested_indices, partition_indices, requested_trials); + + float best_error_in_prev = best_errorvals_for_pcount[partition_count - 2]; + + for (unsigned int i = 0; i < actual_trials; i++) { TRACE_NODE(node1, "pass"); trace_add_data("partition_count", partition_count); @@ -1416,9 +1442,22 @@ void compress_block( ctx.config, bsd, blk, false, error_threshold * errorval_overshoot, partition_count, partition_indices[i], - scb, tmpbuf); + scb, tmpbuf, quant_limit); best_errorvals_for_pcount[partition_count - 1] = astc::min(best_errorvals_for_pcount[partition_count - 1], errorval); + + // If using N partitions doesn't improve much over using N-1 partitions then skip trying + // N+1. Error can dramatically improve if the data is correlated or non-correlated and + // aligns with a partitioning that suits that encoding, so for this inner loop check add + // a large error scale because the "other" trial could be a lot better. + float best_error = best_errorvals_for_pcount[partition_count - 1]; + float best_error_scale = exit_thresholds_for_pcount[partition_count - 1] * 1.85f; + if (best_error > (best_error_in_prev * best_error_scale)) + { + trace_add_data("skip", "tune_partition_early_out_limit_factor"); + goto END_OF_TESTS; + } + if (errorval < error_threshold) { trace_add_data("exit", "quality hit"); @@ -1428,7 +1467,6 @@ void compress_block( // If using N partitions doesn't improve much over using N-1 partitions then skip trying N+1 float best_error = best_errorvals_for_pcount[partition_count - 1]; - float best_error_in_prev = best_errorvals_for_pcount[partition_count - 2]; float best_error_scale = exit_thresholds_for_pcount[partition_count - 1]; if (best_error > (best_error_in_prev * best_error_scale)) { @@ -1455,7 +1493,6 @@ END_OF_TESTS: #endif scb.block_type = SYM_BTYPE_CONST_U16; - scb.block_mode = -2; vfloat4 color_f32 = clamp(0.0f, 1.0f, blk.origin_texel) * 65535.0f; vint4 color_u16 = float_to_int_rtn(color_f32); store(color_u16, scb.constant_color); diff --git a/Source/astcenc_compute_variance.cpp b/Source/astcenc_compute_variance.cpp index 2284e90df71cc050076603ee5c4b5e98b952618f..dc3ad2ccc77061f8e646b6eb79941e87285f51c8 100644 --- a/Source/astcenc_compute_variance.cpp +++ b/Source/astcenc_compute_variance.cpp @@ -99,17 +99,9 @@ static void brent_kung_prefix_sum( } while (lc_stride > 2); } -/** - * @brief Compute averages for a pixel region. - * - * The routine computes both in a single pass, using a summed-area table to decouple the running - * time from the averaging/variance kernel size. - * - * @param[out] ctx The compressor context storing the output data. - * @param arg The input parameter structure. - */ -static void compute_pixel_region_variance( - astcenc_context& ctx, +/* See header for documentation. */ +void compute_pixel_region_variance( + astcenc_contexti& ctx, const pixel_region_args& arg ) { // Unpack the memory structure into local variables @@ -427,57 +419,6 @@ static void compute_pixel_region_variance( } } -void compute_averages( - astcenc_context& ctx, - const avg_args &ag -) { - pixel_region_args arg = ag.arg; - arg.work_memory = new vfloat4[ag.work_memory_size]; - - int size_x = ag.img_size_x; - int size_y = ag.img_size_y; - int size_z = ag.img_size_z; - - int step_xy = ag.blk_size_xy; - int step_z = ag.blk_size_z; - - int y_tasks = (size_y + step_xy - 1) / step_xy; - - // All threads run this processing loop until there is no work remaining - while (true) - { - unsigned int count; - unsigned int base = ctx.manage_avg.get_task_assignment(16, count); - if (!count) - { - break; - } - - for (unsigned int i = base; i < base + count; i++) - { - int z = (i / (y_tasks)) * step_z; - int y = (i - (z * y_tasks)) * step_xy; - - arg.size_z = astc::min(step_z, size_z - z); - arg.offset_z = z; - - arg.size_y = astc::min(step_xy, size_y - y); - arg.offset_y = y; - - for (int x = 0; x < size_x; x += step_xy) - { - arg.size_x = astc::min(step_xy, size_x - x); - arg.offset_x = x; - compute_pixel_region_variance(ctx, arg); - } - } - - ctx.manage_avg.complete_task_assignment(count); - } - - delete[] arg.work_memory; -} - /* See header for documentation. */ unsigned int init_compute_averages( const astcenc_image& img, diff --git a/Source/astcenc_decompress_symbolic.cpp b/Source/astcenc_decompress_symbolic.cpp index 6d50d5128b882c8f8971f0447ff80150d42f7fab..7463f7e20b1b16234190d5be1d9d1f067d2b940d 100644 --- a/Source/astcenc_decompress_symbolic.cpp +++ b/Source/astcenc_decompress_symbolic.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -24,48 +24,18 @@ #include #include -/** - * @brief Compute a vector of texel weights by interpolating the decimated weight grid. - * - * @param base_texel_index The first texel to get; N (SIMD width) consecutive texels are loaded. - * @param di The weight grid decimation to use. - * @param weights The raw weights. - * - * @return The undecimated weight for N (SIMD width) texels. - */ -static vint compute_value_of_texel_weight_int_vla( - int base_texel_index, - const decimation_info& di, - const int* weights -) { - vint summed_value(8); - vint weight_count(di.texel_weight_count + base_texel_index); - int max_weight_count = hmax(weight_count).lane<0>(); - - promise(max_weight_count > 0); - for (int i = 0; i < max_weight_count; i++) - { - vint texel_weights(di.texel_weights_4t[i] + base_texel_index); - vint texel_weights_int(di.texel_weights_int_4t[i] + base_texel_index); - - summed_value += gatheri(weights, texel_weights) * texel_weights_int; - } - - return lsr<4>(summed_value); -} - /** * @brief Compute the integer linear interpolation of two color endpoints. * - * @param decode_mode The ASTC profile (linear or sRGB) + * @param u8_mask The mask for lanes using decode_unorm8 rather than decode_f16. * @param color0 The endpoint0 color. * @param color1 The endpoint1 color. - * @param weights The interpolation weight (between 0 and 64). + * @param weights The interpolation weight (between 0 and 64). * * @return The interpolated color. */ static vint4 lerp_color_int( - astcenc_profile decode_mode, + vmask4 u8_mask, vint4 color0, vint4 color1, vint4 weights @@ -73,24 +43,18 @@ static vint4 lerp_color_int( vint4 weight1 = weights; vint4 weight0 = vint4(64) - weight1; - if (decode_mode == ASTCENC_PRF_LDR_SRGB) - { - color0 = asr<8>(color0); - color1 = asr<8>(color1); - } - vint4 color = (color0 * weight0) + (color1 * weight1) + vint4(32); color = asr<6>(color); - if (decode_mode == ASTCENC_PRF_LDR_SRGB) - { - color = color * vint4(257); - } + // For decode_unorm8 values force the codec to bit replicate. This allows the + // rest of the codec to assume the full 0xFFFF range for everything and ignore + // the decode_mode setting + vint4 color_u8 = asr<8>(color) * vint4(257); + color = select(color, color_u8, u8_mask); return color; } - /** * @brief Convert integer color value into a float value for the decoder. * @@ -127,43 +91,74 @@ void unpack_weights( const symbolic_compressed_block& scb, const decimation_info& di, bool is_dual_plane, - quant_method quant_level, int weights_plane1[BLOCK_MAX_TEXELS], int weights_plane2[BLOCK_MAX_TEXELS] ) { - // First, unquantize the weights ... - int uq_plane1_weights[BLOCK_MAX_WEIGHTS]; - int uq_plane2_weights[BLOCK_MAX_WEIGHTS]; - unsigned int weight_count = di.weight_count; - - const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[quant_level]); - - // Second, undecimate the weights ... // Safe to overshoot as all arrays are allocated to full size if (!is_dual_plane) { - for (unsigned int i = 0; i < weight_count; i++) - { - uq_plane1_weights[i] = qat->unquantized_value[scb.weights[i]]; - } + // Build full 64-entry weight lookup table + vint4 tab0 = vint4::load(scb.weights + 0); + vint4 tab1 = vint4::load(scb.weights + 16); + vint4 tab2 = vint4::load(scb.weights + 32); + vint4 tab3 = vint4::load(scb.weights + 48); + + vint tab0p, tab1p, tab2p, tab3p; + vtable_prepare(tab0, tab1, tab2, tab3, tab0p, tab1p, tab2p, tab3p); for (unsigned int i = 0; i < bsd.texel_count; i += ASTCENC_SIMD_WIDTH) { - store(compute_value_of_texel_weight_int_vla(i, di, uq_plane1_weights), weights_plane1 + i); + vint summed_value(8); + vint weight_count(di.texel_weight_count + i); + int max_weight_count = hmax(weight_count).lane<0>(); + + promise(max_weight_count > 0); + for (int j = 0; j < max_weight_count; j++) + { + vint texel_weights(di.texel_weights_tr[j] + i); + vint texel_weights_int(di.texel_weight_contribs_int_tr[j] + i); + + summed_value += vtable_8bt_32bi(tab0p, tab1p, tab2p, tab3p, texel_weights) * texel_weights_int; + } + + store(lsr<4>(summed_value), weights_plane1 + i); } } else { - for (unsigned int i = 0; i < weight_count; i++) - { - uq_plane1_weights[i] = qat->unquantized_value[scb.weights[i]]; - uq_plane2_weights[i] = qat->unquantized_value[scb.weights[i + WEIGHTS_PLANE2_OFFSET]]; - } + // Build a 32-entry weight lookup table per plane + // Plane 1 + vint4 tab0_plane1 = vint4::load(scb.weights + 0); + vint4 tab1_plane1 = vint4::load(scb.weights + 16); + vint tab0_plane1p, tab1_plane1p; + vtable_prepare(tab0_plane1, tab1_plane1, tab0_plane1p, tab1_plane1p); + + // Plane 2 + vint4 tab0_plane2 = vint4::load(scb.weights + 32); + vint4 tab1_plane2 = vint4::load(scb.weights + 48); + vint tab0_plane2p, tab1_plane2p; + vtable_prepare(tab0_plane2, tab1_plane2, tab0_plane2p, tab1_plane2p); for (unsigned int i = 0; i < bsd.texel_count; i += ASTCENC_SIMD_WIDTH) { - store(compute_value_of_texel_weight_int_vla(i, di, uq_plane1_weights), weights_plane1 + i); - store(compute_value_of_texel_weight_int_vla(i, di, uq_plane2_weights), weights_plane2 + i); + vint sum_plane1(8); + vint sum_plane2(8); + + vint weight_count(di.texel_weight_count + i); + int max_weight_count = hmax(weight_count).lane<0>(); + + promise(max_weight_count > 0); + for (int j = 0; j < max_weight_count; j++) + { + vint texel_weights(di.texel_weights_tr[j] + i); + vint texel_weights_int(di.texel_weight_contribs_int_tr[j] + i); + + sum_plane1 += vtable_8bt_32bi(tab0_plane1p, tab1_plane1p, texel_weights) * texel_weights_int; + sum_plane2 += vtable_8bt_32bi(tab0_plane2p, tab1_plane2p, texel_weights) * texel_weights_int; + } + + store(lsr<4>(sum_plane1), weights_plane1 + i); + store(lsr<4>(sum_plane2), weights_plane2 + i); } } } @@ -228,12 +223,13 @@ void decompress_symbolic_block( { vint4 colori(scb.constant_color); - // For sRGB decoding a real decoder would just use the top 8 bits for color conversion. - // We don't color convert, so rescale the top 8 bits into the full 16 bit dynamic range. - if (decode_mode == ASTCENC_PRF_LDR_SRGB) - { - colori = asr<8>(colori) * 257; - } + // Determine the UNORM8 rounding on the decode + vmask4 u8_mask = get_u8_component_mask(decode_mode, blk); + + // The real decoder would just use the top 8 bits, but we rescale + // in to a 16-bit value that rounds correctly. + vint4 colori_u8 = asr<8>(colori) * 257; + colori = select(colori, colori_u8, u8_mask); vint4 colorf16 = unorm16_to_sf16(colori); color = float16_to_float(colorf16); @@ -277,17 +273,19 @@ void decompress_symbolic_block( const auto& bm = bsd.get_block_mode(scb.block_mode); const auto& di = bsd.get_decimation_info(bm.decimation_mode); - int is_dual_plane = bm.is_dual_plane; + bool is_dual_plane = static_cast(bm.is_dual_plane); // Unquantize and undecimate the weights int plane1_weights[BLOCK_MAX_TEXELS]; int plane2_weights[BLOCK_MAX_TEXELS]; - unpack_weights(bsd, scb, di, is_dual_plane, bm.get_weight_quant_mode(), plane1_weights, plane2_weights); + unpack_weights(bsd, scb, di, is_dual_plane, plane1_weights, plane2_weights); // Now that we have endpoint colors and weights, we can unpack texel colors - int plane2_component = is_dual_plane ? scb.plane2_component : -1; + int plane2_component = scb.plane2_component; vmask4 plane2_mask = vint4::lane_id() == vint4(plane2_component); + vmask4 u8_mask = get_u8_component_mask(decode_mode, blk); + for (int i = 0; i < partition_count; i++) { // Decode the color endpoints for this partition @@ -298,7 +296,6 @@ void decompress_symbolic_block( unpack_color_endpoints(decode_mode, scb.color_formats[i], - scb.get_color_quant_mode(), scb.color_values[i], rgb_lns, a_lns, ep0, ep1); @@ -310,7 +307,7 @@ void decompress_symbolic_block( { int tix = pi.texels_of_partition[i][j]; vint4 weight = select(vint4(plane1_weights[tix]), vint4(plane2_weights[tix]), plane2_mask); - vint4 color = lerp_color_int(decode_mode, ep0, ep1, weight); + vint4 color = lerp_color_int(u8_mask, ep0, ep1, weight); vfloat4 colorf = decode_texel(color, lns_mask); blk.data_r[tix] = colorf.lane<0>(); @@ -347,7 +344,7 @@ float compute_symbolic_block_difference_2plane( // Unquantize and undecimate the weights int plane1_weights[BLOCK_MAX_TEXELS]; int plane2_weights[BLOCK_MAX_TEXELS]; - unpack_weights(bsd, scb, di, true, bm.get_weight_quant_mode(), plane1_weights, plane2_weights); + unpack_weights(bsd, scb, di, true, plane1_weights, plane2_weights); vmask4 plane2_mask = vint4::lane_id() == vint4(scb.plane2_component); @@ -361,17 +358,18 @@ float compute_symbolic_block_difference_2plane( unpack_color_endpoints(config.profile, scb.color_formats[0], - scb.get_color_quant_mode(), scb.color_values[0], rgb_lns, a_lns, ep0, ep1); + vmask4 u8_mask = get_u8_component_mask(config.profile, blk); + // Unpack and compute error for each texel in the partition unsigned int texel_count = bsd.texel_count; for (unsigned int i = 0; i < texel_count; i++) { vint4 weight = select(vint4(plane1_weights[i]), vint4(plane2_weights[i]), plane2_mask); - vint4 colori = lerp_color_int(config.profile, ep0, ep1, weight); + vint4 colori = lerp_color_int(u8_mask, ep0, ep1, weight); vfloat4 color = int_to_float(colori); vfloat4 oldColor = blk.texel(i); @@ -443,7 +441,9 @@ float compute_symbolic_block_difference_1plane( // Unquantize and undecimate the weights int plane1_weights[BLOCK_MAX_TEXELS]; - unpack_weights(bsd, scb, di, false, bm.get_weight_quant_mode(), plane1_weights, nullptr); + unpack_weights(bsd, scb, di, false, plane1_weights, nullptr); + + vmask4 u8_mask = get_u8_component_mask(config.profile, blk); vfloat4 summa = vfloat4::zero(); for (unsigned int i = 0; i < partition_count; i++) @@ -456,7 +456,6 @@ float compute_symbolic_block_difference_1plane( unpack_color_endpoints(config.profile, scb.color_formats[i], - scb.get_color_quant_mode(), scb.color_values[i], rgb_lns, a_lns, ep0, ep1); @@ -466,7 +465,7 @@ float compute_symbolic_block_difference_1plane( for (unsigned int j = 0; j < texel_count; j++) { unsigned int tix = pi.texels_of_partition[i][j]; - vint4 colori = lerp_color_int(config.profile, ep0, ep1, + vint4 colori = lerp_color_int(u8_mask, ep0, ep1, vint4(plane1_weights[tix])); vfloat4 color = int_to_float(colori); @@ -534,8 +533,8 @@ float compute_symbolic_block_difference_1plane_1partition( const decimation_info& di = bsd.get_decimation_info(bm.decimation_mode); // Unquantize and undecimate the weights - alignas(ASTCENC_VECALIGN) int plane1_weights[BLOCK_MAX_TEXELS]; - unpack_weights(bsd, scb, di, false, bm.get_weight_quant_mode(), plane1_weights, nullptr); + ASTCENC_ALIGNAS int plane1_weights[BLOCK_MAX_TEXELS]; + unpack_weights(bsd, scb, di, false, plane1_weights, nullptr); // Decode the color endpoints for this partition vint4 ep0; @@ -545,24 +544,16 @@ float compute_symbolic_block_difference_1plane_1partition( unpack_color_endpoints(config.profile, scb.color_formats[0], - scb.get_color_quant_mode(), scb.color_values[0], rgb_lns, a_lns, ep0, ep1); - - // Pre-shift sRGB so things round correctly - if (config.profile == ASTCENC_PRF_LDR_SRGB) - { - ep0 = asr<8>(ep0); - ep1 = asr<8>(ep1); - } + vmask4 u8_mask = get_u8_component_mask(config.profile, blk); // Unpack and compute error for each texel in the partition vfloatacc summav = vfloatacc::zero(); vint lane_id = vint::lane_id(); - vint srgb_scale(config.profile == ASTCENC_PRF_LDR_SRGB ? 257 : 1); unsigned int texel_count = bsd.texel_count; for (unsigned int i = 0; i < texel_count; i += ASTCENC_SIMD_WIDTH) @@ -581,11 +572,25 @@ float compute_symbolic_block_difference_1plane_1partition( vint ep0_b = vint(ep0.lane<2>()) * weight0; vint ep0_a = vint(ep0.lane<3>()) * weight0; - // Shift so things round correctly - vint colori_r = asr<6>(ep0_r + ep1_r + vint(32)) * srgb_scale; - vint colori_g = asr<6>(ep0_g + ep1_g + vint(32)) * srgb_scale; - vint colori_b = asr<6>(ep0_b + ep1_b + vint(32)) * srgb_scale; - vint colori_a = asr<6>(ep0_a + ep1_a + vint(32)) * srgb_scale; + // Combine contributions + vint colori_r = asr<6>(ep0_r + ep1_r + vint(32)); + vint colori_g = asr<6>(ep0_g + ep1_g + vint(32)); + vint colori_b = asr<6>(ep0_b + ep1_b + vint(32)); + vint colori_a = asr<6>(ep0_a + ep1_a + vint(32)); + + // If using a U8 decode mode bit replicate top 8 bits + // so rest of codec can assume 0xFFFF max range everywhere + vint colori_r8 = asr<8>(colori_r) * vint(257); + colori_r = select(colori_r, colori_r8, vmask(u8_mask.lane<0>())); + + vint colori_g8 = asr<8>(colori_g) * vint(257); + colori_g = select(colori_g, colori_g8, vmask(u8_mask.lane<1>())); + + vint colori_b8 = asr<8>(colori_b) * vint(257); + colori_b = select(colori_b, colori_b8, vmask(u8_mask.lane<2>())); + + vint colori_a8 = asr<8>(colori_a) * vint(257); + colori_a = select(colori_a, colori_a8, vmask(u8_mask.lane<3>())); // Compute color diff vfloat color_r = int_to_float(colori_r); diff --git a/Source/astcenc_diagnostic_trace.cpp b/Source/astcenc_diagnostic_trace.cpp index fbf01a97a2d04a800c9b97b8dd2b7480798c74c1..bcd6fa72a549e33e9d9f2d0f4ea342b996740703 100644 --- a/Source/astcenc_diagnostic_trace.cpp +++ b/Source/astcenc_diagnostic_trace.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2021 Arm Limited +// Copyright 2021-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include "astcenc_diagnostic_trace.h" @@ -32,7 +34,7 @@ static TraceLog* g_TraceLog = nullptr; /** @brief The JSON indentation level. */ -static const int g_trace_indent = 2; +static const size_t g_trace_indent = 2; TraceLog::TraceLog( const char* file_name): @@ -55,7 +57,7 @@ TraceNode* TraceLog::get_current_leaf() } /* See header for documentation. */ -int TraceLog::get_depth() +size_t TraceLog::get_depth() { return m_stack.size(); } @@ -82,12 +84,12 @@ TraceNode::TraceNode( vsnprintf (buffer, bufsz, format, args); va_end (args); - // Guarantee there is a nul termintor + // Guarantee there is a nul terminator buffer[bufsz - 1] = 0; // Generate the node TraceNode* parent = g_TraceLog->get_current_leaf(); - int depth = g_TraceLog->get_depth(); + size_t depth = g_TraceLog->get_depth(); g_TraceLog->m_stack.push_back(this); bool comma = parent && parent->m_attrib_count; @@ -108,8 +110,8 @@ TraceNode::TraceNode( out << '\n'; } - int out_indent = (depth * 2) * g_trace_indent; - int in_indent = (depth * 2 + 1) * g_trace_indent; + size_t out_indent = (depth * 2) * g_trace_indent; + size_t in_indent = (depth * 2 + 1) * g_trace_indent; std::string out_indents(""); if (out_indent) @@ -131,8 +133,8 @@ void TraceNode::add_attrib( ) { (void)type; - int depth = g_TraceLog->get_depth(); - int indent = (depth * 2) * g_trace_indent; + size_t depth = g_TraceLog->get_depth(); + size_t indent = (depth * 2) * g_trace_indent; auto& out = g_TraceLog->m_file; bool comma = m_attrib_count; m_attrib_count++; @@ -154,9 +156,9 @@ TraceNode::~TraceNode() g_TraceLog->m_stack.pop_back(); auto& out = g_TraceLog->m_file; - int depth = g_TraceLog->get_depth(); - int out_indent = (depth * 2) * g_trace_indent; - int in_indent = (depth * 2 + 1) * g_trace_indent; + size_t depth = g_TraceLog->get_depth(); + size_t out_indent = (depth * 2) * g_trace_indent; + size_t in_indent = (depth * 2 + 1) * g_trace_indent; std::string out_indents(""); if (out_indent) @@ -189,7 +191,7 @@ void trace_add_data( vsnprintf (buffer, bufsz, format, args); va_end (args); - // Guarantee there is a nul termintor + // Guarantee there is a nul terminator buffer[bufsz - 1] = 0; std::string value = "\"" + std::string(buffer) + "\""; @@ -203,7 +205,20 @@ void trace_add_data( const char* key, float value ) { - char buffer[256]; + // Turn infinities into parseable values + if (std::isinf(value)) + { + if (value > 0.0f) + { + value = std::numeric_limits::max(); + } + else + { + value = -std::numeric_limits::max(); + } + } + + char buffer[256]; sprintf(buffer, "%.20g", (double)value); TraceNode* node = g_TraceLog->get_current_leaf(); node->add_attrib("float", key, buffer); diff --git a/Source/astcenc_diagnostic_trace.h b/Source/astcenc_diagnostic_trace.h index 614894987fbf0500f2644c1526b7fda1a0fd8184..f5586b0ad5933cf230c285c9090f9ceeef39a0fa 100644 --- a/Source/astcenc_diagnostic_trace.h +++ b/Source/astcenc_diagnostic_trace.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2021 Arm Limited +// Copyright 2021-2022 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -148,7 +148,7 @@ public: * * @return The current leaf node stack depth. */ - int get_depth(); + size_t get_depth(); /** * @brief The file stream to write to. diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp index 6f755cc1aa84f000c26b3b6135ee6744ec8fb2d1..212658873e0b8379e86b62c4524588dd1f363e65 100644 --- a/Source/astcenc_entry.cpp +++ b/Source/astcenc_entry.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -24,7 +24,7 @@ #include #include "astcenc.h" -#include "astcenc_internal.h" +#include "astcenc_internal_entry.h" #include "astcenc_diagnostic_trace.h" /** @@ -40,89 +40,96 @@ struct astcenc_preset_config { float quality; unsigned int tune_partition_count_limit; - unsigned int tune_partition_index_limit; + unsigned int tune_2partition_index_limit; + unsigned int tune_3partition_index_limit; + unsigned int tune_4partition_index_limit; unsigned int tune_block_mode_limit; unsigned int tune_refinement_limit; unsigned int tune_candidate_limit; + unsigned int tune_2partitioning_candidate_limit; + unsigned int tune_3partitioning_candidate_limit; + unsigned int tune_4partitioning_candidate_limit; float tune_db_limit_a_base; float tune_db_limit_b_base; - float tune_mode0_mse_overshoot; - float tune_refinement_mse_overshoot; - float tune_2_partition_early_out_limit_factor; - float tune_3_partition_early_out_limit_factor; - float tune_2_plane_early_out_limit_correlation; - unsigned int tune_low_weight_count_limit; + float tune_mse_overshoot; + float tune_2partition_early_out_limit_factor; + float tune_3partition_early_out_limit_factor; + float tune_2plane_early_out_limit_correlation; + float tune_search_mode0_enable; }; - /** - * @brief The static quality presets that are built-in for high bandwidth - * presets (x < 25 texels per block). + * @brief The static presets for high bandwidth encodings (x < 25 texels per block). */ -static const std::array preset_configs_high {{ +static const std::array preset_configs_high {{ { ASTCENC_PRE_FASTEST, - 2, 8, 42, 2, 2, 85.2f, 63.2f, 3.5f, 3.5f, 1.0f, 1.0f, 0.5f, 25 + 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 0.0f }, { ASTCENC_PRE_FAST, - 3, 12, 55, 3, 3, 85.2f, 63.2f, 3.5f, 3.5f, 1.0f, 1.1f, 0.65f, 20 + 3, 18, 10, 8, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.90f, 0.0f }, { ASTCENC_PRE_MEDIUM, - 4, 26, 76, 3, 3 , 95.0f, 70.0f, 2.5f, 2.5f, 1.2f, 1.25f, 0.85f, 16 + 4, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 2.5f, 1.1f, 1.05f, 0.95f, 0.0f }, { ASTCENC_PRE_THOROUGH, - 4, 76, 93, 4, 4, 105.0f, 77.0f, 10.0f, 10.0f, 2.5f, 1.25f, 0.95f, 12 + 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.35f, 1.15f, 0.97f, 0.0f + }, { + ASTCENC_PRE_VERYTHOROUGH, + 4, 256, 128, 64, 98, 4, 6, 8, 6, 4, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f }, { ASTCENC_PRE_EXHAUSTIVE, - 4, 1024, 100, 4, 4, 200.0f, 200.0f, 10.0f, 10.0f, 10.0f, 10.0f, 0.99f, 0 + 4, 512, 512, 512, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f } }}; - /** - * @brief The static quality presets that are built-in for medium bandwidth - * presets (25 <= x < 64 texels per block). + * @brief The static presets for medium bandwidth encodings (25 <= x < 64 texels per block). */ -static const std::array preset_configs_mid {{ +static const std::array preset_configs_mid {{ { ASTCENC_PRE_FASTEST, - 2, 8, 40, 2, 2, 85.2f, 63.2f, 3.5f, 3.5f, 1.0f, 1.0f, 0.5f, 20 + 2, 10, 6, 4, 43, 2, 2, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f }, { ASTCENC_PRE_FAST, - 3, 12, 55, 3, 3, 85.2f, 63.2f, 3.5f, 3.5f, 1.0f, 1.1f, 0.5f, 16 + 3, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.2f, 63.2f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f }, { ASTCENC_PRE_MEDIUM, - 4, 26, 76, 3, 3, 95.0f, 70.0f, 3.0f, 3.0f, 1.2f, 1.25f, 0.75f, 14 + 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.0f, 1.1f, 1.05f, 0.90f, 1.0f }, { ASTCENC_PRE_THOROUGH, - 4, 76, 93, 4, 4, 105.0f, 77.0f, 10.0f, 10.0f, 2.5f, 1.25f, 0.95f, 10 + 4, 82, 60, 30, 94, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.4f, 1.2f, 0.95f, 0.0f + }, { + ASTCENC_PRE_VERYTHOROUGH, + 4, 256, 128, 64, 98, 4, 6, 8, 6, 3, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 0.0f }, { ASTCENC_PRE_EXHAUSTIVE, - 4, 1024, 100, 4, 4, 200.0f, 200.0f, 10.0f, 10.0f, 10.0f, 10.0f, 0.99f, 0 + 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 0.0f } }}; - /** - * @brief The static quality presets that are built-in for low bandwidth - * presets (64 <= x texels per block). + * @brief The static presets for low bandwidth encodings (64 <= x texels per block). */ -static const std::array preset_configs_low {{ +static const std::array preset_configs_low {{ { ASTCENC_PRE_FASTEST, - 2, 6, 38, 2, 2, 85.0f, 63.0f, 3.5f, 3.5f, 1.0f, 1.0f, 0.5f, 20 + 2, 10, 6, 4, 40, 2, 2, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.80f, 1.0f }, { ASTCENC_PRE_FAST, - 3, 10, 53, 3, 3, 85.0f, 63.0f, 3.5f, 3.5f, 1.0f, 1.1f, 0.5f, 16 + 2, 18, 12, 10, 55, 3, 3, 2, 2, 2, 85.0f, 63.0f, 3.5f, 1.0f, 1.0f, 0.85f, 1.0f }, { ASTCENC_PRE_MEDIUM, - 3, 26, 76, 3, 3, 95.0f, 70.0f, 3.5f, 3.5f, 1.2f, 1.25f, 0.65f, 12 + 3, 34, 28, 16, 77, 3, 3, 2, 2, 2, 95.0f, 70.0f, 3.5f, 1.1f, 1.05f, 0.90f, 1.0f }, { ASTCENC_PRE_THOROUGH, - 4, 75, 92, 4, 4, 105.0f, 77.0f, 10.0f, 10.0f, 2.5f, 1.25f, 0.85f, 10 + 4, 82, 60, 30, 93, 4, 4, 3, 2, 2, 105.0f, 77.0f, 10.0f, 1.3f, 1.2f, 0.97f, 1.0f + }, { + ASTCENC_PRE_VERYTHOROUGH, + 4, 256, 128, 64, 98, 4, 6, 8, 5, 2, 200.0f, 200.0f, 10.0f, 1.6f, 1.4f, 0.98f, 1.0f }, { ASTCENC_PRE_EXHAUSTIVE, - 4, 1024, 100, 4, 4, 200.0f, 200.0f, 10.0f, 10.0f, 10.0f, 10.0f, 0.99f, 0 + 4, 256, 256, 256, 100, 4, 8, 8, 8, 8, 200.0f, 200.0f, 10.0f, 2.0f, 2.0f, 0.99f, 1.0f } }}; @@ -151,48 +158,6 @@ static astcenc_error validate_cpu_float() return ASTCENC_SUCCESS; } -/** - * @brief Validate CPU ISA support meets the requirements of this build of the library. - * - * Each library build is statically compiled for a particular set of CPU ISA features, such as the - * SIMD support or other ISA extensions such as POPCNT. This function checks that the host CPU - * actually supports everything this build needs. - * - * @return Return @c ASTCENC_SUCCESS if validated, otherwise an error on failure. - */ -static astcenc_error validate_cpu_isa() -{ - #if ASTCENC_SSE >= 41 - if (!cpu_supports_sse41()) - { - return ASTCENC_ERR_BAD_CPU_ISA; - } - #endif - - #if ASTCENC_POPCNT >= 1 - if (!cpu_supports_popcnt()) - { - return ASTCENC_ERR_BAD_CPU_ISA; - } - #endif - - #if ASTCENC_F16C >= 1 - if (!cpu_supports_f16c()) - { - return ASTCENC_ERR_BAD_CPU_ISA; - } - #endif - - #if ASTCENC_AVX >= 2 - if (!cpu_supports_avx2()) - { - return ASTCENC_ERR_BAD_CPU_ISA; - } - #endif - - return ASTCENC_SUCCESS; -} - /** * @brief Validate config profile. * @@ -252,11 +217,13 @@ static astcenc_error validate_block_size( /** * @brief Validate flags. * - * @param flags The flags to check. + * @param profile The profile to check. + * @param flags The flags to check. * * @return Return @c ASTCENC_SUCCESS if validated, otherwise an error on failure. */ static astcenc_error validate_flags( + astcenc_profile profile, unsigned int flags ) { // Flags field must not contain any unknown flag bits @@ -267,14 +234,21 @@ static astcenc_error validate_flags( } // Flags field must only contain at most a single map type - exMask = ASTCENC_FLG_MAP_MASK - | ASTCENC_FLG_MAP_NORMAL + exMask = ASTCENC_FLG_MAP_NORMAL | ASTCENC_FLG_MAP_RGBM; if (popcount(flags & exMask) > 1) { return ASTCENC_ERR_BAD_FLAGS; } + // Decode_unorm8 must only be used with an LDR profile + bool is_unorm8 = flags & ASTCENC_FLG_USE_DECODE_UNORM8; + bool is_hdr = (profile == ASTCENC_PRF_HDR) || (profile == ASTCENC_PRF_HDR_RGB_LDR_A); + if (is_unorm8 && is_hdr) + { + return ASTCENC_ERR_BAD_DECODE_MODE; + } + return ASTCENC_SUCCESS; } @@ -400,7 +374,7 @@ static astcenc_error validate_config( return status; } - status = validate_flags(config.flags); + status = validate_flags(config.profile, config.flags); if (status != ASTCENC_SUCCESS) { return status; @@ -423,16 +397,20 @@ static astcenc_error validate_config( config.rgbm_m_scale = astc::max(config.rgbm_m_scale, 1.0f); config.tune_partition_count_limit = astc::clamp(config.tune_partition_count_limit, 1u, 4u); - config.tune_partition_index_limit = astc::clamp(config.tune_partition_index_limit, 1u, BLOCK_MAX_PARTITIONINGS); + config.tune_2partition_index_limit = astc::clamp(config.tune_2partition_index_limit, 1u, BLOCK_MAX_PARTITIONINGS); + config.tune_3partition_index_limit = astc::clamp(config.tune_3partition_index_limit, 1u, BLOCK_MAX_PARTITIONINGS); + config.tune_4partition_index_limit = astc::clamp(config.tune_4partition_index_limit, 1u, BLOCK_MAX_PARTITIONINGS); config.tune_block_mode_limit = astc::clamp(config.tune_block_mode_limit, 1u, 100u); config.tune_refinement_limit = astc::max(config.tune_refinement_limit, 1u); config.tune_candidate_limit = astc::clamp(config.tune_candidate_limit, 1u, TUNE_MAX_TRIAL_CANDIDATES); + config.tune_2partitioning_candidate_limit = astc::clamp(config.tune_2partitioning_candidate_limit, 1u, TUNE_MAX_PARTITIONING_CANDIDATES); + config.tune_3partitioning_candidate_limit = astc::clamp(config.tune_3partitioning_candidate_limit, 1u, TUNE_MAX_PARTITIONING_CANDIDATES); + config.tune_4partitioning_candidate_limit = astc::clamp(config.tune_4partitioning_candidate_limit, 1u, TUNE_MAX_PARTITIONING_CANDIDATES); config.tune_db_limit = astc::max(config.tune_db_limit, 0.0f); - config.tune_mode0_mse_overshoot = astc::max(config.tune_mode0_mse_overshoot, 1.0f); - config.tune_refinement_mse_overshoot = astc::max(config.tune_refinement_mse_overshoot, 1.0f); - config.tune_2_partition_early_out_limit_factor = astc::max(config.tune_2_partition_early_out_limit_factor, 0.0f); - config.tune_3_partition_early_out_limit_factor = astc::max(config.tune_3_partition_early_out_limit_factor, 0.0f); - config.tune_2_plane_early_out_limit_correlation = astc::max(config.tune_2_plane_early_out_limit_correlation, 0.0f); + config.tune_mse_overshoot = astc::max(config.tune_mse_overshoot, 1.0f); + config.tune_2partition_early_out_limit_factor = astc::max(config.tune_2partition_early_out_limit_factor, 0.0f); + config.tune_3partition_early_out_limit_factor = astc::max(config.tune_3partition_early_out_limit_factor, 0.0f); + config.tune_2plane_early_out_limit_correlation = astc::max(config.tune_2plane_early_out_limit_correlation, 0.0f); // Specifying a zero weight color component is not allowed; force to small value float max_weight = astc::max(astc::max(config.cw_r_weight, config.cw_g_weight), @@ -465,9 +443,15 @@ astcenc_error astcenc_config_init( astcenc_config* configp ) { astcenc_error status; - astcenc_config& config = *configp; + + status = validate_cpu_float(); + if (status != ASTCENC_SUCCESS) + { + return status; + } // Zero init all config fields; although most of will be over written + astcenc_config& config = *configp; std::memset(&config, 0, sizeof(config)); // Process the block size @@ -494,7 +478,7 @@ astcenc_error astcenc_config_init( return ASTCENC_ERR_BAD_QUALITY; } - static const std::array* preset_configs; + static const std::array* preset_configs; int texels_int = block_x * block_y * block_z; if (texels_int < 25) { @@ -526,21 +510,24 @@ astcenc_error astcenc_config_init( if (start == end) { config.tune_partition_count_limit = (*preset_configs)[start].tune_partition_count_limit; - config.tune_partition_index_limit = (*preset_configs)[start].tune_partition_index_limit; + config.tune_2partition_index_limit = (*preset_configs)[start].tune_2partition_index_limit; + config.tune_3partition_index_limit = (*preset_configs)[start].tune_3partition_index_limit; + config.tune_4partition_index_limit = (*preset_configs)[start].tune_4partition_index_limit; config.tune_block_mode_limit = (*preset_configs)[start].tune_block_mode_limit; config.tune_refinement_limit = (*preset_configs)[start].tune_refinement_limit; - config.tune_candidate_limit = astc::min((*preset_configs)[start].tune_candidate_limit, - TUNE_MAX_TRIAL_CANDIDATES); + config.tune_candidate_limit = (*preset_configs)[start].tune_candidate_limit; + config.tune_2partitioning_candidate_limit = (*preset_configs)[start].tune_2partitioning_candidate_limit; + config.tune_3partitioning_candidate_limit = (*preset_configs)[start].tune_3partitioning_candidate_limit; + config.tune_4partitioning_candidate_limit = (*preset_configs)[start].tune_4partitioning_candidate_limit; config.tune_db_limit = astc::max((*preset_configs)[start].tune_db_limit_a_base - 35 * ltexels, (*preset_configs)[start].tune_db_limit_b_base - 19 * ltexels); - config.tune_mode0_mse_overshoot = (*preset_configs)[start].tune_mode0_mse_overshoot; - config.tune_refinement_mse_overshoot = (*preset_configs)[start].tune_refinement_mse_overshoot; + config.tune_mse_overshoot = (*preset_configs)[start].tune_mse_overshoot; - config.tune_2_partition_early_out_limit_factor = (*preset_configs)[start].tune_2_partition_early_out_limit_factor; - config.tune_3_partition_early_out_limit_factor =(*preset_configs)[start].tune_3_partition_early_out_limit_factor; - config.tune_2_plane_early_out_limit_correlation = (*preset_configs)[start].tune_2_plane_early_out_limit_correlation; - config.tune_low_weight_count_limit = (*preset_configs)[start].tune_low_weight_count_limit; + config.tune_2partition_early_out_limit_factor = (*preset_configs)[start].tune_2partition_early_out_limit_factor; + config.tune_3partition_early_out_limit_factor = (*preset_configs)[start].tune_3partition_early_out_limit_factor; + config.tune_2plane_early_out_limit_correlation = (*preset_configs)[start].tune_2plane_early_out_limit_correlation; + config.tune_search_mode0_enable = (*preset_configs)[start].tune_search_mode0_enable; } // Start and end node are not the same - so interpolate between them else @@ -562,21 +549,24 @@ astcenc_error astcenc_config_init( #define LERPUI(param) static_cast(LERPI(param)) config.tune_partition_count_limit = LERPI(tune_partition_count_limit); - config.tune_partition_index_limit = LERPI(tune_partition_index_limit); + config.tune_2partition_index_limit = LERPI(tune_2partition_index_limit); + config.tune_3partition_index_limit = LERPI(tune_3partition_index_limit); + config.tune_4partition_index_limit = LERPI(tune_4partition_index_limit); config.tune_block_mode_limit = LERPI(tune_block_mode_limit); config.tune_refinement_limit = LERPI(tune_refinement_limit); - config.tune_candidate_limit = astc::min(LERPUI(tune_candidate_limit), - TUNE_MAX_TRIAL_CANDIDATES); + config.tune_candidate_limit = LERPUI(tune_candidate_limit); + config.tune_2partitioning_candidate_limit = LERPUI(tune_2partitioning_candidate_limit); + config.tune_3partitioning_candidate_limit = LERPUI(tune_3partitioning_candidate_limit); + config.tune_4partitioning_candidate_limit = LERPUI(tune_4partitioning_candidate_limit); config.tune_db_limit = astc::max(LERP(tune_db_limit_a_base) - 35 * ltexels, LERP(tune_db_limit_b_base) - 19 * ltexels); - config.tune_mode0_mse_overshoot = LERP(tune_mode0_mse_overshoot); - config.tune_refinement_mse_overshoot = LERP(tune_refinement_mse_overshoot); + config.tune_mse_overshoot = LERP(tune_mse_overshoot); - config.tune_2_partition_early_out_limit_factor = LERP(tune_2_partition_early_out_limit_factor); - config.tune_3_partition_early_out_limit_factor = LERP(tune_3_partition_early_out_limit_factor); - config.tune_2_plane_early_out_limit_correlation = LERP(tune_2_plane_early_out_limit_correlation); - config.tune_low_weight_count_limit = LERPI(tune_low_weight_count_limit); + config.tune_2partition_early_out_limit_factor = LERP(tune_2partition_early_out_limit_factor); + config.tune_3partition_early_out_limit_factor = LERP(tune_3partition_early_out_limit_factor); + config.tune_2plane_early_out_limit_correlation = LERP(tune_2plane_early_out_limit_correlation); + config.tune_search_mode0_enable = LERP(tune_search_mode0_enable); #undef LERP #undef LERPI #undef LERPUI @@ -604,13 +594,14 @@ astcenc_error astcenc_config_init( case ASTCENC_PRF_HDR_RGB_LDR_A: case ASTCENC_PRF_HDR: config.tune_db_limit = 999.0f; + config.tune_search_mode0_enable = 0.0f; break; default: return ASTCENC_ERR_BAD_PROFILE; } // Flags field must not contain any unknown flag bits - status = validate_flags(flags); + status = validate_flags(profile, flags); if (status != ASTCENC_SUCCESS) { return status; @@ -625,20 +616,14 @@ astcenc_error astcenc_config_init( config.cw_g_weight = 0.0f; config.cw_b_weight = 0.0f; - config.tune_2_partition_early_out_limit_factor *= 1.5f; - config.tune_3_partition_early_out_limit_factor *= 1.5f; - config.tune_2_plane_early_out_limit_correlation = 0.99f; + config.tune_2partition_early_out_limit_factor *= 1.5f; + config.tune_3partition_early_out_limit_factor *= 1.5f; + config.tune_2plane_early_out_limit_correlation = 0.99f; // Normals are prone to blocking artifacts on smooth curves // so force compressor to try harder here ... config.tune_db_limit *= 1.03f; } - else if (flags & ASTCENC_FLG_MAP_MASK) - { - // Masks are prone to blocking artifacts on mask edges - // so force compressor to try harder here ... - config.tune_db_limit *= 1.03f; - } else if (flags & ASTCENC_FLG_MAP_RGBM) { config.rgbm_m_scale = 5.0f; @@ -655,7 +640,7 @@ astcenc_error astcenc_config_init( // // ... but we scale these up to keep a better balance between color and alpha. Note // that if the content is using alpha we'd recommend using the -a option to weight - // the color conribution by the alpha transparency. + // the color contribution by the alpha transparency. if (flags & ASTCENC_FLG_USE_PERCEPTUAL) { config.cw_r_weight = 0.30f * 2.25f; @@ -683,12 +668,6 @@ astcenc_error astcenc_context_alloc( return status; } - status = validate_cpu_isa(); - if (status != ASTCENC_SUCCESS) - { - return status; - } - if (thread_count == 0) { return ASTCENC_ERR_BAD_PARAM; @@ -702,7 +681,8 @@ astcenc_error astcenc_context_alloc( } #endif - astcenc_context* ctx = new astcenc_context; + astcenc_context* ctxo = new astcenc_context; + astcenc_contexti* ctx = &ctxo->context; ctx->thread_count = thread_count; ctx->config = config; ctx->working_buffers = nullptr; @@ -714,12 +694,18 @@ astcenc_error astcenc_context_alloc( status = validate_config(ctx->config); if (status != ASTCENC_SUCCESS) { - delete ctx; + delete ctxo; return status; } ctx->bsd = aligned_malloc(sizeof(block_size_descriptor), ASTCENC_VECALIGN); - bool can_omit_modes = config.flags & ASTCENC_FLG_SELF_DECOMPRESS_ONLY; + if (!ctx->bsd) + { + delete ctxo; + return ASTCENC_ERR_OUT_OF_MEM; + } + + bool can_omit_modes = static_cast(config.flags & ASTCENC_FLG_SELF_DECOMPRESS_ONLY); init_block_size_descriptor(ctx->config.privateProfile, config.block_x, config.block_y, config.block_z, can_omit_modes, config.tune_partition_count_limit, @@ -728,7 +714,7 @@ astcenc_error astcenc_context_alloc( #if !defined(ASTCENC_DECOMPRESS_ONLY) // Do setup only needed by compression - if (!(status & ASTCENC_FLG_DECOMPRESS_ONLY)) + if (!(ctx->config.flags & ASTCENC_FLG_DECOMPRESS_ONLY)) { // Turn a dB limit into a per-texel error for faster use later if ((ctx->config.profile == ASTCENC_PRF_LDR) || (ctx->config.profile == ASTCENC_PRF_LDR_SRGB)) @@ -742,12 +728,12 @@ astcenc_error astcenc_context_alloc( size_t worksize = sizeof(compression_working_buffers) * thread_count; ctx->working_buffers = aligned_malloc(worksize, ASTCENC_VECALIGN); - static_assert((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0, + static_assert((ASTCENC_VECALIGN == 0) || ((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0), "compression_working_buffers size must be multiple of vector alignment"); if (!ctx->working_buffers) { aligned_free(ctx->bsd); - delete ctx; + delete ctxo; *context = nullptr; return ASTCENC_ERR_OUT_OF_MEM; } @@ -766,7 +752,7 @@ astcenc_error astcenc_context_alloc( trace_add_data("block_z", config.block_z); #endif - *context = ctx; + *context = ctxo; #if !defined(ASTCENC_DECOMPRESS_ONLY) prepare_angular_tables(); @@ -777,16 +763,17 @@ astcenc_error astcenc_context_alloc( /* See header dor documentation. */ void astcenc_context_free( - astcenc_context* ctx + astcenc_context* ctxo ) { - if (ctx) + if (ctxo) { + astcenc_contexti* ctx = &ctxo->context; aligned_free(ctx->working_buffers); aligned_free(ctx->bsd); #if defined(ASTCENC_DIAGNOSTICS) delete ctx->trace_log; #endif - delete ctx; + delete ctxo; } } @@ -795,14 +782,14 @@ void astcenc_context_free( /** * @brief Compress an image, after any preflight has completed. * - * @param[out] ctx The compressor context. + * @param[out] ctxo The compressor context. * @param thread_index The thread index. * @param image The intput image. * @param swizzle The input swizzle. * @param[out] buffer The output array for the compressed data. */ static void compress_image( - astcenc_context& ctx, + astcenc_context& ctxo, unsigned int thread_index, const astcenc_image& image, const astcenc_swizzle& swizzle, @@ -814,6 +801,7 @@ static void compress_image( uint8_t* buffer #endif ) { + astcenc_contexti& ctx = ctxo.context; const block_size_descriptor& bsd = *ctx.bsd; astcenc_profile decode_mode = ctx.config.profile; @@ -822,7 +810,7 @@ static void compress_image( int block_x = bsd.xdim; int block_y = bsd.ydim; int block_z = bsd.zdim; - blk.texel_count = block_x * block_y * block_z; + blk.texel_count = static_cast(block_x * block_y * block_z); int dim_x = image.dim_x; int dim_y = image.dim_y; @@ -836,6 +824,8 @@ static void compress_image( int row_blocks = xblocks; int plane_blocks = xblocks * yblocks; + blk.decode_unorm8 = ctxo.context.config.flags & ASTCENC_FLG_USE_DECODE_UNORM8; + // Populate the block channel weights blk.channel_weight = vfloat4(ctx.config.cw_r_weight, ctx.config.cw_g_weight, @@ -846,8 +836,7 @@ static void compress_image( auto& temp_buffers = ctx.working_buffers[thread_index]; // Only the first thread actually runs the initializer - ctx.manage_compress.init(block_count); - + ctxo.manage_compress.init(block_count, ctx.config.progress_callback); // Determine if we can use an optimized load function bool needs_swz = (swizzle.r != ASTCENC_SWZ_R) || (swizzle.g != ASTCENC_SWZ_G) || @@ -859,17 +848,17 @@ static void compress_image( bool use_fast_load = !needs_swz && !needs_hdr && block_z == 1 && image.data_type == ASTCENC_TYPE_U8; - auto load_func = fetch_image_block; + auto load_func = load_image_block; if (use_fast_load) { - load_func = fetch_image_block_fast_ldr; + load_func = load_image_block_fast_ldr; } // All threads run this processing loop until there is no work remaining while (true) { unsigned int count; - unsigned int base = ctx.manage_compress.get_task_assignment(16, count); + unsigned int base = ctxo.manage_compress.get_task_assignment(16, count); if (!count) { break; @@ -924,6 +913,18 @@ static void compress_image( if (use_full_block) { load_func(decode_mode, image, blk, bsd, x * block_x, y * block_y, z * block_z, swizzle); + + // Scale RGB error contribution by the maximum alpha in the block + // This encourages preserving alpha accuracy in regions with high + // transparency, and can buy up to 0.5 dB PSNR. + if (ctx.config.flags & ASTCENC_FLG_USE_ALPHA_WEIGHT) + { + float alpha_scale = blk.data_max.lane<3>() * (1.0f / 65535.0f); + blk.channel_weight = vfloat4(ctx.config.cw_r_weight * alpha_scale, + ctx.config.cw_g_weight * alpha_scale, + ctx.config.cw_b_weight * alpha_scale, + ctx.config.cw_a_weight); + } } // Apply alpha scale RDO - substitute constant color block else @@ -937,31 +938,92 @@ static void compress_image( int offset = ((z * yblocks + y) * xblocks + x) * 16; uint8_t *bp = buffer + offset; - physical_compressed_block* pcb = reinterpret_cast(bp); #if QUALITY_CONTROL int32_t *mseBlock[RGBA_COM] = {nullptr, nullptr, nullptr, nullptr}; if (calQualityEnable) { - int offset = (z * yblocks + y) * xblocks + x; + offset = (z * yblocks + y) * xblocks + x; mseBlock[R_COM] = mse[R_COM] + offset; mseBlock[G_COM] = mse[G_COM] + offset; mseBlock[B_COM] = mse[B_COM] + offset; mseBlock[A_COM] = mse[A_COM] + offset; } - compress_block(ctx, blk, *pcb, temp_buffers, calQualityEnable, mseBlock); + compress_block(ctx, blk, bp, temp_buffers, calQualityEnable, mseBlock); #else - compress_block(ctx, blk, *pcb, temp_buffers); + compress_block(ctx, blk, bp, temp_buffers); #endif } - ctx.manage_compress.complete_task_assignment(count); + ctxo.manage_compress.complete_task_assignment(count); } } +/** + * @brief Compute regional averages in an image. + * + * This function can be called by multiple threads, but only after a single + * thread calls the setup function @c init_compute_averages(). + * + * Results are written back into @c img->input_alpha_averages. + * + * @param[out] ctx The context. + * @param ag The average and variance arguments created during setup. + */ +static void compute_averages( + astcenc_context& ctx, + const avg_args &ag +) { + pixel_region_args arg = ag.arg; + arg.work_memory = new vfloat4[ag.work_memory_size]; + + int size_x = ag.img_size_x; + int size_y = ag.img_size_y; + int size_z = ag.img_size_z; + + int step_xy = ag.blk_size_xy; + int step_z = ag.blk_size_z; + + int y_tasks = (size_y + step_xy - 1) / step_xy; + + // All threads run this processing loop until there is no work remaining + while (true) + { + unsigned int count; + unsigned int base = ctx.manage_avg.get_task_assignment(16, count); + if (!count) + { + break; + } + + for (unsigned int i = base; i < base + count; i++) + { + int z = (i / (y_tasks)) * step_z; + int y = (i - (z * y_tasks)) * step_xy; + + arg.size_z = astc::min(step_z, size_z - z); + arg.offset_z = z; + + arg.size_y = astc::min(step_xy, size_y - y); + arg.offset_y = y; + + for (int x = 0; x < size_x; x += step_xy) + { + arg.size_x = astc::min(step_xy, size_x - x); + arg.offset_x = x; + compute_pixel_region_variance(ctx.context, arg); + } + } + + ctx.manage_avg.complete_task_assignment(count); + } + + delete[] arg.work_memory; +} + #endif /* See header for documentation. */ astcenc_error astcenc_compress_image( - astcenc_context* ctx, + astcenc_context* ctxo, astcenc_image* imagep, const astcenc_swizzle* swizzle, uint8_t* data_out, @@ -973,7 +1035,7 @@ astcenc_error astcenc_compress_image( unsigned int thread_index ) { #if defined(ASTCENC_DECOMPRESS_ONLY) - (void)ctx; + (void)ctxo; (void)imagep; (void)swizzle; (void)data_out; @@ -981,6 +1043,7 @@ astcenc_error astcenc_compress_image( (void)thread_index; return ASTCENC_ERR_BAD_CONTEXT; #else + astcenc_contexti* ctx = &ctxo->context; astcenc_error status; astcenc_image& image = *imagep; @@ -1018,7 +1081,7 @@ astcenc_error astcenc_compress_image( // If context thread count is one then implicitly reset if (ctx->thread_count == 1) { - astcenc_compress_reset(ctx); + astcenc_compress_reset(ctxo); } if (ctx->config.a_scale_radius != 0) @@ -1036,21 +1099,21 @@ astcenc_error astcenc_compress_image( }; // Only the first thread actually runs the initializer - ctx->manage_avg.init(init_avg); + ctxo->manage_avg.init(init_avg); // All threads will enter this function and dynamically grab work - compute_averages(*ctx, ctx->avg_preprocess_args); + compute_averages(*ctxo, ctx->avg_preprocess_args); } // Wait for compute_averages to complete before compressing - ctx->manage_avg.wait(); + ctxo->manage_avg.wait(); #if QUALITY_CONTROL - compress_image(*ctx, thread_index, image, *swizzle, data_out, calQualityEnable, mse); + compress_image(*ctxo, thread_index, image, *swizzle, data_out, calQualityEnable, mse); #else - compress_image(*ctx, thread_index, image, *swizzle, data_out); + compress_image(*ctxo, thread_index, image, *swizzle, data_out); #endif // Wait for compress to complete before freeing memory - ctx->manage_compress.wait(); + ctxo->manage_compress.wait(); auto term_compress = [ctx]() { delete[] ctx->input_alpha_averages; @@ -1058,7 +1121,7 @@ astcenc_error astcenc_compress_image( }; // Only the first thread to arrive actually runs the term - ctx->manage_compress.term(term_compress); + ctxo->manage_compress.term(term_compress); return ASTCENC_SUCCESS; #endif @@ -1066,26 +1129,27 @@ astcenc_error astcenc_compress_image( /* See header for documentation. */ astcenc_error astcenc_compress_reset( - astcenc_context* ctx + astcenc_context* ctxo ) { #if defined(ASTCENC_DECOMPRESS_ONLY) - (void)ctx; + (void)ctxo; return ASTCENC_ERR_BAD_CONTEXT; #else + astcenc_contexti* ctx = &ctxo->context; if (ctx->config.flags & ASTCENC_FLG_DECOMPRESS_ONLY) { return ASTCENC_ERR_BAD_CONTEXT; } - ctx->manage_avg.reset(); - ctx->manage_compress.reset(); + ctxo->manage_avg.reset(); + ctxo->manage_compress.reset(); return ASTCENC_SUCCESS; #endif } /* See header for documentation. */ astcenc_error astcenc_decompress_image( - astcenc_context* ctx, + astcenc_context* ctxo, const uint8_t* data, size_t data_len, astcenc_image* image_outp, @@ -1094,6 +1158,7 @@ astcenc_error astcenc_decompress_image( ) { astcenc_error status; astcenc_image& image_out = *image_outp; + astcenc_contexti* ctx = &ctxo->context; // Today this doesn't matter (working set on stack) but might in future ... if (thread_index >= ctx->thread_count) @@ -1114,6 +1179,7 @@ astcenc_error astcenc_decompress_image( unsigned int xblocks = (image_out.dim_x + block_x - 1) / block_x; unsigned int yblocks = (image_out.dim_y + block_y - 1) / block_y; unsigned int zblocks = (image_out.dim_z + block_z - 1) / block_z; + unsigned int block_count = zblocks * yblocks * xblocks; int row_blocks = xblocks; int plane_blocks = xblocks * yblocks; @@ -1126,22 +1192,25 @@ astcenc_error astcenc_decompress_image( } image_block blk; - blk.texel_count = block_x * block_y * block_z; + blk.texel_count = static_cast(block_x * block_y * block_z); + + // Decode mode inferred from the output data type + blk.decode_unorm8 = image_out.data_type == ASTCENC_TYPE_U8; // If context thread count is one then implicitly reset if (ctx->thread_count == 1) { - astcenc_decompress_reset(ctx); + astcenc_decompress_reset(ctxo); } // Only the first thread actually runs the initializer - ctx->manage_decompress.init(zblocks * yblocks * xblocks); + ctxo->manage_decompress.init(block_count, nullptr); // All threads run this processing loop until there is no work remaining while (true) { unsigned int count; - unsigned int base = ctx->manage_decompress.get_task_assignment(128, count); + unsigned int base = ctxo->manage_decompress.get_task_assignment(128, count); if (!count) { break; @@ -1158,20 +1227,19 @@ astcenc_error astcenc_decompress_image( unsigned int offset = (((z * yblocks + y) * xblocks) + x) * 16; const uint8_t* bp = data + offset; - const physical_compressed_block& pcb = *reinterpret_cast(bp); symbolic_compressed_block scb; - physical_to_symbolic(*ctx->bsd, pcb, scb); + physical_to_symbolic(*ctx->bsd, bp, scb); decompress_symbolic_block(ctx->config.profile, *ctx->bsd, x * block_x, y * block_y, z * block_z, scb, blk); - write_image_block(image_out, blk, *ctx->bsd, + store_image_block(image_out, blk, *ctx->bsd, x * block_x, y * block_y, z * block_z, *swizzle); } - ctx->manage_decompress.complete_task_assignment(count); + ctxo->manage_decompress.complete_task_assignment(count); } return ASTCENC_SUCCESS; @@ -1179,28 +1247,29 @@ astcenc_error astcenc_decompress_image( /* See header for documentation. */ astcenc_error astcenc_decompress_reset( - astcenc_context* ctx + astcenc_context* ctxo ) { - ctx->manage_decompress.reset(); + ctxo->manage_decompress.reset(); return ASTCENC_SUCCESS; } /* See header for documentation. */ astcenc_error astcenc_get_block_info( - astcenc_context* ctx, + astcenc_context* ctxo, const uint8_t data[16], astcenc_block_info* info ) { #if defined(ASTCENC_DECOMPRESS_ONLY) - (void)ctx; + (void)ctxo; (void)data; (void)info; return ASTCENC_ERR_BAD_CONTEXT; #else + astcenc_contexti* ctx = &ctxo->context; + // Decode the compressed data into a symbolic form - const physical_compressed_block&pcb = *reinterpret_cast(data); symbolic_compressed_block scb; - physical_to_symbolic(*ctx->bsd, pcb, scb); + physical_to_symbolic(*ctx->bsd, data, scb); // Fetch the appropriate partition and decimation tables block_size_descriptor& bsd = *ctx->bsd; @@ -1260,7 +1329,6 @@ astcenc_error astcenc_get_block_info( unpack_color_endpoints(ctx->config.profile, scb.color_formats[i], - scb.get_color_quant_mode(), scb.color_values[i], rgb_hdr, a_hdr, endpnt[0], endpnt[1]); @@ -1284,7 +1352,7 @@ astcenc_error astcenc_get_block_info( int weight_plane1[BLOCK_MAX_TEXELS]; int weight_plane2[BLOCK_MAX_TEXELS]; - unpack_weights(bsd, scb, di, bm.is_dual_plane, bm.get_weight_quant_mode(), weight_plane1, weight_plane2); + unpack_weights(bsd, scb, di, bm.is_dual_plane, weight_plane1, weight_plane2); for (unsigned int i = 0; i < bsd.texel_count; i++) { info->weight_values_plane1[i] = static_cast(weight_plane1[i]) * (1.0f / WEIGHTS_TEXEL_SUM); @@ -1318,8 +1386,6 @@ const char* astcenc_get_error_string( return "ASTCENC_ERR_OUT_OF_MEM"; case ASTCENC_ERR_BAD_CPU_FLOAT: return "ASTCENC_ERR_BAD_CPU_FLOAT"; - case ASTCENC_ERR_BAD_CPU_ISA: - return "ASTCENC_ERR_BAD_CPU_ISA"; case ASTCENC_ERR_BAD_PARAM: return "ASTCENC_ERR_BAD_PARAM"; case ASTCENC_ERR_BAD_BLOCK_SIZE: @@ -1336,6 +1402,8 @@ const char* astcenc_get_error_string( return "ASTCENC_ERR_BAD_CONTEXT"; case ASTCENC_ERR_NOT_IMPLEMENTED: return "ASTCENC_ERR_NOT_IMPLEMENTED"; + case ASTCENC_ERR_BAD_DECODE_MODE: + return "ASTCENC_ERR_BAD_DECODE_MODE"; #if defined(ASTCENC_DIAGNOSTICS) case ASTCENC_ERR_DTRACE_FAILURE: return "ASTCENC_ERR_DTRACE_FAILURE"; diff --git a/Source/astcenc_find_best_partitioning.cpp b/Source/astcenc_find_best_partitioning.cpp index aa9a8ab8d9d21c3a6ae613979196e6439345aadb..bfbcc35e94e772045e65ec0962a42c7b8f573fbe 100644 --- a/Source/astcenc_find_best_partitioning.cpp +++ b/Source/astcenc_find_best_partitioning.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -46,15 +46,16 @@ * lines for endpoint selection. */ +#include #include "astcenc_internal.h" /** - * @brief Pick some initital kmeans cluster centers. + * @brief Pick some initial kmeans cluster centers. * * @param blk The image block color data to compress. * @param texel_count The number of texels in the block. * @param partition_count The number of partitions in the block. - * @param[out] cluster_centers The initital partition cluster center colors. + * @param[out] cluster_centers The initial partition cluster center colors. */ static void kmeans_init( const image_block& blk, @@ -249,13 +250,16 @@ static void kmeans_update( * * @return The number of bit mismatches. */ -static inline unsigned int partition_mismatch2( +static inline uint8_t partition_mismatch2( const uint64_t a[2], const uint64_t b[2] ) { int v1 = popcount(a[0] ^ b[0]) + popcount(a[1] ^ b[1]); int v2 = popcount(a[0] ^ b[1]) + popcount(a[1] ^ b[0]); - return astc::min(v1, v2); + + // Divide by 2 because XOR always counts errors twice, once when missing + // in the expected position, and again when present in the wrong partition + return static_cast(astc::min(v1, v2) / 2); } /** @@ -266,7 +270,7 @@ static inline unsigned int partition_mismatch2( * * @return The number of bit mismatches. */ -static inline unsigned int partition_mismatch3( +static inline uint8_t partition_mismatch3( const uint64_t a[3], const uint64_t b[3] ) { @@ -294,7 +298,9 @@ static inline unsigned int partition_mismatch3( int s5 = p11 + p20; int v2 = astc::min(s4, s5) + p02; - return astc::min(v0, v1, v2); + // Divide by 2 because XOR always counts errors twice, once when missing + // in the expected position, and again when present in the wrong partition + return static_cast(astc::min(v0, v1, v2) / 2); } /** @@ -305,7 +311,7 @@ static inline unsigned int partition_mismatch3( * * @return The number of bit mismatches. */ -static inline unsigned int partition_mismatch4( +static inline uint8_t partition_mismatch4( const uint64_t a[4], const uint64_t b[4] ) { @@ -341,7 +347,9 @@ static inline unsigned int partition_mismatch4( int v2 = p02 + astc::min(p11 + mx03, p10 + mx13, p13 + mx01); int v3 = p03 + astc::min(p11 + mx02, p12 + mx01, p10 + mx12); - return astc::min(v0, v1, v2, v3); + // Divide by 2 because XOR always counts errors twice, once when missing + // in the expected position, and again when present in the wrong partition + return static_cast(astc::min(v0, v1, v2, v3) / 2); } using mismatch_dispatch = unsigned int (*)(const uint64_t*, const uint64_t*); @@ -358,32 +366,36 @@ static void count_partition_mismatch_bits( const block_size_descriptor& bsd, unsigned int partition_count, const uint64_t bitmaps[BLOCK_MAX_PARTITIONS], - unsigned int mismatch_counts[BLOCK_MAX_PARTITIONINGS] + uint8_t mismatch_counts[BLOCK_MAX_PARTITIONINGS] ) { unsigned int active_count = bsd.partitioning_count_selected[partition_count - 1]; + promise(active_count > 0); if (partition_count == 2) { for (unsigned int i = 0; i < active_count; i++) { - int bitcount = partition_mismatch2(bitmaps, bsd.coverage_bitmaps_2[i]); - mismatch_counts[i] = astc::max(bitcount, static_cast(bsd.partitioning_valid_2[i])); + mismatch_counts[i] = partition_mismatch2(bitmaps, bsd.coverage_bitmaps_2[i]); + assert(mismatch_counts[i] < BLOCK_MAX_KMEANS_TEXELS); + assert(mismatch_counts[i] < bsd.texel_count); } } else if (partition_count == 3) { for (unsigned int i = 0; i < active_count; i++) { - int bitcount = partition_mismatch3(bitmaps, bsd.coverage_bitmaps_3[i]); - mismatch_counts[i] = astc::max(bitcount, static_cast(bsd.partitioning_valid_3[i])); + mismatch_counts[i] = partition_mismatch3(bitmaps, bsd.coverage_bitmaps_3[i]); + assert(mismatch_counts[i] < BLOCK_MAX_KMEANS_TEXELS); + assert(mismatch_counts[i] < bsd.texel_count); } } else { for (unsigned int i = 0; i < active_count; i++) { - int bitcount = partition_mismatch4(bitmaps, bsd.coverage_bitmaps_4[i]); - mismatch_counts[i] = astc::max(bitcount, static_cast(bsd.partitioning_valid_4[i])); + mismatch_counts[i] = partition_mismatch4(bitmaps, bsd.coverage_bitmaps_4[i]); + assert(mismatch_counts[i] < BLOCK_MAX_KMEANS_TEXELS); + assert(mismatch_counts[i] < bsd.texel_count); } } } @@ -398,11 +410,13 @@ static void count_partition_mismatch_bits( * @return The number of active partitions in this selection. */ static unsigned int get_partition_ordering_by_mismatch_bits( + unsigned int texel_count, unsigned int partitioning_count, - const unsigned int mismatch_count[BLOCK_MAX_PARTITIONINGS], - unsigned int partition_ordering[BLOCK_MAX_PARTITIONINGS] + const uint8_t mismatch_count[BLOCK_MAX_PARTITIONINGS], + uint16_t partition_ordering[BLOCK_MAX_PARTITIONINGS] ) { - unsigned int mscount[256] { 0 }; + promise(partitioning_count > 0); + uint16_t mscount[BLOCK_MAX_KMEANS_TEXELS] { 0 }; // Create the histogram of mismatch counts for (unsigned int i = 0; i < partitioning_count; i++) @@ -410,16 +424,14 @@ static unsigned int get_partition_ordering_by_mismatch_bits( mscount[mismatch_count[i]]++; } - unsigned int active_count = partitioning_count - mscount[255]; - // Create a running sum from the histogram array // Cells store previous values only; i.e. exclude self after sum - unsigned int summa = 0; - for (unsigned int i = 0; i < 256; i++) + unsigned int sum = 0; + for (unsigned int i = 0; i < texel_count; i++) { - unsigned int cnt = mscount[i]; - mscount[i] = summa; - summa += cnt; + uint16_t cnt = mscount[i]; + mscount[i] = sum; + sum += cnt; } // Use the running sum as the index, incrementing after read to allow @@ -427,10 +439,10 @@ static unsigned int get_partition_ordering_by_mismatch_bits( for (unsigned int i = 0; i < partitioning_count; i++) { unsigned int idx = mscount[mismatch_count[i]]++; - partition_ordering[idx] = i; + partition_ordering[idx] = static_cast(i); } - return active_count; + return partitioning_count; } /** @@ -447,7 +459,7 @@ static unsigned int compute_kmeans_partition_ordering( const block_size_descriptor& bsd, const image_block& blk, unsigned int partition_count, - unsigned int partition_ordering[BLOCK_MAX_PARTITIONINGS] + uint16_t partition_ordering[BLOCK_MAX_PARTITIONINGS] ) { vfloat4 cluster_centers[BLOCK_MAX_PARTITIONS]; uint8_t texel_partitions[BLOCK_MAX_TEXELS]; @@ -478,22 +490,71 @@ static unsigned int compute_kmeans_partition_ordering( } // Count the mismatch between the block and the format's partition tables - unsigned int mismatch_counts[BLOCK_MAX_PARTITIONINGS]; + uint8_t mismatch_counts[BLOCK_MAX_PARTITIONINGS]; count_partition_mismatch_bits(bsd, partition_count, bitmaps, mismatch_counts); // Sort the partitions based on the number of mismatched bits return get_partition_ordering_by_mismatch_bits( + texels_to_process, bsd.partitioning_count_selected[partition_count - 1], mismatch_counts, partition_ordering); } +/** + * @brief Insert a partitioning into an order list of results, sorted by error. + * + * @param max_values The max number of entries in the best result arrays. + * @param this_error The error of the new entry. + * @param this_partition The partition ID of the new entry. + * @param[out] best_errors The array of best error values. + * @param[out] best_partitions The array of best partition values. + */ +static void insert_result( + unsigned int max_values, + float this_error, + unsigned int this_partition, + float* best_errors, + unsigned int* best_partitions) +{ + promise(max_values > 0); + + // Don't bother searching if the current worst error beats the new error + if (this_error >= best_errors[max_values - 1]) + { + return; + } + + // Else insert into the list in error-order + for (unsigned int i = 0; i < max_values; i++) + { + // Existing result is better - move on ... + if (this_error > best_errors[i]) + { + continue; + } + + // Move existing results down one + for (unsigned int j = max_values - 1; j > i; j--) + { + best_errors[j] = best_errors[j - 1]; + best_partitions[j] = best_partitions[j - 1]; + } + + // Insert new result + best_errors[i] = this_error; + best_partitions[i] = this_partition; + break; + } +} + /* See header for documentation. */ -void find_best_partition_candidates( +unsigned int find_best_partition_candidates( const block_size_descriptor& bsd, const image_block& blk, unsigned int partition_count, unsigned int partition_search_limit, - unsigned int best_partitions[2] + unsigned int best_partitions[TUNE_MAX_PARTITIONING_CANDIDATES], + unsigned int requested_candidates ) { // Constant used to estimate quantization error for a given partitioning; the optimal value for // this depends on bitrate. These values have been determined empirically. @@ -517,20 +578,26 @@ void find_best_partition_candidates( weight_imprecision_estim = weight_imprecision_estim * weight_imprecision_estim; - unsigned int partition_sequence[BLOCK_MAX_PARTITIONINGS]; + uint16_t partition_sequence[BLOCK_MAX_PARTITIONINGS]; unsigned int sequence_len = compute_kmeans_partition_ordering(bsd, blk, partition_count, partition_sequence); partition_search_limit = astc::min(partition_search_limit, sequence_len); + requested_candidates = astc::min(partition_search_limit, requested_candidates); bool uses_alpha = !blk.is_constant_channel(3); // Partitioning errors assuming uncorrelated-chrominance endpoints - float uncor_best_error { ERROR_CALC_DEFAULT }; - unsigned int uncor_best_partition { 0 }; + float uncor_best_errors[TUNE_MAX_PARTITIONING_CANDIDATES]; + unsigned int uncor_best_partitions[TUNE_MAX_PARTITIONING_CANDIDATES]; // Partitioning errors assuming same-chrominance endpoints - // Store two so we can always return one different to uncorr - float samec_best_errors[2] { ERROR_CALC_DEFAULT, ERROR_CALC_DEFAULT }; - unsigned int samec_best_partitions[2] { 0, 0 }; + float samec_best_errors[TUNE_MAX_PARTITIONING_CANDIDATES]; + unsigned int samec_best_partitions[TUNE_MAX_PARTITIONING_CANDIDATES]; + + for (unsigned int i = 0; i < requested_candidates; i++) + { + uncor_best_errors[i] = ERROR_CALC_DEFAULT; + samec_best_errors[i] = ERROR_CALC_DEFAULT; + } if (uses_alpha) { @@ -550,8 +617,7 @@ void find_best_partition_candidates( processed_line4 uncor_plines[BLOCK_MAX_PARTITIONS]; processed_line4 samec_plines[BLOCK_MAX_PARTITIONS]; - float uncor_line_lens[BLOCK_MAX_PARTITIONS]; - float samec_line_lens[BLOCK_MAX_PARTITIONS]; + float line_lengths[BLOCK_MAX_PARTITIONS]; for (unsigned int j = 0; j < partition_count; j++) { @@ -561,13 +627,13 @@ void find_best_partition_candidates( uncor_lines[j].b = normalize_safe(pm.dir, unit4()); uncor_plines[j].amod = uncor_lines[j].a - uncor_lines[j].b * dot(uncor_lines[j].a, uncor_lines[j].b); - uncor_plines[j].bs = uncor_lines[j].b; + uncor_plines[j].bs = uncor_lines[j].b; samec_lines[j].a = vfloat4::zero(); samec_lines[j].b = normalize_safe(pm.avg, unit4()); samec_plines[j].amod = vfloat4::zero(); - samec_plines[j].bs = samec_lines[j].b; + samec_plines[j].bs = samec_lines[j].b; } float uncor_error = 0.0f; @@ -577,8 +643,7 @@ void find_best_partition_candidates( blk, uncor_plines, samec_plines, - uncor_line_lens, - samec_line_lens, + line_lengths, uncor_error, samec_error); @@ -597,32 +662,15 @@ void find_best_partition_candidates( float tpp = static_cast(pi.partition_texel_count[j]); vfloat4 error_weights(tpp * weight_imprecision_estim); - vfloat4 uncor_vector = uncor_lines[j].b * uncor_line_lens[j]; - vfloat4 samec_vector = samec_lines[j].b * samec_line_lens[j]; + vfloat4 uncor_vector = uncor_lines[j].b * line_lengths[j]; + vfloat4 samec_vector = samec_lines[j].b * line_lengths[j]; uncor_error += dot_s(uncor_vector * uncor_vector, error_weights); samec_error += dot_s(samec_vector * samec_vector, error_weights); } - if (uncor_error < uncor_best_error) - { - uncor_best_error = uncor_error; - uncor_best_partition = partition; - } - - if (samec_error < samec_best_errors[0]) - { - samec_best_errors[1] = samec_best_errors[0]; - samec_best_partitions[1] = samec_best_partitions[0]; - - samec_best_errors[0] = samec_error; - samec_best_partitions[0] = partition; - } - else if (samec_error < samec_best_errors[1]) - { - samec_best_errors[1] = samec_error; - samec_best_partitions[1] = partition; - } + insert_result(requested_candidates, uncor_error, partition, uncor_best_errors, uncor_best_partitions); + insert_result(requested_candidates, samec_error, partition, samec_best_errors, samec_best_partitions); } } else @@ -644,10 +692,10 @@ void find_best_partition_candidates( partition_lines3& pl = plines[j]; pl.uncor_line.a = pm.avg; - pl.uncor_line.b = normalize_safe(pm.dir.swz<0, 1, 2>(), unit3()); + pl.uncor_line.b = normalize_safe(pm.dir, unit3()); pl.samec_line.a = vfloat4::zero(); - pl.samec_line.b = normalize_safe(pm.avg.swz<0, 1, 2>(), unit3()); + pl.samec_line.b = normalize_safe(pm.avg, unit3()); pl.uncor_pline.amod = pl.uncor_line.a - pl.uncor_line.b * dot3(pl.uncor_line.a, pl.uncor_line.b); pl.uncor_pline.bs = pl.uncor_line.b; @@ -682,57 +730,52 @@ void find_best_partition_candidates( float tpp = static_cast(pi.partition_texel_count[j]); vfloat4 error_weights(tpp * weight_imprecision_estim); - vfloat4 uncor_vector = pl.uncor_line.b * pl.uncor_line_len; - vfloat4 samec_vector = pl.samec_line.b * pl.samec_line_len; + vfloat4 uncor_vector = pl.uncor_line.b * pl.line_length; + vfloat4 samec_vector = pl.samec_line.b * pl.line_length; uncor_error += dot3_s(uncor_vector * uncor_vector, error_weights); samec_error += dot3_s(samec_vector * samec_vector, error_weights); } - if (uncor_error < uncor_best_error) - { - uncor_best_error = uncor_error; - uncor_best_partition = partition; - } - - if (samec_error < samec_best_errors[0]) - { - samec_best_errors[1] = samec_best_errors[0]; - samec_best_partitions[1] = samec_best_partitions[0]; - - samec_best_errors[0] = samec_error; - samec_best_partitions[0] = partition; - } - else if (samec_error < samec_best_errors[1]) - { - samec_best_errors[1] = samec_error; - samec_best_partitions[1] = partition; - } + insert_result(requested_candidates, uncor_error, partition, uncor_best_errors, uncor_best_partitions); + insert_result(requested_candidates, samec_error, partition, samec_best_errors, samec_best_partitions); } } - // Same partition is best for both, so use this first unconditionally - if (uncor_best_partition == samec_best_partitions[0]) - { - best_partitions[0] = samec_best_partitions[0]; - best_partitions[1] = samec_best_partitions[1]; - } - // Uncor is best - else if (uncor_best_error <= samec_best_errors[0]) + unsigned int interleave[2 * TUNE_MAX_PARTITIONING_CANDIDATES]; + for (unsigned int i = 0; i < requested_candidates; i++) { - best_partitions[0] = uncor_best_partition; - best_partitions[1] = samec_best_partitions[0]; + interleave[2 * i] = bsd.get_raw_partition_info(partition_count, uncor_best_partitions[i]).partition_index; + interleave[2 * i + 1] = bsd.get_raw_partition_info(partition_count, samec_best_partitions[i]).partition_index; } - // Samec is best - else + + uint64_t bitmasks[1024/64] { 0 }; + unsigned int emitted = 0; + + // Deduplicate the first "requested" entries + for (unsigned int i = 0; i < requested_candidates * 2; i++) { - best_partitions[0] = samec_best_partitions[0]; - best_partitions[1] = uncor_best_partition; + unsigned int partition = interleave[i]; + + unsigned int word = partition / 64; + unsigned int bit = partition % 64; + + bool written = bitmasks[word] & (1ull << bit); + + if (!written) + { + best_partitions[emitted] = partition; + bitmasks[word] |= 1ull << bit; + emitted++; + + if (emitted == requested_candidates) + { + break; + } + } } - // Convert these back into canonical partition IDs for the rest of the codec - best_partitions[0] = bsd.get_raw_partition_info(partition_count, best_partitions[0]).partition_index; - best_partitions[1] = bsd.get_raw_partition_info(partition_count, best_partitions[1]).partition_index; + return emitted; } #endif diff --git a/Source/astcenc_ideal_endpoints_and_weights.cpp b/Source/astcenc_ideal_endpoints_and_weights.cpp index 9df4417626e2e2275ff8bf87485752fe21d1651e..051782fd0f719270925cc0cf4f7f07137549d5de 100644 --- a/Source/astcenc_ideal_endpoints_and_weights.cpp +++ b/Source/astcenc_ideal_endpoints_and_weights.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -26,6 +26,76 @@ #include "astcenc_internal.h" #include "astcenc_vecmathlib.h" +/** + * @brief Compute the infilled weight for N texel indices in a decimated grid. + * + * @param di The weight grid decimation to use. + * @param weights The decimated weight values to use. + * @param index The first texel index to interpolate. + * + * @return The interpolated weight for the given set of SIMD_WIDTH texels. + */ +static vfloat bilinear_infill_vla( + const decimation_info& di, + const float* weights, + unsigned int index +) { + // Load the bilinear filter texel weight indexes in the decimated grid + vint weight_idx0 = vint(di.texel_weights_tr[0] + index); + vint weight_idx1 = vint(di.texel_weights_tr[1] + index); + vint weight_idx2 = vint(di.texel_weights_tr[2] + index); + vint weight_idx3 = vint(di.texel_weights_tr[3] + index); + + // Load the bilinear filter weights from the decimated grid + vfloat weight_val0 = gatherf(weights, weight_idx0); + vfloat weight_val1 = gatherf(weights, weight_idx1); + vfloat weight_val2 = gatherf(weights, weight_idx2); + vfloat weight_val3 = gatherf(weights, weight_idx3); + + // Load the weight contribution factors for each decimated weight + vfloat tex_weight_float0 = loada(di.texel_weight_contribs_float_tr[0] + index); + vfloat tex_weight_float1 = loada(di.texel_weight_contribs_float_tr[1] + index); + vfloat tex_weight_float2 = loada(di.texel_weight_contribs_float_tr[2] + index); + vfloat tex_weight_float3 = loada(di.texel_weight_contribs_float_tr[3] + index); + + // Compute the bilinear interpolation to generate the per-texel weight + return (weight_val0 * tex_weight_float0 + weight_val1 * tex_weight_float1) + + (weight_val2 * tex_weight_float2 + weight_val3 * tex_weight_float3); +} + +/** + * @brief Compute the infilled weight for N texel indices in a decimated grid. + * + * This is specialized version which computes only two weights per texel for + * encodings that are only decimated in a single axis. + * + * @param di The weight grid decimation to use. + * @param weights The decimated weight values to use. + * @param index The first texel index to interpolate. + * + * @return The interpolated weight for the given set of SIMD_WIDTH texels. + */ +static vfloat bilinear_infill_vla_2( + const decimation_info& di, + const float* weights, + unsigned int index +) { + // Load the bilinear filter texel weight indexes in the decimated grid + vint weight_idx0 = vint(di.texel_weights_tr[0] + index); + vint weight_idx1 = vint(di.texel_weights_tr[1] + index); + + // Load the bilinear filter weights from the decimated grid + vfloat weight_val0 = gatherf(weights, weight_idx0); + vfloat weight_val1 = gatherf(weights, weight_idx1); + + // Load the weight contribution factors for each decimated weight + vfloat tex_weight_float0 = loada(di.texel_weight_contribs_float_tr[0] + index); + vfloat tex_weight_float1 = loada(di.texel_weight_contribs_float_tr[1] + index); + + // Compute the bilinear interpolation to generate the per-texel weight + return (weight_val0 * tex_weight_float0 + weight_val1 * tex_weight_float1); +} + /** * @brief Compute the ideal endpoints and weights for 1 color component. * @@ -90,7 +160,7 @@ static void compute_ideal_colors_and_weights_1_comp( highvalue = astc::max(value, highvalue); } - if (highvalue < lowvalue) + if (highvalue <= lowvalue) { lowvalue = 0.0f; highvalue = 1e-7f; @@ -198,13 +268,13 @@ static void compute_ideal_colors_and_weights_2_comp( for (unsigned int i = 0; i < partition_count; i++) { - vfloat4 dir = pms[i].dir.swz<0, 1>(); + vfloat4 dir = pms[i].dir; if (hadd_s(dir) < 0.0f) { dir = vfloat4::zero() - dir; } - line2 line { pms[i].avg.swz<0, 1>(), normalize_safe(dir, unit2()) }; + line2 line { pms[i].avg, normalize_safe(dir, unit2()) }; float lowparam { 1e10f }; float highparam { -1e10f }; @@ -222,7 +292,7 @@ static void compute_ideal_colors_and_weights_2_comp( // It is possible for a uniform-color partition to produce length=0; // this causes NaN issues so set to small value to avoid this problem - if (highparam < lowparam) + if (highparam <= lowparam) { lowparam = 0.0f; highparam = 1e-7f; @@ -371,7 +441,7 @@ static void compute_ideal_colors_and_weights_3_comp( // It is possible for a uniform-color partition to produce length=0; // this causes NaN issues so set to small value to avoid this problem - if (highparam < lowparam) + if (highparam <= lowparam) { lowparam = 0.0f; highparam = 1e-7f; @@ -493,7 +563,7 @@ static void compute_ideal_colors_and_weights_4_comp( // It is possible for a uniform-color partition to produce length=0; // this causes NaN issues so set to small value to avoid this problem - if (highparam < lowparam) + if (highparam <= lowparam) { lowparam = 0.0f; highparam = 1e-7f; @@ -621,8 +691,8 @@ float compute_error_of_weight_set_1plane( const float* dec_weight_quant_uvalue ) { vfloatacc error_summav = vfloatacc::zero(); - float error_summa = 0.0f; unsigned int texel_count = di.texel_count; + promise(texel_count > 0); // Process SIMD-width chunks, safe to over-fetch - the extra space is zero initialized if (di.max_texel_weight_count > 2) @@ -675,7 +745,7 @@ float compute_error_of_weight_set_1plane( } // Resolve the final scalar accumulator sum - return error_summa = hadd_s(error_summav); + return hadd_s(error_summav); } /* See header for documentation. */ @@ -688,6 +758,7 @@ float compute_error_of_weight_set_2planes( ) { vfloatacc error_summav = vfloatacc::zero(); unsigned int texel_count = di.texel_count; + promise(texel_count > 0); // Process SIMD-width chunks, safe to over-fetch - the extra space is zero initialized if (di.max_texel_weight_count > 2) @@ -772,8 +843,7 @@ float compute_error_of_weight_set_2planes( /* See header for documentation. */ void compute_ideal_weights_for_decimation( - const endpoints_and_weights& eai_in, - endpoints_and_weights& eai_out, + const endpoints_and_weights& ei, const decimation_info& di, float* dec_weight_ideal_value ) { @@ -783,49 +853,31 @@ void compute_ideal_weights_for_decimation( promise(texel_count > 0); promise(weight_count > 0); - // This function includes a copy of the epw from eai_in to eai_out. We do it here because we - // want to load the data anyway, so we can avoid loading it from memory twice. - eai_out.ep = eai_in.ep; - eai_out.is_constant_weight_error_scale = eai_in.is_constant_weight_error_scale; - // Ensure that the end of the output arrays that are used for SIMD paths later are filled so we // can safely run SIMD elsewhere without a loop tail. Note that this is always safe as weight // arrays always contain space for 64 elements unsigned int prev_weight_count_simd = round_down_to_simd_multiple_vla(weight_count - 1); storea(vfloat::zero(), dec_weight_ideal_value + prev_weight_count_simd); - // If we have a 1:1 mapping just shortcut the computation - clone the weights into both the - // weight set and the output epw copy. - - // Transfer enough to also copy zero initialized SIMD over-fetch region - unsigned int texel_count_simd = round_up_to_simd_multiple_vla(texel_count); - for (unsigned int i = 0; i < texel_count_simd; i += ASTCENC_SIMD_WIDTH) + // If we have a 1:1 mapping just shortcut the computation. Transfer enough to also copy the + // zero-initialized SIMD over-fetch region + if (is_direct) { - vfloat weight(eai_in.weights + i); - vfloat weight_error_scale(eai_in.weight_error_scale + i); - - storea(weight, eai_out.weights + i); - storea(weight_error_scale, eai_out.weight_error_scale + i); - - // Direct 1:1 weight mapping, so clone weights directly - // TODO: Can we just avoid the copy for direct cases? - if (is_direct) + for (unsigned int i = 0; i < texel_count; i += ASTCENC_SIMD_WIDTH) { + vfloat weight(ei.weights + i); storea(weight, dec_weight_ideal_value + i); } - } - if (is_direct) - { return; } // Otherwise compute an estimate and perform single refinement iteration - alignas(ASTCENC_VECALIGN) float infilled_weights[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float infilled_weights[BLOCK_MAX_TEXELS]; // Compute an initial average for each decimated weight - bool constant_wes = eai_in.is_constant_weight_error_scale; - vfloat weight_error_scale(eai_in.weight_error_scale[0]); + bool constant_wes = ei.is_constant_weight_error_scale; + vfloat weight_error_scale(ei.weight_error_scale[0]); // This overshoots - this is OK as we initialize the array tails in the // decimation table structures to safe values ... @@ -842,24 +894,24 @@ void compute_ideal_weights_for_decimation( for (unsigned int j = 0; j < max_texel_count; j++) { - vint texel(di.weight_texel[j] + i); - vfloat weight = loada(di.weights_flt[j] + i); + vint texel(di.weight_texels_tr[j] + i); + vfloat weight = loada(di.weights_texel_contribs_tr[j] + i); if (!constant_wes) { - weight_error_scale = gatherf(eai_in.weight_error_scale, texel); + weight_error_scale = gatherf(ei.weight_error_scale, texel); } vfloat contrib_weight = weight * weight_error_scale; weight_weight += contrib_weight; - initial_weight += gatherf(eai_in.weights, texel) * contrib_weight; + initial_weight += gatherf(ei.weights, texel) * contrib_weight; } storea(initial_weight / weight_weight, dec_weight_ideal_value + i); } - // Populate the interpolated weight grid based on the initital average + // Populate the interpolated weight grid based on the initial average // Process SIMD-width texel coordinates at at time while we can. Safe to // over-process full SIMD vectors - the tail is zeroed. if (di.max_texel_weight_count <= 2) @@ -900,17 +952,17 @@ void compute_ideal_weights_for_decimation( for (unsigned int j = 0; j < max_texel_count; j++) { - vint texel(di.weight_texel[j] + i); - vfloat contrib_weight = loada(di.weights_flt[j] + i); + vint texel(di.weight_texels_tr[j] + i); + vfloat contrib_weight = loada(di.weights_texel_contribs_tr[j] + i); if (!constant_wes) { - weight_error_scale = gatherf(eai_in.weight_error_scale, texel); + weight_error_scale = gatherf(ei.weight_error_scale, texel); } vfloat scale = weight_error_scale * contrib_weight; vfloat old_weight = gatherf(infilled_weights, texel); - vfloat ideal_weight = gatherf(eai_in.weights, texel); + vfloat ideal_weight = gatherf(ei.weights, texel); error_change0 += contrib_weight * scale; error_change1 += (old_weight - ideal_weight) * scale; @@ -919,7 +971,7 @@ void compute_ideal_weights_for_decimation( vfloat step = (error_change1 * chd_scale) / error_change0; step = clamp(-stepsize, stepsize, step); - // Update the weight; note this can store negative values. + // Update the weight; note this can store negative values storea(weight_val + step, dec_weight_ideal_value + i); } } @@ -936,19 +988,20 @@ void compute_quantized_weights_for_decimation( ) { int weight_count = di.weight_count; promise(weight_count > 0); - const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[quant_level]); + const quant_and_transfer_table& qat = quant_and_xfer_tables[quant_level]; // The available quant levels, stored with a minus 1 bias static const float quant_levels_m1[12] { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 7.0f, 9.0f, 11.0f, 15.0f, 19.0f, 23.0f, 31.0f }; + vint steps_m1(get_quant_level(quant_level) - 1); float quant_level_m1 = quant_levels_m1[quant_level]; // Quantize the weight set using both the specified low/high bounds and standard 0..1 bounds // TODO: Oddity to investigate; triggered by test in issue #265. - if (high_bound < low_bound) + if (high_bound <= low_bound) { low_bound = 0.0f; high_bound = 1.0f; @@ -968,29 +1021,72 @@ void compute_quantized_weights_for_decimation( // This runs to the rounded-up SIMD size, which is safe as the loop tail is filled with known // safe data in compute_ideal_weights_for_decimation and arrays are always 64 elements - for (int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) + if (get_quant_level(quant_level) <= 16) { - vfloat ix = loada(&dec_weight_ideal_value[i]) * scalev - scaled_low_boundv; - ix = clampzo(ix); + vint4 tab0 = vint4::load(qat.quant_to_unquant); + vint tab0p; + vtable_prepare(tab0, tab0p); + + for (int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) + { + vfloat ix = loada(dec_weight_ideal_value + i) * scalev - scaled_low_boundv; + ix = clampzo(ix); - // Look up the two closest indexes and return the one that was closest - vfloat ix1 = ix * quant_level_m1v; + // Look up the two closest indexes and return the one that was closest + vfloat ix1 = ix * quant_level_m1v; - vint weightl = float_to_int(ix1); - vint weighth = weightl + vint(1); + vint weightl = float_to_int(ix1); + vint weighth = min(weightl + vint(1), steps_m1); - vfloat ixl = gatherf(qat->unquantized_value_unsc, weightl); - vfloat ixh = gatherf(qat->unquantized_value_unsc, weighth); + vint ixli = vtable_8bt_32bi(tab0p, weightl); + vint ixhi = vtable_8bt_32bi(tab0p, weighth); - vmask mask = (ixl + ixh) < (vfloat(128.0f) * ix); - vint weight = select(weightl, weighth, mask); - ixl = select(ixl, ixh, mask); + vfloat ixl = int_to_float(ixli); + vfloat ixh = int_to_float(ixhi); - // Invert the weight-scaling that was done initially - storea(ixl * rscalev + low_boundv, &weight_set_out[i]); - vint scm = gatheri(qat->scramble_map, weight); - vint scn = pack_low_bytes(scm); - store_nbytes(scn, &quantized_weight_set[i]); + vmask mask = (ixl + ixh) < (vfloat(128.0f) * ix); + vint weight = select(ixli, ixhi, mask); + ixl = select(ixl, ixh, mask); + + // Invert the weight-scaling that was done initially + storea(ixl * rscalev + low_boundv, weight_set_out + i); + vint scn = pack_low_bytes(weight); + store_nbytes(scn, quantized_weight_set + i); + } + } + else + { + vint4 tab0 = vint4::load(qat.quant_to_unquant + 0); + vint4 tab1 = vint4::load(qat.quant_to_unquant + 16); + vint tab0p, tab1p; + vtable_prepare(tab0, tab1, tab0p, tab1p); + + for (int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) + { + vfloat ix = loada(dec_weight_ideal_value + i) * scalev - scaled_low_boundv; + ix = clampzo(ix); + + // Look up the two closest indexes and return the one that was closest + vfloat ix1 = ix * quant_level_m1v; + + vint weightl = float_to_int(ix1); + vint weighth = min(weightl + vint(1), steps_m1); + + vint ixli = vtable_8bt_32bi(tab0p, tab1p, weightl); + vint ixhi = vtable_8bt_32bi(tab0p, tab1p, weighth); + + vfloat ixl = int_to_float(ixli); + vfloat ixh = int_to_float(ixhi); + + vmask mask = (ixl + ixh) < (vfloat(128.0f) * ix); + vint weight = select(ixli, ixhi, mask); + ixl = select(ixl, ixh, mask); + + // Invert the weight-scaling that was done initially + storea(ixl * rscalev + low_boundv, weight_set_out + i); + vint scn = pack_low_bytes(weight); + store_nbytes(scn, quantized_weight_set + i); + } } } @@ -1062,8 +1158,7 @@ void recompute_ideal_colors_1plane( const image_block& blk, const partition_info& pi, const decimation_info& di, - int weight_quant_mode, - const uint8_t* dec_weights_quant_pvalue, + const uint8_t* dec_weights_uquant, endpoints& ep, vfloat4 rgbs_vectors[BLOCK_MAX_PARTITIONS], vfloat4 rgbo_vectors[BLOCK_MAX_PARTITIONS] @@ -1076,15 +1171,15 @@ void recompute_ideal_colors_1plane( promise(total_texel_count > 0); promise(partition_count > 0); - const quantization_and_transfer_table& qat = quant_and_xfer_tables[weight_quant_mode]; - - float dec_weight[BLOCK_MAX_WEIGHTS]; - for (unsigned int i = 0; i < weight_count; i++) + ASTCENC_ALIGNAS float dec_weight[BLOCK_MAX_WEIGHTS]; + for (unsigned int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) { - dec_weight[i] = qat.unquantized_value[dec_weights_quant_pvalue[i]] * (1.0f / 64.0f); + vint unquant_value(dec_weights_uquant + i); + vfloat unquant_valuef = int_to_float(unquant_value) * vfloat(1.0f / 64.0f); + storea(unquant_valuef, dec_weight + i); } - alignas(ASTCENC_VECALIGN) float undec_weight[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float undec_weight[BLOCK_MAX_TEXELS]; float* undec_weight_ref; if (di.max_texel_weight_count == 1) { @@ -1121,7 +1216,7 @@ void recompute_ideal_colors_1plane( // Only compute a partition mean if more than one partition if (partition_count > 1) { - rgba_sum = vfloat4(1e-17f); + rgba_sum = vfloat4::zero(); promise(texel_count > 0); for (unsigned int j = 0; j < texel_count; j++) { @@ -1157,7 +1252,6 @@ void recompute_ideal_colors_1plane( for (unsigned int j = 0; j < texel_count; j++) { unsigned int tix = texel_indexes[j]; - vfloat4 rgba = blk.texel(tix); float idx0 = undec_weight_ref[tix]; @@ -1190,14 +1284,11 @@ void recompute_ideal_colors_1plane( vfloat4 right_sum = vfloat4(right_sum_s) * color_weight; vfloat4 lmrs_sum = vfloat3(left_sum_s, middle_sum_s, right_sum_s) * ls_weight; - vfloat4 weight_weight_sum = vfloat4(weight_weight_sum_s) * color_weight; - float psum = right_sum_s * hadd_rgb_s(color_weight); - color_vec_x = color_vec_x * color_weight; color_vec_y = color_vec_y * color_weight; // Initialize the luminance and scale vectors with a reasonable default - float scalediv = scale_min * (1.0f / astc::max(scale_max, 1e-10f)); + float scalediv = scale_min / astc::max(scale_max, 1e-10f); scalediv = astc::clamp1f(scalediv); vfloat4 sds = scale_dir * scale_max; @@ -1249,32 +1340,38 @@ void recompute_ideal_colors_1plane( if (fabsf(ls_det1) > (ls_mss1 * 1e-4f) && scale_ep0 == scale_ep0 && scale_ep1 == scale_ep1 && scale_ep0 < scale_ep1) { - float scalediv2 = scale_ep0 * (1.0f / scale_ep1); + float scalediv2 = scale_ep0 / scale_ep1; vfloat4 sdsm = scale_dir * scale_ep1; rgbs_vectors[i] = vfloat4(sdsm.lane<0>(), sdsm.lane<1>(), sdsm.lane<2>(), scalediv2); } } - // Calculations specific to mode #7, the HDR RGB-scale mode - vfloat4 rgbq_sum = color_vec_x + color_vec_y; - rgbq_sum.set_lane<3>(hadd_rgb_s(color_vec_y)); + // Calculations specific to mode #7, the HDR RGB-scale mode - skip if known LDR + if (blk.rgb_lns[0] || blk.alpha_lns[0]) + { + vfloat4 weight_weight_sum = vfloat4(weight_weight_sum_s) * color_weight; + float psum = right_sum_s * hadd_rgb_s(color_weight); - vfloat4 rgbovec = compute_rgbo_vector(rgba_weight_sum, weight_weight_sum, rgbq_sum, psum); - rgbo_vectors[i] = rgbovec; + vfloat4 rgbq_sum = color_vec_x + color_vec_y; + rgbq_sum.set_lane<3>(hadd_rgb_s(color_vec_y)); - // We can get a failure due to the use of a singular (non-invertible) matrix - // If it failed, compute rgbo_vectors[] with a different method ... - if (astc::isnan(dot_s(rgbovec, rgbovec))) - { - vfloat4 v0 = ep.endpt0[i]; - vfloat4 v1 = ep.endpt1[i]; + vfloat4 rgbovec = compute_rgbo_vector(rgba_weight_sum, weight_weight_sum, rgbq_sum, psum); + rgbo_vectors[i] = rgbovec; - float avgdif = hadd_rgb_s(v1 - v0) * (1.0f / 3.0f); - avgdif = astc::max(avgdif, 0.0f); + // We can get a failure due to the use of a singular (non-invertible) matrix + // If it failed, compute rgbo_vectors[] with a different method ... + if (astc::isnan(dot_s(rgbovec, rgbovec))) + { + vfloat4 v0 = ep.endpt0[i]; + vfloat4 v1 = ep.endpt1[i]; - vfloat4 avg = (v0 + v1) * 0.5f; - vfloat4 ep0 = avg - vfloat4(avgdif) * 0.5f; - rgbo_vectors[i] = vfloat4(ep0.lane<0>(), ep0.lane<1>(), ep0.lane<2>(), avgdif); + float avgdif = hadd_rgb_s(v1 - v0) * (1.0f / 3.0f); + avgdif = astc::max(avgdif, 0.0f); + + vfloat4 avg = (v0 + v1) * 0.5f; + vfloat4 ep0 = avg - vfloat4(avgdif) * 0.5f; + rgbo_vectors[i] = vfloat4(ep0.lane<0>(), ep0.lane<1>(), ep0.lane<2>(), avgdif); + } } } } @@ -1284,9 +1381,8 @@ void recompute_ideal_colors_2planes( const image_block& blk, const block_size_descriptor& bsd, const decimation_info& di, - int weight_quant_mode, - const uint8_t* dec_weights_quant_pvalue_plane1, - const uint8_t* dec_weights_quant_pvalue_plane2, + const uint8_t* dec_weights_uquant_plane1, + const uint8_t* dec_weights_uquant_plane2, endpoints& ep, vfloat4& rgbs_vector, vfloat4& rgbo_vector, @@ -1298,20 +1394,24 @@ void recompute_ideal_colors_2planes( promise(total_texel_count > 0); promise(weight_count > 0); - const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[weight_quant_mode]); - - float dec_weight_plane1[BLOCK_MAX_WEIGHTS_2PLANE]; - float dec_weight_plane2[BLOCK_MAX_WEIGHTS_2PLANE]; + ASTCENC_ALIGNAS float dec_weight_plane1[BLOCK_MAX_WEIGHTS_2PLANE]; + ASTCENC_ALIGNAS float dec_weight_plane2[BLOCK_MAX_WEIGHTS_2PLANE]; assert(weight_count <= BLOCK_MAX_WEIGHTS_2PLANE); - for (unsigned int i = 0; i < weight_count; i++) + + for (unsigned int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) { - dec_weight_plane1[i] = qat->unquantized_value[dec_weights_quant_pvalue_plane1[i]] * (1.0f / 64.0f); - dec_weight_plane2[i] = qat->unquantized_value[dec_weights_quant_pvalue_plane2[i]] * (1.0f / 64.0f); + vint unquant_value1(dec_weights_uquant_plane1 + i); + vfloat unquant_value1f = int_to_float(unquant_value1) * vfloat(1.0f / 64.0f); + storea(unquant_value1f, dec_weight_plane1 + i); + + vint unquant_value2(dec_weights_uquant_plane2 + i); + vfloat unquant_value2f = int_to_float(unquant_value2) * vfloat(1.0f / 64.0f); + storea(unquant_value2f, dec_weight_plane2 + i); } - alignas(ASTCENC_VECALIGN) float undec_weight_plane1[BLOCK_MAX_TEXELS]; - alignas(ASTCENC_VECALIGN) float undec_weight_plane2[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float undec_weight_plane1[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float undec_weight_plane2[BLOCK_MAX_TEXELS]; float* undec_weight_plane1_ref; float* undec_weight_plane2_ref; @@ -1419,7 +1519,7 @@ void recompute_ideal_colors_2planes( color_vec_x += cwprod - cwiprod; scale_vec += vfloat2(om_idx0, idx0) * (ls_weight * scale); - weight_weight_sum += (color_weight * color_idx); + weight_weight_sum += color_idx; } vfloat4 left1_sum = vfloat4(left1_sum_s) * color_weight; @@ -1431,13 +1531,11 @@ void recompute_ideal_colors_2planes( vfloat4 middle2_sum = vfloat4(middle2_sum_s) * color_weight; vfloat4 right2_sum = vfloat4(right2_sum_s) * color_weight; - float psum = dot3_s(select(right1_sum, right2_sum, p2_mask), color_weight); - color_vec_x = color_vec_x * color_weight; color_vec_y = color_vec_y * color_weight; // Initialize the luminance and scale vectors with a reasonable default - float scalediv = scale_min * (1.0f / astc::max(scale_max, 1e-10f)); + float scalediv = scale_min / astc::max(scale_max, 1e-10f); scalediv = astc::clamp1f(scalediv); vfloat4 sds = scale_dir * scale_max; @@ -1493,7 +1591,7 @@ void recompute_ideal_colors_2planes( if (fabsf(ls_det1) > (ls_mss1 * 1e-4f) && scale_ep0 == scale_ep0 && scale_ep1 == scale_ep1 && scale_ep0 < scale_ep1) { - float scalediv2 = scale_ep0 * (1.0f / scale_ep1); + float scalediv2 = scale_ep0 / scale_ep1; vfloat4 sdsm = scale_dir * scale_ep1; rgbs_vector = vfloat4(sdsm.lane<0>(), sdsm.lane<1>(), sdsm.lane<2>(), scalediv2); } @@ -1533,26 +1631,32 @@ void recompute_ideal_colors_2planes( ep.endpt1[0] = select(ep.endpt1[0], ep1, full_mask); } - // Calculations specific to mode #7, the HDR RGB-scale mode - vfloat4 rgbq_sum = color_vec_x + color_vec_y; - rgbq_sum.set_lane<3>(hadd_rgb_s(color_vec_y)); + // Calculations specific to mode #7, the HDR RGB-scale mode - skip if known LDR + if (blk.rgb_lns[0] || blk.alpha_lns[0]) + { + weight_weight_sum = weight_weight_sum * color_weight; + float psum = dot3_s(select(right1_sum, right2_sum, p2_mask), color_weight); - rgbo_vector = compute_rgbo_vector(rgba_weight_sum, weight_weight_sum, rgbq_sum, psum); + vfloat4 rgbq_sum = color_vec_x + color_vec_y; + rgbq_sum.set_lane<3>(hadd_rgb_s(color_vec_y)); - // We can get a failure due to the use of a singular (non-invertible) matrix - // If it failed, compute rgbo_vectors[] with a different method ... - if (astc::isnan(dot_s(rgbo_vector, rgbo_vector))) - { - vfloat4 v0 = ep.endpt0[0]; - vfloat4 v1 = ep.endpt1[0]; + rgbo_vector = compute_rgbo_vector(rgba_weight_sum, weight_weight_sum, rgbq_sum, psum); + + // We can get a failure due to the use of a singular (non-invertible) matrix + // If it failed, compute rgbo_vectors[] with a different method ... + if (astc::isnan(dot_s(rgbo_vector, rgbo_vector))) + { + vfloat4 v0 = ep.endpt0[0]; + vfloat4 v1 = ep.endpt1[0]; - float avgdif = hadd_rgb_s(v1 - v0) * (1.0f / 3.0f); - avgdif = astc::max(avgdif, 0.0f); + float avgdif = hadd_rgb_s(v1 - v0) * (1.0f / 3.0f); + avgdif = astc::max(avgdif, 0.0f); - vfloat4 avg = (v0 + v1) * 0.5f; - vfloat4 ep0 = avg - vfloat4(avgdif) * 0.5f; + vfloat4 avg = (v0 + v1) * 0.5f; + vfloat4 ep0 = avg - vfloat4(avgdif) * 0.5f; - rgbo_vector = vfloat4(ep0.lane<0>(), ep0.lane<1>(), ep0.lane<2>(), avgdif); + rgbo_vector = vfloat4(ep0.lane<0>(), ep0.lane<1>(), ep0.lane<2>(), avgdif); + } } } diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp index 1c9f394f6550beec87c93a55b39264c4c09e01a7..8622a928ef50e124903bd5bbbc1b1567bf37dccf 100644 --- a/Source/astcenc_image.cpp +++ b/Source/astcenc_image.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -109,7 +109,7 @@ static vfloat4 swz_texel( vfloat4 data, const astcenc_swizzle& swz ) { - alignas(16) float datas[6]; + ASTCENC_ALIGNAS float datas[6]; storea(data, datas); datas[ASTCENC_SWZ_0] = 0.0f; @@ -143,12 +143,12 @@ static vfloat4 encode_texel_lns( vmask4 lns_mask ) { vfloat4 datav_unorm = data * 65535.0f; - vfloat4 datav_lns = float_to_lns(data); + vfloat4 datav_lns = float_to_lns(data); return select(datav_unorm, datav_lns, lns_mask); } /* See header for documentation. */ -void fetch_image_block( +void load_image_block( astcenc_profile decode_mode, const astcenc_image& img, image_block& blk, @@ -265,7 +265,7 @@ void fetch_image_block( } /* See header for documentation. */ -void fetch_image_block_fast_ldr( +void load_image_block_fast_ldr( astcenc_profile decode_mode, const astcenc_image& img, image_block& blk, @@ -332,7 +332,7 @@ void fetch_image_block_fast_ldr( } /* See header for documentation. */ -void write_image_block( +void store_image_block( astcenc_image& img, const image_block& blk, const block_size_descriptor& bsd, @@ -341,24 +341,21 @@ void write_image_block( unsigned int zpos, const astcenc_swizzle& swz ) { - unsigned int xsize = img.dim_x; - unsigned int ysize = img.dim_y; - unsigned int zsize = img.dim_z; - + unsigned int x_size = img.dim_x; unsigned int x_start = xpos; - unsigned int x_end = std::min(xsize, xpos + bsd.xdim); - unsigned int x_nudge = bsd.xdim - (x_end - x_start); + unsigned int x_end = astc::min(x_size, xpos + bsd.xdim); + unsigned int x_count = x_end - x_start; + unsigned int x_nudge = bsd.xdim - x_count; + unsigned int y_size = img.dim_y; unsigned int y_start = ypos; - unsigned int y_end = std::min(ysize, ypos + bsd.ydim); - unsigned int y_nudge = (bsd.ydim - (y_end - y_start)) * bsd.xdim; + unsigned int y_end = astc::min(y_size, ypos + bsd.ydim); + unsigned int y_count = y_end - y_start; + unsigned int y_nudge = (bsd.ydim - y_count) * bsd.xdim; + unsigned int z_size = img.dim_z; unsigned int z_start = zpos; - unsigned int z_end = std::min(zsize, zpos + bsd.zdim); - - float data[7]; - data[ASTCENC_SWZ_0] = 0.0f; - data[ASTCENC_SWZ_1] = 1.0f; + unsigned int z_end = astc::min(z_size, zpos + bsd.zdim); // True if any non-identity swizzle bool needs_swz = (swz.r != ASTCENC_SWZ_R) || (swz.g != ASTCENC_SWZ_G) || @@ -378,47 +375,68 @@ void write_image_block( for (unsigned int y = y_start; y < y_end; y++) { - for (unsigned int x = x_start; x < x_end; x++) + uint8_t* data8_row = data8 + (4 * x_size * y) + (4 * x_start); + + for (unsigned int x = 0; x < x_count; x += ASTCENC_SIMD_WIDTH) { - vint4 colori = vint4::zero(); + unsigned int max_texels = ASTCENC_SIMD_WIDTH; + unsigned int used_texels = astc::min(x_count - x, max_texels); - // Errors are NaN encoded - convert to magenta error color - if (blk.data_r[idx] != blk.data_r[idx]) - { - colori = vint4(0xFF, 0x00, 0xFF, 0xFF); - } - else if (needs_swz) + // Unaligned load as rows are not always SIMD_WIDTH long + vfloat data_r(blk.data_r + idx); + vfloat data_g(blk.data_g + idx); + vfloat data_b(blk.data_b + idx); + vfloat data_a(blk.data_a + idx); + + vint data_ri = float_to_int_rtn(min(data_r, 1.0f) * 255.0f); + vint data_gi = float_to_int_rtn(min(data_g, 1.0f) * 255.0f); + vint data_bi = float_to_int_rtn(min(data_b, 1.0f) * 255.0f); + vint data_ai = float_to_int_rtn(min(data_a, 1.0f) * 255.0f); + + if (needs_swz) { - data[ASTCENC_SWZ_R] = blk.data_r[idx]; - data[ASTCENC_SWZ_G] = blk.data_g[idx]; - data[ASTCENC_SWZ_B] = blk.data_b[idx]; - data[ASTCENC_SWZ_A] = blk.data_a[idx]; + vint swizzle_table[7]; + swizzle_table[ASTCENC_SWZ_0] = vint(0); + swizzle_table[ASTCENC_SWZ_1] = vint(255); + swizzle_table[ASTCENC_SWZ_R] = data_ri; + swizzle_table[ASTCENC_SWZ_G] = data_gi; + swizzle_table[ASTCENC_SWZ_B] = data_bi; + swizzle_table[ASTCENC_SWZ_A] = data_ai; if (needs_z) { - float xcoord = (data[0] * 2.0f) - 1.0f; - float ycoord = (data[3] * 2.0f) - 1.0f; - float zcoord = 1.0f - xcoord * xcoord - ycoord * ycoord; - if (zcoord < 0.0f) - { - zcoord = 0.0f; - } - data[ASTCENC_SWZ_Z] = (astc::sqrt(zcoord) * 0.5f) + 0.5f; + vfloat data_x = (data_r * vfloat(2.0f)) - vfloat(1.0f); + vfloat data_y = (data_a * vfloat(2.0f)) - vfloat(1.0f); + vfloat data_z = vfloat(1.0f) - (data_x * data_x) - (data_y * data_y); + data_z = max(data_z, 0.0f); + data_z = (sqrt(data_z) * vfloat(0.5f)) + vfloat(0.5f); + + swizzle_table[ASTCENC_SWZ_Z] = float_to_int_rtn(min(data_z, 1.0f) * 255.0f); } - vfloat4 color = vfloat4(data[swz.r], data[swz.g], data[swz.b], data[swz.a]); - colori = float_to_int_rtn(min(color, 1.0f) * 255.0f); + data_ri = swizzle_table[swz.r]; + data_gi = swizzle_table[swz.g]; + data_bi = swizzle_table[swz.b]; + data_ai = swizzle_table[swz.a]; } - else + + // Errors are NaN encoded - convert to magenta error color + // Branch is OK here - it is almost never true so predicts well + vmask nan_mask = data_r != data_r; + if (any(nan_mask)) { - vfloat4 color = blk.texel(idx); - colori = float_to_int_rtn(min(color, 1.0f) * 255.0f); + data_ri = select(data_ri, vint(0xFF), nan_mask); + data_gi = select(data_gi, vint(0x00), nan_mask); + data_bi = select(data_bi, vint(0xFF), nan_mask); + data_ai = select(data_ai, vint(0xFF), nan_mask); } - colori = pack_low_bytes(colori); - store_nbytes(colori, data8 + (4 * xsize * y) + (4 * x )); + vint data_rgbai = interleave_rgba8(data_ri, data_gi, data_bi, data_ai); + vmask store_mask = vint::lane_id() < vint(used_texels); + store_lanes_masked(data8_row, data_rgbai, store_mask); - idx++; + data8_row += ASTCENC_SIMD_WIDTH * 4; + idx += used_texels; } idx += x_nudge; } @@ -434,13 +452,18 @@ void write_image_block( for (unsigned int y = y_start; y < y_end; y++) { - for (unsigned int x = x_start; x < x_end; x++) + uint16_t* data16_row = data16 + (4 * x_size * y) + (4 * x_start); + + for (unsigned int x = 0; x < x_count; x++) { vint4 color; // NaNs are handled inline - no need to special case if (needs_swz) { + float data[7]; + data[ASTCENC_SWZ_0] = 0.0f; + data[ASTCENC_SWZ_1] = 1.0f; data[ASTCENC_SWZ_R] = blk.data_r[idx]; data[ASTCENC_SWZ_G] = blk.data_g[idx]; data[ASTCENC_SWZ_B] = blk.data_b[idx]; @@ -467,11 +490,12 @@ void write_image_block( color = float_to_float16(colorf); } - data16[(4 * xsize * y) + (4 * x )] = static_cast(color.lane<0>()); - data16[(4 * xsize * y) + (4 * x + 1)] = static_cast(color.lane<1>()); - data16[(4 * xsize * y) + (4 * x + 2)] = static_cast(color.lane<2>()); - data16[(4 * xsize * y) + (4 * x + 3)] = static_cast(color.lane<3>()); - + // TODO: Vectorize with store N shorts? + data16_row[0] = static_cast(color.lane<0>()); + data16_row[1] = static_cast(color.lane<1>()); + data16_row[2] = static_cast(color.lane<2>()); + data16_row[3] = static_cast(color.lane<3>()); + data16_row += 4; idx++; } idx += x_nudge; @@ -490,13 +514,18 @@ void write_image_block( for (unsigned int y = y_start; y < y_end; y++) { - for (unsigned int x = x_start; x < x_end; x++) + float* data32_row = data32 + (4 * x_size * y) + (4 * x_start); + + for (unsigned int x = 0; x < x_count; x++) { vfloat4 color = blk.texel(idx); // NaNs are handled inline - no need to special case if (needs_swz) { + float data[7]; + data[ASTCENC_SWZ_0] = 0.0f; + data[ASTCENC_SWZ_1] = 1.0f; data[ASTCENC_SWZ_R] = color.lane<0>(); data[ASTCENC_SWZ_G] = color.lane<1>(); data[ASTCENC_SWZ_B] = color.lane<2>(); @@ -517,8 +546,8 @@ void write_image_block( color = vfloat4(data[swz.r], data[swz.g], data[swz.b], data[swz.a]); } - store(color, data32 + (4 * xsize * y) + (4 * x )); - + store(color, data32_row); + data32_row += 4; idx++; } idx += x_nudge; diff --git a/Source/astcenc_integer_sequence.cpp b/Source/astcenc_integer_sequence.cpp index 9675ab5b29f686aeb07f2c5023dc0519bb8c8eee..416750374dc38efad00b11914d2a22e75998c8dd 100644 --- a/Source/astcenc_integer_sequence.cpp +++ b/Source/astcenc_integer_sequence.cpp @@ -24,6 +24,7 @@ #include /** @brief Unpacked quint triplets for each packed value */ +// TODO: Bitpack these into a uint16_t? static const uint8_t quints_of_integer[128][3] { {0, 0, 0}, {1, 0, 0}, {2, 0, 0}, {3, 0, 0}, {4, 0, 0}, {0, 4, 0}, {4, 4, 0}, {4, 4, 4}, @@ -99,6 +100,7 @@ static const uint8_t integer_of_quints[5][5][5] { }; /** @brief Unpacked trit quintuplets for each packed value */ +// TODO: Bitpack these into a uint16_t? static const uint8_t trits_of_integer[256][5] { {0, 0, 0, 0, 0}, {1, 0, 0, 0, 0}, {2, 0, 0, 0, 0}, {0, 0, 2, 0, 0}, {0, 1, 0, 0, 0}, {1, 1, 0, 0, 0}, {2, 1, 0, 0, 0}, {1, 0, 2, 0, 0}, @@ -334,44 +336,41 @@ static const uint8_t integer_of_trits[3][3][3][3][3] { */ struct btq_count { - /** @brief The quantization level. */ - uint8_t quant; - /** @brief The number of bits. */ - uint8_t bits; + uint8_t bits:6; /** @brief The number of trits. */ - uint8_t trits; + uint8_t trits:1; /** @brief The number of quints. */ - uint8_t quints; + uint8_t quints:1; }; /** * @brief The table of bits, trits, and quints needed for a quant encode. */ static const std::array btq_counts {{ - { QUANT_2, 1, 0, 0 }, - { QUANT_3, 0, 1, 0 }, - { QUANT_4, 2, 0, 0 }, - { QUANT_5, 0, 0, 1 }, - { QUANT_6, 1, 1, 0 }, - { QUANT_8, 3, 0, 0 }, - { QUANT_10, 1, 0, 1 }, - { QUANT_12, 2, 1, 0 }, - { QUANT_16, 4, 0, 0 }, - { QUANT_20, 2, 0, 1 }, - { QUANT_24, 3, 1, 0 }, - { QUANT_32, 5, 0, 0 }, - { QUANT_40, 3, 0, 1 }, - { QUANT_48, 4, 1, 0 }, - { QUANT_64, 6, 0, 0 }, - { QUANT_80, 4, 0, 1 }, - { QUANT_96, 5, 1, 0 }, - { QUANT_128, 7, 0, 0 }, - { QUANT_160, 5, 0, 1 }, - { QUANT_192, 6, 1, 0 }, - { QUANT_256, 8, 0, 0 } + { 1, 0, 0 }, // QUANT_2 + { 0, 1, 0 }, // QUANT_3 + { 2, 0, 0 }, // QUANT_4 + { 0, 0, 1 }, // QUANT_5 + { 1, 1, 0 }, // QUANT_6 + { 3, 0, 0 }, // QUANT_8 + { 1, 0, 1 }, // QUANT_10 + { 2, 1, 0 }, // QUANT_12 + { 4, 0, 0 }, // QUANT_16 + { 2, 0, 1 }, // QUANT_20 + { 3, 1, 0 }, // QUANT_24 + { 5, 0, 0 }, // QUANT_32 + { 3, 0, 1 }, // QUANT_40 + { 4, 1, 0 }, // QUANT_48 + { 6, 0, 0 }, // QUANT_64 + { 4, 0, 1 }, // QUANT_80 + { 5, 1, 0 }, // QUANT_96 + { 7, 0, 0 }, // QUANT_128 + { 5, 0, 1 }, // QUANT_160 + { 6, 1, 0 }, // QUANT_192 + { 8, 0, 0 } // QUANT_256 }}; /** @@ -382,44 +381,38 @@ static const std::array btq_counts {{ */ struct ise_size { - /** @brief The quantization level. */ - uint8_t quant; - /** @brief The scaling parameter. */ - uint8_t scale; - - /** @brief The rounding parameter. */ - uint8_t round; + uint8_t scale:6; /** @brief The divisor parameter. */ - uint8_t divisor; + uint8_t divisor:2; }; /** * @brief The table of scale, round, and divisors needed for quant sizing. */ static const std::array ise_sizes {{ - { QUANT_2, 1, 0, 1 }, - { QUANT_3, 8, 4, 5 }, - { QUANT_4, 2, 0, 1 }, - { QUANT_5, 7, 2, 3 }, - { QUANT_6, 13, 4, 5 }, - { QUANT_8, 3, 0, 1 }, - { QUANT_10, 10, 2, 3 }, - { QUANT_12, 18, 4, 5 }, - { QUANT_16, 4, 0, 1 }, - { QUANT_20, 13, 2, 3 }, - { QUANT_24, 23, 4, 5 }, - { QUANT_32, 5, 0, 1 }, - { QUANT_40, 16, 2, 3 }, - { QUANT_48, 28, 4, 5 }, - { QUANT_64, 6, 0, 1 }, - { QUANT_80, 19, 2, 3 }, - { QUANT_96, 33, 4, 5 }, - { QUANT_128, 7, 0, 1 }, - { QUANT_160, 22, 2, 3 }, - { QUANT_192, 38, 4, 5 }, - { QUANT_256, 8, 0, 1 } + { 1, 0 }, // QUANT_2 + { 8, 2 }, // QUANT_3 + { 2, 0 }, // QUANT_4 + { 7, 1 }, // QUANT_5 + { 13, 2 }, // QUANT_6 + { 3, 0 }, // QUANT_8 + { 10, 1 }, // QUANT_10 + { 18, 2 }, // QUANT_12 + { 4, 0 }, // QUANT_16 + { 13, 1 }, // QUANT_20 + { 23, 2 }, // QUANT_24 + { 5, 0 }, // QUANT_32 + { 16, 1 }, // QUANT_40 + { 28, 2 }, // QUANT_48 + { 6, 0 }, // QUANT_64 + { 19, 1 }, // QUANT_80 + { 33, 2 }, // QUANT_96 + { 7, 0 }, // QUANT_128 + { 22, 1 }, // QUANT_160 + { 38, 2 }, // QUANT_192 + { 8, 0 } // QUANT_256 }}; /* See header for documentation. */ @@ -435,7 +428,8 @@ unsigned int get_ise_sequence_bitcount( } auto& entry = ise_sizes[quant_level]; - return (entry.scale * character_count + entry.round) / entry.divisor; + unsigned int divisor = (entry.divisor << 1) + 1; + return (entry.scale * character_count + divisor - 1) / divisor; } /** @@ -645,7 +639,6 @@ void encode_ise( // Write out just bits else { - promise(character_count > 0); for (unsigned int i = 0; i < character_count; i++) { write_bits(input_data[i], bits, bit_offset, output_data); @@ -685,10 +678,10 @@ void decode_ise( if (trits) { - static const unsigned int bits_to_read[5] { 2, 2, 1, 2, 1 }; - static const unsigned int block_shift[5] { 0, 2, 4, 5, 7 }; - static const unsigned int next_lcounter[5] { 1, 2, 3, 4, 0 }; - static const unsigned int hcounter_incr[5] { 0, 0, 0, 0, 1 }; + static const uint8_t bits_to_read[5] { 2, 2, 1, 2, 1 }; + static const uint8_t block_shift[5] { 0, 2, 4, 5, 7 }; + static const uint8_t next_lcounter[5] { 1, 2, 3, 4, 0 }; + static const uint8_t hcounter_incr[5] { 0, 0, 0, 0, 1 }; unsigned int tdata = read_bits(bits_to_read[lcounter], bit_offset, input_data); bit_offset += bits_to_read[lcounter]; tq_blocks[hcounter] |= tdata << block_shift[lcounter]; @@ -698,10 +691,10 @@ void decode_ise( if (quints) { - static const unsigned int bits_to_read[3] { 3, 2, 2 }; - static const unsigned int block_shift[3] { 0, 3, 5 }; - static const unsigned int next_lcounter[3] { 1, 2, 0 }; - static const unsigned int hcounter_incr[3] { 0, 0, 1 }; + static const uint8_t bits_to_read[3] { 3, 2, 2 }; + static const uint8_t block_shift[3] { 0, 3, 5 }; + static const uint8_t next_lcounter[3] { 1, 2, 0 }; + static const uint8_t hcounter_incr[3] { 0, 0, 1 }; unsigned int tdata = read_bits(bits_to_read[lcounter], bit_offset, input_data); bit_offset += bits_to_read[lcounter]; tq_blocks[hcounter] |= tdata << block_shift[lcounter]; @@ -714,6 +707,7 @@ void decode_ise( if (trits) { unsigned int trit_blocks = (character_count + 4) / 5; + promise(trit_blocks > 0); for (unsigned int i = 0; i < trit_blocks; i++) { const uint8_t *tritptr = trits_of_integer[tq_blocks[i]]; @@ -728,6 +722,7 @@ void decode_ise( if (quints) { unsigned int quint_blocks = (character_count + 2) / 3; + promise(quint_blocks > 0); for (unsigned int i = 0; i < quint_blocks; i++) { const uint8_t *quintptr = quints_of_integer[tq_blocks[i]]; diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h index 411723e51f8851fd0c8a9cc366bf94318d773ea5..4d31a5f111df6b24d41ca44122dc79d26f7ee97a 100644 --- a/Source/astcenc_internal.h +++ b/Source/astcenc_internal.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -23,15 +23,13 @@ #define ASTCENC_INTERNAL_INCLUDED #include -#include #include #include -#include +#if defined(ASTCENC_DIAGNOSTICS) + #include +#endif #include -#include -#include -#include -#include +#include #include "astcenc.h" #include "astcenc_mathlib.h" @@ -82,7 +80,7 @@ static constexpr unsigned int BLOCK_MAX_PARTITIONS { 4 }; /** @brief The number of partitionings, per partition count, suported by the ASTC format. */ static constexpr unsigned int BLOCK_MAX_PARTITIONINGS { 1024 }; -/** @brief The maximum number of weights used during partition selection for texel clustering. */ +/** @brief The maximum number of texels used during partition selection for texel clustering. */ static constexpr uint8_t BLOCK_MAX_KMEANS_TEXELS { 64 }; /** @brief The maximum number of weights a block can support. */ @@ -122,23 +120,45 @@ static constexpr unsigned int WEIGHTS_MAX_DECIMATION_MODES { 87 }; static constexpr float ERROR_CALC_DEFAULT { 1e30f }; /** - * @brief The minimum texel count for a block to use the one partition fast path. + * @brief The minimum tuning setting threshold for the one partition fast path. + */ +static constexpr float TUNE_MIN_SEARCH_MODE0 { 0.85f }; + +/** + * @brief The maximum number of candidate encodings tested for each encoding mode. * - * This setting skips 4x4 and 5x4 block sizes. + * This can be dynamically reduced by the compression quality preset. */ -static constexpr unsigned int TUNE_MIN_TEXELS_MODE0_FASTPATH { 24 }; +static constexpr unsigned int TUNE_MAX_TRIAL_CANDIDATES { 8 }; /** - * @brief The maximum number of candidate encodings tested for each encoding mode.. + * @brief The maximum number of candidate partitionings tested for each encoding mode. * * This can be dynamically reduced by the compression quality preset. */ -static constexpr unsigned int TUNE_MAX_TRIAL_CANDIDATES { 4 }; +static constexpr unsigned int TUNE_MAX_PARTITIONING_CANDIDATES { 8 }; +/** + * @brief The maximum quant level using full angular endpoint search method. + * + * The angular endpoint search is used to find the min/max weight that should + * be used for a given quantization level. It is effective but expensive, so + * we only use it where it has the most value - low quant levels with wide + * spacing. It is used below TUNE_MAX_ANGULAR_QUANT (inclusive). Above this we + * assume the min weight is 0.0f, and the max weight is 1.0f. + * + * Note the angular algorithm is vectorized, and using QUANT_12 exactly fills + * one 8-wide vector. Decreasing by one doesn't buy much performance, and + * increasing by one is disproportionately expensive. + */ +static constexpr unsigned int TUNE_MAX_ANGULAR_QUANT { 7 }; /* QUANT_12 */ static_assert((BLOCK_MAX_TEXELS % ASTCENC_SIMD_WIDTH) == 0, "BLOCK_MAX_TEXELS must be multiple of ASTCENC_SIMD_WIDTH"); +static_assert(BLOCK_MAX_TEXELS <= 216, + "BLOCK_MAX_TEXELS must not be greater than 216"); + static_assert((BLOCK_MAX_WEIGHTS % ASTCENC_SIMD_WIDTH) == 0, "BLOCK_MAX_WEIGHTS must be multiple of ASTCENC_SIMD_WIDTH"); @@ -146,223 +166,6 @@ static_assert((WEIGHTS_MAX_BLOCK_MODES % ASTCENC_SIMD_WIDTH) == 0, "WEIGHTS_MAX_BLOCK_MODES must be multiple of ASTCENC_SIMD_WIDTH"); -/* ============================================================================ - Parallel execution control -============================================================================ */ - -/** - * @brief A simple counter-based manager for parallel task execution. - * - * The task processing execution consists of: - * - * * A single-threaded init stage. - * * A multi-threaded processing stage. - * * A condition variable so threads can wait for processing completion. - * - * The init stage will be executed by the first thread to arrive in the critical section, there is - * no main thread in the thread pool. - * - * The processing stage uses dynamic dispatch to assign task tickets to threads on an on-demand - * basis. Threads may each therefore executed different numbers of tasks, depending on their - * processing complexity. The task queue and the task tickets are just counters; the caller must map - * these integers to an actual processing partition in a specific problem domain. - * - * The exit wait condition is needed to ensure processing has finished before a worker thread can - * progress to the next stage of the pipeline. Specifically a worker may exit the processing stage - * because there are no new tasks to assign to it while other worker threads are still processing. - * Calling @c wait() will ensure that all other worker have finished before the thread can proceed. - * - * The basic usage model: - * - * // --------- From single-threaded code --------- - * - * // Reset the tracker state - * manager->reset() - * - * // --------- From multi-threaded code --------- - * - * // Run the stage init; only first thread actually runs the lambda - * manager->init() - * - * do - * { - * // Request a task assignment - * uint task_count; - * uint base_index = manager->get_tasks(, task_count); - * - * // Process any tasks we were given (task_count <= granule size) - * if (task_count) - * { - * // Run the user task processing code for N tasks here - * ... - * - * // Flag these tasks as complete - * manager->complete_tasks(task_count); - * } - * } while (task_count); - * - * // Wait for all threads to complete tasks before progressing - * manager->wait() - * - * // Run the stage term; only first thread actually runs the lambda - * manager->term() - */ -class ParallelManager -{ -private: - /** @brief Lock used for critical section and condition synchronization. */ - std::mutex m_lock; - - /** @brief True if the stage init() step has been executed. */ - bool m_init_done; - - /** @brief True if the stage term() step has been executed. */ - bool m_term_done; - - /** @brief Contition variable for tracking stage processing completion. */ - std::condition_variable m_complete; - - /** @brief Number of tasks started, but not necessarily finished. */ - std::atomic m_start_count; - - /** @brief Number of tasks finished. */ - unsigned int m_done_count; - - /** @brief Number of tasks that need to be processed. */ - unsigned int m_task_count; - -public: - /** @brief Create a new ParallelManager. */ - ParallelManager() - { - reset(); - } - - /** - * @brief Reset the tracker for a new processing batch. - * - * This must be called from single-threaded code before starting the multi-threaded procesing - * operations. - */ - void reset() - { - m_init_done = false; - m_term_done = false; - m_start_count = 0; - m_done_count = 0; - m_task_count = 0; - } - - /** - * @brief Trigger the pipeline stage init step. - * - * This can be called from multi-threaded code. The first thread to hit this will process the - * initialization. Other threads will block and wait for it to complete. - * - * @param init_func Callable which executes the stage initialization. It must return the - * total number of tasks in the stage. - */ - void init(std::function init_func) - { - std::lock_guard lck(m_lock); - if (!m_init_done) - { - m_task_count = init_func(); - m_init_done = true; - } - } - - /** - * @brief Trigger the pipeline stage init step. - * - * This can be called from multi-threaded code. The first thread to hit this will process the - * initialization. Other threads will block and wait for it to complete. - * - * @param task_count Total number of tasks needing processing. - */ - void init(unsigned int task_count) - { - std::lock_guard lck(m_lock); - if (!m_init_done) - { - m_task_count = task_count; - m_init_done = true; - } - } - - /** - * @brief Request a task assignment. - * - * Assign up to @c granule tasks to the caller for processing. - * - * @param granule Maximum number of tasks that can be assigned. - * @param[out] count Actual number of tasks assigned, or zero if no tasks were assigned. - * - * @return Task index of the first assigned task; assigned tasks increment from this. - */ - unsigned int get_task_assignment(unsigned int granule, unsigned int& count) - { - unsigned int base = m_start_count.fetch_add(granule, std::memory_order_relaxed); - if (base >= m_task_count) - { - count = 0; - return 0; - } - - count = astc::min(m_task_count - base, granule); - return base; - } - - /** - * @brief Complete a task assignment. - * - * Mark @c count tasks as complete. This will notify all threads blocked on @c wait() if this - * completes the processing of the stage. - * - * @param count The number of completed tasks. - */ - void complete_task_assignment(unsigned int count) - { - // Note: m_done_count cannot use an atomic without the mutex; this has a race between the - // update here and the wait() for other threads - std::unique_lock lck(m_lock); - this->m_done_count += count; - if (m_done_count == m_task_count) - { - lck.unlock(); - m_complete.notify_all(); - } - } - - /** - * @brief Wait for stage processing to complete. - */ - void wait() - { - std::unique_lock lck(m_lock); - m_complete.wait(lck, [this]{ return m_done_count == m_task_count; }); - } - - /** - * @brief Trigger the pipeline stage term step. - * - * This can be called from multi-threaded code. The first thread to hit this will process the - * thread termintion. Caller must have called @c wait() prior to calling this function to ensure - * that processing is complete. - * - * @param term_func Callable which executes the stage termination. - */ - void term(std::function term_func) - { - std::lock_guard lck(m_lock); - if (!m_term_done) - { - term_func(); - m_term_done = true; - } - } -}; - /* ============================================================================ Commonly used data structures ============================================================================ */ @@ -483,17 +286,19 @@ struct partition_lines3 /** @brief Line for correlated chroma, passing though the origin. */ line3 samec_line; - /** @brief Postprocessed line for uncorrelated chroma. */ + /** @brief Post-processed line for uncorrelated chroma. */ processed_line3 uncor_pline; - /** @brief Postprocessed line for correlated chroma, passing though the origin. */ + /** @brief Post-processed line for correlated chroma, passing though the origin. */ processed_line3 samec_pline; - /** @brief The length of the line for uncorrelated chroma. */ - float uncor_line_len; - - /** @brief The length of the line for correlated chroma. */ - float samec_line_len; + /** + * @brief The length of the line for uncorrelated chroma. + * + * This is used for both the uncorrelated and same chroma lines - they are normally very similar + * and only used for the relative ranking of partitionings against one another. + */ + float line_length; }; /** @@ -515,8 +320,8 @@ struct partition_info /** * @brief The number of texels in each partition. * - * Note that some seeds result in zero texels assigned to a partition are valid, but are skipped - * by this compressor as there is no point spending bits encoding an unused color endpoint. + * Note that some seeds result in zero texels assigned to a partition. These are valid, but are + * skipped by this compressor as there is no point spending bits encoding an unused endpoints. */ uint8_t partition_texel_count[BLOCK_MAX_PARTITIONS]; @@ -530,7 +335,7 @@ struct partition_info /** * @brief The weight grid information for a single decimation pattern. * - * ASTC can store one weight per texel, but is also capable of storing lower resoution weight grids + * ASTC can store one weight per texel, but is also capable of storing lower resolution weight grids * that are interpolated during decompression to assign a with to a texel. Storing fewer weights * can free up a substantial amount of bits that we can then spend on more useful things, such as * more accurate endpoints and weights, or additional partitions. @@ -558,38 +363,50 @@ struct decimation_info /** @brief The number of stored weights in the Z dimension. */ uint8_t weight_z; - /** @brief The number of stored weights that contribute to each texel, between 1 and 4. */ + /** + * @brief The number of weights that contribute to each texel. + * Value is between 1 and 4. + */ uint8_t texel_weight_count[BLOCK_MAX_TEXELS]; - /** @brief The weight index of the N weights that need to be interpolated for each texel. */ - uint8_t texel_weights_4t[4][BLOCK_MAX_TEXELS]; + /** + * @brief The weight index of the N weights that are interpolated for each texel. + * Stored transposed to improve vectorization. + */ + uint8_t texel_weights_tr[4][BLOCK_MAX_TEXELS]; - /** @brief The bilinear interpolation weighting of the N input weights for each texel, between 0 and 16. */ - uint8_t texel_weights_int_4t[4][BLOCK_MAX_TEXELS]; + /** + * @brief The bilinear contribution of the N weights that are interpolated for each texel. + * Value is between 0 and 16, stored transposed to improve vectorization. + */ + uint8_t texel_weight_contribs_int_tr[4][BLOCK_MAX_TEXELS]; - /** @brief The bilinear interpolation weighting of the N input weights for each texel, between 0 and 1. */ - alignas(ASTCENC_VECALIGN) float texel_weights_float_4t[4][BLOCK_MAX_TEXELS]; + /** + * @brief The bilinear contribution of the N weights that are interpolated for each texel. + * Value is between 0 and 1, stored transposed to improve vectorization. + */ + ASTCENC_ALIGNAS float texel_weight_contribs_float_tr[4][BLOCK_MAX_TEXELS]; /** @brief The number of texels that each stored weight contributes to. */ uint8_t weight_texel_count[BLOCK_MAX_WEIGHTS]; - /** @brief The list of weights that contribute to each texel. */ - uint8_t weight_texel[BLOCK_MAX_TEXELS][BLOCK_MAX_WEIGHTS]; - - /** @brief The list of weight indices that contribute to each texel. */ - alignas(ASTCENC_VECALIGN) float weights_flt[BLOCK_MAX_TEXELS][BLOCK_MAX_WEIGHTS]; + /** + * @brief The list of texels that use a specific weight index. + * Stored transposed to improve vectorization. + */ + uint8_t weight_texels_tr[BLOCK_MAX_TEXELS][BLOCK_MAX_WEIGHTS]; /** - * @brief Folded structure for faster access: - * texel_weights_texel[i][j][.] = texel_weights[.][weight_texel[i][j]] + * @brief The bilinear contribution to the N texels that use each weight. + * Value is between 0 and 1, stored transposed to improve vectorization. */ - uint8_t texel_weights_texel[BLOCK_MAX_WEIGHTS][BLOCK_MAX_TEXELS][4]; + ASTCENC_ALIGNAS float weights_texel_contribs_tr[BLOCK_MAX_TEXELS][BLOCK_MAX_WEIGHTS]; /** - * @brief Folded structure for faster access: - * texel_weights_float_texel[i][j][.] = texel_weights_float[.][weight_texel[i][j]] + * @brief The bilinear contribution to the Nth texel that uses each weight. + * Value is between 0 and 1, stored transposed to improve vectorization. */ - float texel_weights_float_texel[BLOCK_MAX_WEIGHTS][BLOCK_MAX_TEXELS][4]; + float texel_contrib_for_weight[BLOCK_MAX_TEXELS][BLOCK_MAX_WEIGHTS]; }; /** @@ -634,11 +451,61 @@ struct decimation_mode /** @brief The max weight precision for 2 planes, or -1 if not supported. */ int8_t maxprec_2planes; - /** @brief Was this actually referenced by an active 1 plane mode? */ - uint8_t ref_1_plane; + /** + * @brief Bitvector indicating weight quant modes used by active 1 plane block modes. + * + * Bit 0 = QUANT_2, Bit 1 = QUANT_3, etc. + */ + uint16_t refprec_1plane; + + /** + * @brief Bitvector indicating weight quant methods used by active 2 plane block modes. + * + * Bit 0 = QUANT_2, Bit 1 = QUANT_3, etc. + */ + uint16_t refprec_2planes; + + /** + * @brief Set a 1 plane weight quant as active. + * + * @param weight_quant The quant method to set. + */ + void set_ref_1plane(quant_method weight_quant) + { + refprec_1plane |= (1 << weight_quant); + } + + /** + * @brief Test if this mode is active below a given 1 plane weight quant (inclusive). + * + * @param max_weight_quant The max quant method to test. + */ + bool is_ref_1plane(quant_method max_weight_quant) const + { + uint16_t mask = static_cast((1 << (max_weight_quant + 1)) - 1); + return (refprec_1plane & mask) != 0; + } + + /** + * @brief Set a 2 plane weight quant as active. + * + * @param weight_quant The quant method to set. + */ + void set_ref_2plane(quant_method weight_quant) + { + refprec_2planes |= static_cast(1 << weight_quant); + } - /** @brief Was this actually referenced by an active 2 plane mode? */ - uint8_t ref_2_planes; + /** + * @brief Test if this mode is active below a given 2 plane weight quant (inclusive). + * + * @param max_weight_quant The max quant method to test. + */ + bool is_ref_2plane(quant_method max_weight_quant) const + { + uint16_t mask = static_cast((1 << (max_weight_quant + 1)) - 1); + return (refprec_2planes & mask) != 0; + } }; /** @@ -649,7 +516,7 @@ struct decimation_mode * modes will be unused (too many weights for the current block size or disabled by heuristics). The * actual number of weights stored is @c decimation_mode_count, and the @c decimation_modes and * @c decimation_tables arrays store the active modes contiguously at the start of the array. These - * entries are not stored in any particuar order. + * entries are not stored in any particular order. * * The block mode tables store the unpacked block mode settings. Block modes are stored in the * compressed block as an 11 bit field, but for any given block size and set of compressor @@ -713,7 +580,7 @@ struct block_size_descriptor decimation_mode decimation_modes[WEIGHTS_MAX_DECIMATION_MODES]; /** @brief The active decimation tables, stored in low indices. */ - alignas(ASTCENC_VECALIGN) decimation_info decimation_tables[WEIGHTS_MAX_DECIMATION_MODES]; + ASTCENC_ALIGNAS decimation_info decimation_tables[WEIGHTS_MAX_DECIMATION_MODES]; /** @brief The packed block mode array index, or @c BLOCK_BAD_BLOCK_MODE if not active. */ uint16_t block_mode_packed_index[WEIGHTS_MAX_BLOCK_MODES]; @@ -734,13 +601,6 @@ struct block_size_descriptor /** @brief The active texels for k-means partition selection. */ uint8_t kmeans_texels[BLOCK_MAX_KMEANS_TEXELS]; - /** - * @brief Is 0 if this 2-partition is valid for compression 255 otherwise. - * - * Indexed by remapped index, not physical index. - */ - uint8_t partitioning_valid_2[BLOCK_MAX_PARTITIONINGS]; - /** * @brief The canonical 2-partition coverage pattern used during block partition search. * @@ -748,13 +608,6 @@ struct block_size_descriptor */ uint64_t coverage_bitmaps_2[BLOCK_MAX_PARTITIONINGS][2]; - /** - * @brief Is 0 if this 3-partition is valid for compression 255 otherwise. - * - * Indexed by remapped index, not physical index. - */ - uint8_t partitioning_valid_3[BLOCK_MAX_PARTITIONINGS]; - /** * @brief The canonical 3-partition coverage pattern used during block partition search. * @@ -762,13 +615,6 @@ struct block_size_descriptor */ uint64_t coverage_bitmaps_3[BLOCK_MAX_PARTITIONINGS][3]; - /** - * @brief Is 0 if this 4-partition is valid for compression 255 otherwise. - * - * Indexed by remapped index, not physical index. - */ - uint8_t partitioning_valid_4[BLOCK_MAX_PARTITIONINGS]; - /** * @brief The canonical 4-partition coverage pattern used during block partition search. * @@ -894,16 +740,16 @@ struct block_size_descriptor struct image_block { /** @brief The input (compress) or output (decompress) data for the red color component. */ - alignas(ASTCENC_VECALIGN) float data_r[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float data_r[BLOCK_MAX_TEXELS]; /** @brief The input (compress) or output (decompress) data for the green color component. */ - alignas(ASTCENC_VECALIGN) float data_g[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float data_g[BLOCK_MAX_TEXELS]; /** @brief The input (compress) or output (decompress) data for the blue color component. */ - alignas(ASTCENC_VECALIGN) float data_b[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float data_b[BLOCK_MAX_TEXELS]; /** @brief The input (compress) or output (decompress) data for the alpha color component. */ - alignas(ASTCENC_VECALIGN) float data_a[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float data_a[BLOCK_MAX_TEXELS]; /** @brief The number of texels in the block. */ uint8_t texel_count; @@ -926,6 +772,9 @@ struct image_block /** @brief Is this grayscale block where R == G == B for all texels? */ bool grayscale; + /** @brief Is the eventual decode using decode_unorm8 rounding? */ + bool decode_unorm8; + /** @brief Set to 1 if a texel is using HDR RGB endpoints (decompression only). */ uint8_t rgb_lns[BLOCK_MAX_TEXELS]; @@ -1052,10 +901,10 @@ struct endpoints_and_weights endpoints ep; /** @brief The ideal weight for each texel; may be undecimated or decimated. */ - alignas(ASTCENC_VECALIGN) float weights[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float weights[BLOCK_MAX_TEXELS]; /** @brief The ideal weight error scaling for each texel; may be undecimated or decimated. */ - alignas(ASTCENC_VECALIGN) float weight_error_scale[BLOCK_MAX_TEXELS]; + ASTCENC_ALIGNAS float weight_error_scale[BLOCK_MAX_TEXELS]; }; /** @@ -1078,14 +927,14 @@ struct encoding_choice_errors /** @brief Can we use delta offset encoding? */ bool can_offset_encode; - /** @brief CAn we use blue contraction encoding? */ + /** @brief Can we use blue contraction encoding? */ bool can_blue_contract; }; /** * @brief Preallocated working buffers, allocated per thread during context creation. */ -struct alignas(ASTCENC_VECALIGN) compression_working_buffers +struct ASTCENC_ALIGNAS compression_working_buffers { /** @brief Ideal endpoints and weights for plane 1. */ endpoints_and_weights ei1; @@ -1093,47 +942,37 @@ struct alignas(ASTCENC_VECALIGN) compression_working_buffers /** @brief Ideal endpoints and weights for plane 2. */ endpoints_and_weights ei2; - /** @brief Ideal decimated endpoints and weights for plane 1. */ - endpoints_and_weights eix1[WEIGHTS_MAX_DECIMATION_MODES]; - - /** @brief Ideal decimated endpoints and weights for plane 2. */ - endpoints_and_weights eix2[WEIGHTS_MAX_DECIMATION_MODES]; - /** - * @brief Decimated ideal weight values. + * @brief Decimated ideal weight values in the ~0-1 range. * - * For two plane encodings, second plane weights start at @c WEIGHTS_PLANE2_OFFSET offsets. - */ - alignas(ASTCENC_VECALIGN) float dec_weights_ideal_value[WEIGHTS_MAX_DECIMATION_MODES * BLOCK_MAX_WEIGHTS]; - - /** - * @brief Decimated and quantized weight values stored in the unpacked quantized weight range. + * Note that values can be slightly below zero or higher than one due to + * endpoint extents being inside the ideal color representation. * - * For two plane encodings, second plane weights start at @c WEIGHTS_PLANE2_OFFSET offsets. + * For two planes, second plane starts at @c WEIGHTS_PLANE2_OFFSET offsets. */ - alignas(ASTCENC_VECALIGN) float dec_weights_quant_uvalue[WEIGHTS_MAX_BLOCK_MODES * BLOCK_MAX_WEIGHTS]; + ASTCENC_ALIGNAS float dec_weights_ideal[WEIGHTS_MAX_DECIMATION_MODES * BLOCK_MAX_WEIGHTS]; /** - * @brief Decimated and quantized weight values stored in the packed quantized weight range. + * @brief Decimated quantized weight values in the unquantized 0-64 range. * - * For two plane encodings, second plane weights start at @c WEIGHTS_PLANE2_OFFSET offsets. + * For two planes, second plane starts at @c WEIGHTS_PLANE2_OFFSET offsets. */ - alignas(ASTCENC_VECALIGN) uint8_t dec_weights_quant_pvalue[WEIGHTS_MAX_BLOCK_MODES * BLOCK_MAX_WEIGHTS]; + uint8_t dec_weights_uquant[WEIGHTS_MAX_BLOCK_MODES * BLOCK_MAX_WEIGHTS]; /** @brief Error of the best encoding combination for each block mode. */ - alignas(ASTCENC_VECALIGN) float errors_of_best_combination[WEIGHTS_MAX_BLOCK_MODES]; + ASTCENC_ALIGNAS float errors_of_best_combination[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The best color quant for each block mode. */ - alignas(ASTCENC_VECALIGN) quant_method best_quant_levels[WEIGHTS_MAX_BLOCK_MODES]; + uint8_t best_quant_levels[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The best color quant for each block mode if modes are the same and we have spare bits. */ - quant_method best_quant_levels_mod[WEIGHTS_MAX_BLOCK_MODES]; + uint8_t best_quant_levels_mod[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The best endpoint format for each partition. */ - int best_ep_formats[WEIGHTS_MAX_BLOCK_MODES][BLOCK_MAX_PARTITIONS]; + uint8_t best_ep_formats[WEIGHTS_MAX_BLOCK_MODES][BLOCK_MAX_PARTITIONS]; /** @brief The total bit storage needed for quantized weights for each block mode. */ - int qwt_bitcounts[WEIGHTS_MAX_BLOCK_MODES]; + int8_t qwt_bitcounts[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The cumulative error for quantized weights for each block mode. */ float qwt_errors[WEIGHTS_MAX_BLOCK_MODES]; @@ -1145,10 +984,10 @@ struct alignas(ASTCENC_VECALIGN) compression_working_buffers float weight_high_value1[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The low weight value in plane 1 for each quant level and decimation mode. */ - float weight_low_values1[WEIGHTS_MAX_DECIMATION_MODES][12]; + float weight_low_values1[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1]; /** @brief The high weight value in plane 1 for each quant level and decimation mode. */ - float weight_high_values1[WEIGHTS_MAX_DECIMATION_MODES][12]; + float weight_high_values1[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1]; /** @brief The low weight value in plane 2 for each block mode. */ float weight_low_value2[WEIGHTS_MAX_BLOCK_MODES]; @@ -1157,10 +996,10 @@ struct alignas(ASTCENC_VECALIGN) compression_working_buffers float weight_high_value2[WEIGHTS_MAX_BLOCK_MODES]; /** @brief The low weight value in plane 2 for each quant level and decimation mode. */ - float weight_low_values2[WEIGHTS_MAX_DECIMATION_MODES][12]; + float weight_low_values2[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1]; /** @brief The high weight value in plane 2 for each quant level and decimation mode. */ - float weight_high_values2[WEIGHTS_MAX_DECIMATION_MODES][12]; + float weight_high_values2[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1]; }; struct dt_init_working_buffers @@ -1185,33 +1024,27 @@ struct dt_init_working_buffers * floating-point weight. For each quantized weight, the corresponding unquantized values. For each * quantized weight, a previous-value and a next-value. */ -struct quantization_and_transfer_table +struct quant_and_transfer_table { - /** @brief The quantization level used */ - quant_method method; - /** @brief The unscrambled unquantized value. */ - float unquantized_value_unsc[33]; + uint8_t quant_to_unquant[32]; - /** @brief The scrambling order: value[map[i]] == value_unsc[i] */ - int32_t scramble_map[32]; + /** @brief The scrambling order: scrambled_quant = map[unscrambled_quant]. */ + uint8_t scramble_map[32]; - /** @brief The scrambled unquantized values. */ - uint8_t unquantized_value[32]; + /** @brief The unscrambling order: unscrambled_unquant = map[scrambled_quant]. */ + uint8_t unscramble_and_unquant_map[32]; /** * @brief A table of previous-and-next weights, indexed by the current unquantized value. * * bits 7:0 = previous-index, unquantized * * bits 15:8 = next-index, unquantized - * * bits 23:16 = previous-index, quantized - * * bits 31:24 = next-index, quantized */ - uint32_t prev_next_values[65]; + uint16_t prev_next_values[65]; }; - /** @brief The precomputed quant and transfer table. */ -extern const quantization_and_transfer_table quant_and_xfer_tables[12]; +extern const quant_and_transfer_table quant_and_xfer_tables[12]; /** @brief The block is an error block, and will return error color or NaN. */ static constexpr uint8_t SYM_BTYPE_ERROR { 0 }; @@ -1229,7 +1062,7 @@ static constexpr uint8_t SYM_BTYPE_NONCONST { 3 }; * @brief A symbolic representation of a compressed block. * * The symbolic representation stores the unpacked content of a single - * @c physical_compressed_block, in a form which is much easier to access for + * physical compressed block, in a form which is much easier to access for * the rest of the compressor code. */ struct symbolic_compressed_block @@ -1244,7 +1077,6 @@ struct symbolic_compressed_block uint8_t color_formats_matched; /** @brief The plane 2 color component, or -1 if single plane; valid for @c NONCONST blocks. */ - // Try unsigned sentintel to avoid signext on load int8_t plane2_component; /** @brief The block mode; valid for @c NONCONST blocks. */ @@ -1272,6 +1104,10 @@ struct symbolic_compressed_block }; /** @brief The quantized and decimated weights. + * + * Weights are stored in the 0-64 unpacked range allowing them to be used + * directly in encoding passes without per-use unpacking. Packing happens + * when converting to/from the physical bitstream encoding. * * If dual plane, the second plane starts at @c weights[WEIGHTS_PLANE2_OFFSET]. */ @@ -1289,18 +1125,6 @@ struct symbolic_compressed_block QualityProfile privateProfile; }; -/** - * @brief A physical representation of a compressed block. - * - * The physical representation stores the raw bytes of the format in memory. - */ -struct physical_compressed_block -{ - /** @brief The ASTC encoded data for a single block. */ - uint8_t data[16]; -}; - - /** * @brief Parameter structure for @c compute_pixel_region_variance(). * @@ -1351,7 +1175,6 @@ struct avg_args /** @brief The arguments for the nested variance computation. */ pixel_region_args arg; - // The above has a reference to the image altread? /** @brief The image Stride dimensions. */ unsigned int img_size_stride; @@ -1382,7 +1205,7 @@ class TraceLog; /** * @brief The astcenc compression context. */ -struct astcenc_context +struct astcenc_contexti { /** @brief The configuration this context was created with. */ astcenc_config config; @@ -1400,7 +1223,7 @@ struct astcenc_context */ /** @brief The input image alpha channel averages table, may be @c nullptr if not needed. */ - float *input_alpha_averages; + float* input_alpha_averages; /** @brief The scratch working buffers, one per thread (see @c thread_count). */ compression_working_buffers* working_buffers; @@ -1408,17 +1231,8 @@ struct astcenc_context #if !defined(ASTCENC_DECOMPRESS_ONLY) /** @brief The pixel region and variance worker arguments. */ avg_args avg_preprocess_args; - - /** @brief The parallel manager for averages computation. */ - ParallelManager manage_avg; - - /** @brief The parallel manager for compression. */ - ParallelManager manage_compress; #endif - /** @brief The parallel manager for decompression. */ - ParallelManager manage_decompress; - #if defined(ASTCENC_DIAGNOSTICS) /** * @brief The diagnostic trace logger. @@ -1486,7 +1300,7 @@ void init_partition_tables( * * @return The unpacked table. */ -const float *get_2d_percentile_table( +const float* get_2d_percentile_table( unsigned int xdim, unsigned int ydim); @@ -1516,25 +1330,42 @@ bool is_legal_3d_block_size( /** * @brief The precomputed table for quantizing color values. * - * Returned value is in the ASTC BISE scrambled order. + * Converts unquant value in 0-255 range into quant value in 0-255 range. + * No BISE scrambling is applied at this stage. + * + * The BISE encoding results in ties where available quant<256> values are + * equidistant the available quant values. This table stores two values + * for each input - one for use with a negative residual, and one for use with + * a positive residual. + * + * Indexed by [quant_mode - 4][data_value * 2 + residual]. + */ +extern const uint8_t color_unquant_to_uquant_tables[17][512]; + +/** + * @brief The precomputed table for packing quantized color values. + * + * Converts quant value in 0-255 range into packed quant value in 0-N range, + * with BISE scrambling applied. * * Indexed by [quant_mode - 4][data_value]. */ -extern const uint8_t color_quant_tables[17][256]; +extern const uint8_t color_uquant_to_scrambled_pquant_tables[17][256]; /** - * @brief The precomputed table for unquantizing color values. + * @brief The precomputed table for unpacking color values. * - * Returned value is in the ASTC BISE scrambled order. + * Converts quant value in 0-N range into unpacked value in 0-255 range, + * with BISE unscrambling applied. * * Indexed by [quant_mode - 4][data_value]. */ -extern const uint8_t color_unquant_tables[17][256]; +extern const uint8_t* color_scrambled_pquant_to_uquant_tables[17]; /** * @brief The precomputed quant mode storage table. * - * Indexing by [integercount/2][bits] gives us the quantization level for a given integer count and + * Indexing by [integer_count/2][bits] gives us the quantization level for a given integer count and * number of compressed storage bits. Returns -1 for cases where the requested integer count cannot * ever fit in the supplied storage size. */ @@ -1546,11 +1377,11 @@ extern const int8_t quant_mode_table[10][128]; * Note that BISE can return strings that are not a whole number of bytes in length, and ASTC can * start storing strings in a block at arbitrary bit offsets in the encoded data. * - * @param quant_level The BISE alphabet size. - * @param character_count The number of characters in the string. - * @param input_data The unpacked string, one byte per character. - * @param[in,out] output_data The output packed string. - * @param bit_offset The starting offset in the output storage. + * @param quant_level The BISE alphabet size. + * @param character_count The number of characters in the string. + * @param input_data The unpacked string, one byte per character. + * @param[in,out] output_data The output packed string. + * @param bit_offset The starting offset in the output storage. */ void encode_ise( quant_method quant_level, @@ -1565,11 +1396,11 @@ void encode_ise( * Note that BISE input strings are not a whole number of bytes in length, and ASTC can start * strings at arbitrary bit offsets in the encoded data. * - * @param quant_level The BISE alphabet size. - * @param character_count The number of characters in the string. - * @param input_data The packed string. - * @param[in,out] output_data The output storage, one byte per character. - * @param bit_offset The starting offset in the output storage. + * @param quant_level The BISE alphabet size. + * @param character_count The number of characters in the string. + * @param input_data The packed string. + * @param[in,out] output_data The output storage, one byte per character. + * @param bit_offset The starting offset in the output storage. */ void decode_ise( quant_method quant_level, @@ -1637,11 +1468,11 @@ void compute_avgs_and_dirs_3_comp( * This is a specialization of @c compute_avgs_and_dirs_3_comp where the omitted component is * always alpha, a common case during partition search. * - * @param pi The partition info for the current trial. - * @param blk The image block color data to be compressed. - * @param[out] pm The output partition metrics. - * - Only pi.partition_count array entries actually get initialized. - * - Direction vectors @c pm.dir are not normalized. + * @param pi The partition info for the current trial. + * @param blk The image block color data to be compressed. + * @param[out] pm The output partition metrics. + * - Only pi.partition_count array entries actually get initialized. + * - Direction vectors @c pm.dir are not normalized. */ void compute_avgs_and_dirs_3_comp_rgb( const partition_info& pi, @@ -1672,11 +1503,11 @@ void compute_avgs_and_dirs_4_comp( * * This function computes the squared error when using these two representations. * - * @param pi The partition info for the current trial. - * @param blk The image block color data to be compressed. - * @param[in,out] plines Processed line inputs, and line length outputs. - * @param[out] uncor_error The cumulative error for using the uncorrelated line. - * @param[out] samec_error The cumulative error for using the same chroma line. + * @param pi The partition info for the current trial. + * @param blk The image block color data to be compressed. + * @param[in,out] plines Processed line inputs, and line length outputs. + * @param[out] uncor_error The cumulative error for using the uncorrelated line. + * @param[out] samec_error The cumulative error for using the same chroma line. */ void compute_error_squared_rgb( const partition_info& pi, @@ -1699,8 +1530,7 @@ void compute_error_squared_rgb( * @param blk The image block color data to be compressed. * @param uncor_plines Processed uncorrelated partition lines for each partition. * @param samec_plines Processed same chroma partition lines for each partition. - * @param[out] uncor_lengths The length of each components deviation from the line. - * @param[out] samec_lengths The length of each components deviation from the line. + * @param[out] line_lengths The length of each components deviation from the line. * @param[out] uncor_error The cumulative error for using the uncorrelated line. * @param[out] samec_error The cumulative error for using the same chroma line. */ @@ -1709,8 +1539,7 @@ void compute_error_squared_rgba( const image_block& blk, const processed_line4 uncor_plines[BLOCK_MAX_PARTITIONS], const processed_line4 samec_plines[BLOCK_MAX_PARTITIONS], - float uncor_lengths[BLOCK_MAX_PARTITIONS], - float samec_lengths[BLOCK_MAX_PARTITIONS], + float line_lengths[BLOCK_MAX_PARTITIONS], float& uncor_error, float& samec_error); @@ -1719,25 +1548,57 @@ void compute_error_squared_rgba( * * On return the @c best_partitions list will contain the two best partition * candidates; one assuming data has uncorrelated chroma and one assuming the - * data has corelated chroma. The best candidate is returned first in the list. + * data has correlated chroma. The best candidate is returned first in the list. + * + * @param bsd The block size information. + * @param blk The image block color data to compress. + * @param partition_count The number of partitions in the block. + * @param partition_search_limit The number of candidate partition encodings to trial. + * @param[out] best_partitions The best partition candidates. + * @param requested_candidates The number of requested partitionings. May return fewer if + * candidates are not available. * - * @param bsd The block size information. - * @param blk The image block color data to compress. - * @param partition_count The number of partitions in the block. - * @param partition_search_limit The number of candidate partition encodings to trial. - * @param[out] best_partitions The best partition candidates. + * @return The actual number of candidates returned. */ -void find_best_partition_candidates( +unsigned int find_best_partition_candidates( const block_size_descriptor& bsd, const image_block& blk, unsigned int partition_count, unsigned int partition_search_limit, - unsigned int best_partitions[2]); + unsigned int best_partitions[TUNE_MAX_PARTITIONING_CANDIDATES], + unsigned int requested_candidates); /* ============================================================================ Functionality for managing images and image related data. ============================================================================ */ +/** + * @brief Get a vector mask indicating lanes decompressing into a UNORM8 value. + * + * @param decode_mode The color profile for LDR_SRGB settings. + * @param blk The image block for output image bitness settings. + * + * @return The component mask vector. + */ +static inline vmask4 get_u8_component_mask( + astcenc_profile decode_mode, + const image_block& blk +) { + vmask4 u8_mask(false); + // Decode mode writing to a unorm8 output value + if (blk.decode_unorm8) + { + u8_mask = vmask4(true); + } + // SRGB writing to a unorm8 RGB value + else if (decode_mode == ASTCENC_PRF_LDR_SRGB) + { + u8_mask = vmask4(true, true, true, false); + } + + return u8_mask; +} + /** * @brief Setup computation of regional averages in an image. * @@ -1746,10 +1607,10 @@ void find_best_partition_candidates( * * Results are written back into @c img->input_alpha_averages. * - * @param img The input image data, also holds output data. - * @param alpha_kernel_radius The kernel radius (in pixels) for alpha mods. - * @param swz Input data component swizzle. - * @param[out] ag The average variance arguments to init. + * @param img The input image data, also holds output data. + * @param alpha_kernel_radius The kernel radius (in pixels) for alpha mods. + * @param swz Input data component swizzle. + * @param[out] ag The average variance arguments to init. * * @return The number of tasks in the processing stage. */ @@ -1760,22 +1621,19 @@ unsigned int init_compute_averages( avg_args& ag); /** - * @brief Compute regional averages in an image. + * @brief Compute averages for a pixel region. * - * This function can be called by multiple threads, but only after a single - * thread calls the setup function @c init_compute_averages(). + * The routine computes both in a single pass, using a summed-area table to decouple the running + * time from the averaging/variance kernel size. * - * Results are written back into @c img->input_alpha_averages. - * - * @param[out] ctx The context. - * @param ag The average and variance arguments created during setup. + * @param[out] ctx The compressor context storing the output data. + * @param arg The input parameter structure. */ -void compute_averages( - astcenc_context& ctx, - const avg_args& ag); - +void compute_pixel_region_variance( + astcenc_contexti& ctx, + const pixel_region_args& arg); /** - * @brief Fetch a single image block from the input image. + * @brief Load a single image block from the input image. * * @param decode_mode The compression color profile. * @param img The input image data. @@ -1786,7 +1644,7 @@ void compute_averages( * @param zpos The block Z coordinate in the input image. * @param swz The swizzle to apply on load. */ -void fetch_image_block( +void load_image_block( astcenc_profile decode_mode, const astcenc_image& img, image_block& blk, @@ -1797,7 +1655,7 @@ void fetch_image_block( const astcenc_swizzle& swz); /** - * @brief Fetch a single image block from the input image. + * @brief Load a single image block from the input image. * * This specialized variant can be used only if the block is 2D LDR U8 data, * with no swizzle. @@ -1811,7 +1669,7 @@ void fetch_image_block( * @param zpos The block Z coordinate in the input image. * @param swz The swizzle to apply on load. */ -void fetch_image_block_fast_ldr( +void load_image_block_fast_ldr( astcenc_profile decode_mode, const astcenc_image& img, image_block& blk, @@ -1822,17 +1680,17 @@ void fetch_image_block_fast_ldr( const astcenc_swizzle& swz); /** - * @brief Write a single image block from the output image. + * @brief Store a single image block to the output image. * - * @param[out] img The input image data. - * @param blk The image block to populate. - * @param bsd The block size information. - * @param xpos The block X coordinate in the input image. - * @param ypos The block Y coordinate in the input image. - * @param zpos The block Z coordinate in the input image. - * @param swz The swizzle to apply on store. + * @param[out] img The output image data. + * @param blk The image block to export. + * @param bsd The block size information. + * @param xpos The block X coordinate in the input image. + * @param ypos The block Y coordinate in the input image. + * @param zpos The block Z coordinate in the input image. + * @param swz The swizzle to apply on store. */ -void write_image_block( +void store_image_block( astcenc_image& img, const image_block& blk, const block_size_descriptor& bsd, @@ -1892,14 +1750,12 @@ void compute_ideal_colors_and_weights_2planes( * Then, set step size to and attempt one step towards the original ideal * weight if it helps to reduce error. * - * @param eai_in The non-decimated endpoints and weights. - * @param eai_out A copy of eai_in we can modify later for refinement. + * @param ei The non-decimated endpoints and weights. * @param di The selected weight decimation. * @param[out] dec_weight_ideal_value The ideal values for the decimated weight set. */ void compute_ideal_weights_for_decimation( - const endpoints_and_weights& eai_in, - endpoints_and_weights& eai_out, + const endpoints_and_weights& ei, const decimation_info& di, float* dec_weight_ideal_value); @@ -1914,7 +1770,7 @@ void compute_ideal_weights_for_decimation( * @param high_bound The highest weight allowed. * @param dec_weight_ideal_value The ideal weight set. * @param[out] dec_weight_quant_uvalue The output quantized weight as a float. - * @param[out] dec_weight_quant_pvalue The output quantized weight as encoded int. + * @param[out] dec_weight_uquant The output quantized weight as encoded int. * @param quant_level The desired weight quant level. */ void compute_quantized_weights_for_decimation( @@ -1923,121 +1779,9 @@ void compute_quantized_weights_for_decimation( float high_bound, const float* dec_weight_ideal_value, float* dec_weight_quant_uvalue, - uint8_t* dec_weight_quant_pvalue, + uint8_t* dec_weight_uquant, quant_method quant_level); -/** - * @brief Compute the infilled weight for a texel index in a decimated grid. - * - * @param di The weight grid decimation to use. - * @param weights The decimated weight values to use. - * @param index The texel index to interpolate. - * - * @return The interpolated weight for the given texel. - */ -static inline float bilinear_infill( - const decimation_info& di, - const float* weights, - unsigned int index -) { - return (weights[di.texel_weights_4t[0][index]] * di.texel_weights_float_4t[0][index] + - weights[di.texel_weights_4t[1][index]] * di.texel_weights_float_4t[1][index]) + - (weights[di.texel_weights_4t[2][index]] * di.texel_weights_float_4t[2][index] + - weights[di.texel_weights_4t[3][index]] * di.texel_weights_float_4t[3][index]); -} - -/** - * @brief Compute the infilled weight for a texel index in a decimated grid. - * - * This is specialized version which computes only two weights per texel for - * encodings that are only decimated in a single axis. - * - * @param di The weight grid decimation to use. - * @param weights The decimated weight values to use. - * @param index The texel index to interpolate. - * - * @return The interpolated weight for the given texel. - */ -static inline float bilinear_infill_2( - const decimation_info& di, - const float* weights, - unsigned int index -) { - return (weights[di.texel_weights_4t[0][index]] * di.texel_weights_float_4t[0][index] + - weights[di.texel_weights_4t[1][index]] * di.texel_weights_float_4t[1][index]); -} - - -/** - * @brief Compute the infilled weight for N texel indices in a decimated grid. - * - * @param di The weight grid decimation to use. - * @param weights The decimated weight values to use. - * @param index The first texel index to interpolate. - * - * @return The interpolated weight for the given set of SIMD_WIDTH texels. - */ -static inline vfloat bilinear_infill_vla( - const decimation_info& di, - const float* weights, - unsigned int index -) { - // Load the bilinear filter texel weight indexes in the decimated grid - vint weight_idx0 = vint(di.texel_weights_4t[0] + index); - vint weight_idx1 = vint(di.texel_weights_4t[1] + index); - vint weight_idx2 = vint(di.texel_weights_4t[2] + index); - vint weight_idx3 = vint(di.texel_weights_4t[3] + index); - - // Load the bilinear filter weights from the decimated grid - vfloat weight_val0 = gatherf(weights, weight_idx0); - vfloat weight_val1 = gatherf(weights, weight_idx1); - vfloat weight_val2 = gatherf(weights, weight_idx2); - vfloat weight_val3 = gatherf(weights, weight_idx3); - - // Load the weight contribution factors for each decimated weight - vfloat tex_weight_float0 = loada(di.texel_weights_float_4t[0] + index); - vfloat tex_weight_float1 = loada(di.texel_weights_float_4t[1] + index); - vfloat tex_weight_float2 = loada(di.texel_weights_float_4t[2] + index); - vfloat tex_weight_float3 = loada(di.texel_weights_float_4t[3] + index); - - // Compute the bilinear interpolation to generate the per-texel weight - return (weight_val0 * tex_weight_float0 + weight_val1 * tex_weight_float1) + - (weight_val2 * tex_weight_float2 + weight_val3 * tex_weight_float3); -} - -/** - * @brief Compute the infilled weight for N texel indices in a decimated grid. - * - * This is specialized version which computes only two weights per texel for - * encodings that are only decimated in a single axis. - * - * @param di The weight grid decimation to use. - * @param weights The decimated weight values to use. - * @param index The first texel index to interpolate. - * - * @return The interpolated weight for the given set of SIMD_WIDTH texels. - */ -static inline vfloat bilinear_infill_vla_2( - const decimation_info& di, - const float* weights, - unsigned int index -) { - // Load the bilinear filter texel weight indexes in the decimated grid - vint weight_idx0 = vint(di.texel_weights_4t[0] + index); - vint weight_idx1 = vint(di.texel_weights_4t[1] + index); - - // Load the bilinear filter weights from the decimated grid - vfloat weight_val0 = gatherf(weights, weight_idx0); - vfloat weight_val1 = gatherf(weights, weight_idx1); - - // Load the weight contribution factors for each decimated weight - vfloat tex_weight_float0 = loada(di.texel_weights_float_4t[0] + index); - vfloat tex_weight_float1 = loada(di.texel_weights_float_4t[1] + index); - - // Compute the bilinear interpolation to generate the per-texel weight - return (weight_val0 * tex_weight_float0 + weight_val1 * tex_weight_float1); -} - /** * @brief Compute the error of a decimated weight set for 1 plane. * @@ -2084,13 +1828,13 @@ float compute_error_of_weight_set_2planes( * The user requests a base color endpoint mode in @c format, but the quantizer may choose a * delta-based representation. It will report back the format variant it actually used. * - * @param color0 The input unquantized color0 endpoint for absolute endpoint pairs. - * @param color1 The input unquantized color1 endpoint for absolute endpoint pairs. - * @param rgbs_color The input unquantized RGBS variant endpoint for same chroma endpoints. - * @param rgbo_color The input unquantized RGBS variant endpoint for HDR endpoints.. - * @param format The desired base format. - * @param[out] output The output storage for the quantized colors/ - * @param quant_level The quantization level requested. + * @param color0 The input unquantized color0 endpoint for absolute endpoint pairs. + * @param color1 The input unquantized color1 endpoint for absolute endpoint pairs. + * @param rgbs_color The input unquantized RGBS variant endpoint for same chroma endpoints. + * @param rgbo_color The input unquantized RGBS variant endpoint for HDR endpoints. + * @param format The desired base format. + * @param[out] output The output storage for the quantized colors/ + * @param quant_level The quantization level requested. * * @return The actual endpoint mode used. */ @@ -2105,11 +1849,12 @@ uint8_t pack_color_endpoints( quant_method quant_level); /** - * @brief Unpack a single pair of encoded and quantized color endpoints. + * @brief Unpack a single pair of encoded endpoints. + * + * Endpoints must be unscrambled and converted into the 0-255 range before calling this functions. * - * @param decode_mode The decode mode (LDR, HDR). + * @param decode_mode The decode mode (LDR, HDR, etc). * @param format The color endpoint mode used. - * @param quant_level The quantization level used. * @param input The raw array of encoded input integers. The length of this array * depends on @c format; it can be safely assumed to be large enough. * @param[out] rgb_hdr Is the endpoint using HDR for the RGB channels? @@ -2120,21 +1865,50 @@ uint8_t pack_color_endpoints( void unpack_color_endpoints( astcenc_profile decode_mode, int format, - quant_method quant_level, const uint8_t* input, bool& rgb_hdr, bool& alpha_hdr, vint4& output0, vint4& output1); +/** + * @brief Unpack an LDR RGBA color that uses delta encoding. + * + * @param input0 The packed endpoint 0 color. + * @param input1 The packed endpoint 1 color deltas. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. + */ +void rgba_delta_unpack( + vint4 input0, + vint4 input1, + vint4& output0, + vint4& output1); + +/** + * @brief Unpack an LDR RGBA color that uses direct encoding. + * + * @param input0 The packed endpoint 0 color. + * @param input1 The packed endpoint 1 color. + * @param[out] output0 The unpacked endpoint 0 color. + * @param[out] output1 The unpacked endpoint 1 color. + */ +void rgba_unpack( + vint4 input0, + vint4 input1, + vint4& output0, + vint4& output1); + /** * @brief Unpack a set of quantized and decimated weights. * + * TODO: Can we skip this for non-decimated weights now that the @c scb is + * already storing unquantized weights? + * * @param bsd The block size information. * @param scb The symbolic compressed encoding. * @param di The weight grid decimation table. * @param is_dual_plane @c true if this is a dual plane block, @c false otherwise. - * @param quant_level The weight quantization level. * @param[out] weights_plane1 The output array for storing the plane 1 weights. * @param[out] weights_plane2 The output array for storing the plane 2 weights. */ @@ -2143,7 +1917,6 @@ void unpack_weights( const symbolic_compressed_block& scb, const decimation_info& di, bool is_dual_plane, - quant_method quant_level, int weights_plane1[BLOCK_MAX_TEXELS], int weights_plane2[BLOCK_MAX_TEXELS]); @@ -2175,12 +1948,12 @@ unsigned int compute_ideal_endpoint_formats( const partition_info& pi, const image_block& blk, const endpoints& ep, - const int* qwt_bitcounts, + const int8_t* qwt_bitcounts, const float* qwt_errors, unsigned int tune_candidate_limit, unsigned int start_block_mode, unsigned int end_block_mode, - int partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS], + uint8_t partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS], int block_mode[TUNE_MAX_TRIAL_CANDIDATES], quant_method quant_level[TUNE_MAX_TRIAL_CANDIDATES], quant_method quant_level_mod[TUNE_MAX_TRIAL_CANDIDATES], @@ -2192,21 +1965,19 @@ unsigned int compute_ideal_endpoint_formats( * As we quantize and decimate weights the optimal endpoint colors may change slightly, so we must * recompute the ideal colors for a specific weight set. * - * @param blk The image block color data to compress. - * @param pi The partition info for the current trial. - * @param di The weight grid decimation table. - * @param weight_quant_mode The weight grid quantization level. - * @param dec_weights_quant_pvalue The quantized weight set. - * @param[in,out] ep The color endpoints (modifed in place). - * @param[out] rgbs_vectors The RGB+scale vectors for LDR blocks. - * @param[out] rgbo_vectors The RGB+offset vectors for HDR blocks. + * @param blk The image block color data to compress. + * @param pi The partition info for the current trial. + * @param di The weight grid decimation table. + * @param dec_weights_uquant The quantized weight set. + * @param[in,out] ep The color endpoints (modifed in place). + * @param[out] rgbs_vectors The RGB+scale vectors for LDR blocks. + * @param[out] rgbo_vectors The RGB+offset vectors for HDR blocks. */ void recompute_ideal_colors_1plane( const image_block& blk, const partition_info& pi, const decimation_info& di, - int weight_quant_mode, - const uint8_t* dec_weights_quant_pvalue, + const uint8_t* dec_weights_uquant, endpoints& ep, vfloat4 rgbs_vectors[BLOCK_MAX_PARTITIONS], vfloat4 rgbo_vectors[BLOCK_MAX_PARTITIONS]); @@ -2217,24 +1988,22 @@ void recompute_ideal_colors_1plane( * As we quantize and decimate weights the optimal endpoint colors may change slightly, so we must * recompute the ideal colors for a specific weight set. * - * @param blk The image block color data to compress. - * @param bsd The block_size descriptor. - * @param di The weight grid decimation table. - * @param weight_quant_mode The weight grid quantization level. - * @param dec_weights_quant_pvalue_plane1 The quantized weight set for plane 1. - * @param dec_weights_quant_pvalue_plane2 The quantized weight set for plane 2. - * @param[in,out] ep The color endpoints (modifed in place). - * @param[out] rgbs_vector The RGB+scale color for LDR blocks. - * @param[out] rgbo_vector The RGB+offset color for HDR blocks. - * @param plane2_component The component assigned to plane 2. + * @param blk The image block color data to compress. + * @param bsd The block_size descriptor. + * @param di The weight grid decimation table. + * @param dec_weights_uquant_plane1 The quantized weight set for plane 1. + * @param dec_weights_uquant_plane2 The quantized weight set for plane 2. + * @param[in,out] ep The color endpoints (modifed in place). + * @param[out] rgbs_vector The RGB+scale color for LDR blocks. + * @param[out] rgbo_vector The RGB+offset color for HDR blocks. + * @param plane2_component The component assigned to plane 2. */ void recompute_ideal_colors_2planes( const image_block& blk, const block_size_descriptor& bsd, const decimation_info& di, - int weight_quant_mode, - const uint8_t* dec_weights_quant_pvalue_plane1, - const uint8_t* dec_weights_quant_pvalue_plane2, + const uint8_t* dec_weights_uquant_plane1, + const uint8_t* dec_weights_uquant_plane2, endpoints& ep, vfloat4& rgbs_vector, vfloat4& rgbo_vector, @@ -2248,31 +2017,31 @@ void prepare_angular_tables(); /** * @brief Compute the angular endpoints for one plane for each block mode. * - * @param tune_low_weight_limit Weight count cutoff below which we use simpler searches. - * @param only_always Only consider block modes that are always enabled. - * @param bsd The block size descriptor for the current trial. - * @param dec_weight_ideal_value The ideal decimated unquantized weight values. - * @param[out] tmpbuf Preallocated scratch buffers for the compressor. + * @param only_always Only consider block modes that are always enabled. + * @param bsd The block size descriptor for the current trial. + * @param dec_weight_ideal_value The ideal decimated unquantized weight values. + * @param max_weight_quant The maximum block mode weight quantization allowed. + * @param[out] tmpbuf Preallocated scratch buffers for the compressor. */ void compute_angular_endpoints_1plane( - unsigned int tune_low_weight_limit, bool only_always, const block_size_descriptor& bsd, const float* dec_weight_ideal_value, + unsigned int max_weight_quant, compression_working_buffers& tmpbuf); /** * @brief Compute the angular endpoints for two planes for each block mode. * - * @param tune_low_weight_limit Weight count cutoff below which we use simpler searches. - * @param bsd The block size descriptor for the current trial. - * @param dec_weight_ideal_value The ideal decimated unquantized weight values. - * @param[out] tmpbuf Preallocated scratch buffers for the compressor. + * @param bsd The block size descriptor for the current trial. + * @param dec_weight_ideal_value The ideal decimated unquantized weight values. + * @param max_weight_quant The maximum block mode weight quantization allowed. + * @param[out] tmpbuf Preallocated scratch buffers for the compressor. */ void compute_angular_endpoints_2planes( - unsigned int tune_low_weight_limit, const block_size_descriptor& bsd, const float* dec_weight_ideal_value, + unsigned int max_weight_quant, compression_working_buffers& tmpbuf); /* ============================================================================ @@ -2288,9 +2057,9 @@ void compute_angular_endpoints_2planes( * @param[out] tmpbuf Preallocated scratch buffers for the compressor. */ void compress_block( - const astcenc_context& ctx, + const astcenc_contexti& ctx, const image_block& blk, - physical_compressed_block& pcb, + uint8_t pcb[16], #if QUALITY_CONTROL compression_working_buffers& tmpbuf, bool calQualityEnable, @@ -2390,12 +2159,12 @@ float compute_symbolic_block_difference_1plane_1partition( * * @param bsd The block size information. * @param scb The symbolic representation. - * @param[out] pcb The binary encoded data. + * @param[out] pcb The physical compressed block output. */ void symbolic_to_physical( const block_size_descriptor& bsd, const symbolic_compressed_block& scb, - physical_compressed_block& pcb); + uint8_t pcb[16]); /** * @brief Convert a binary physical encoding into a symbolic representation. @@ -2404,52 +2173,25 @@ void symbolic_to_physical( * flagged as an error block if the encoding is invalid. * * @param bsd The block size information. - * @param pcb The binary encoded data. + * @param pcb The physical compresesd block input. * @param[out] scb The output symbolic representation. */ void physical_to_symbolic( const block_size_descriptor& bsd, - const physical_compressed_block& pcb, + const uint8_t pcb[16], symbolic_compressed_block& scb); /* ============================================================================ Platform-specific functions. ============================================================================ */ -/** - * @brief Run-time detection if the host CPU supports the POPCNT extension. - * - * @return @c true if supported, @c false if not. - */ -bool cpu_supports_popcnt(); - -/** - * @brief Run-time detection if the host CPU supports F16C extension. - * - * @return @c true if supported, @c false if not. - */ -bool cpu_supports_f16c(); - -/** - * @brief Run-time detection if the host CPU supports SSE 4.1 extension. - * - * @return @c true if supported, @c false if not. - */ -bool cpu_supports_sse41(); - -/** - * @brief Run-time detection if the host CPU supports AVX 2 extension. - * - * @return @c true if supported, @c false if not. - */ -bool cpu_supports_avx2(); - /** * @brief Allocate an aligned memory buffer. * - * Allocated memory must be freed by aligned_free; + * Allocated memory must be freed by aligned_free. * * @param size The desired buffer size. - * @param align The desired buffer alignment; must be 2^N. + * @param align The desired buffer alignment; must be 2^N, may be increased + * by the implementation to a minimum allowable alignment. * * @return The memory buffer pointer or nullptr on allocation failure. */ @@ -2459,10 +2201,14 @@ T* aligned_malloc(size_t size, size_t align) void* ptr; int error = 0; + // Don't allow this to under-align a type + size_t min_align = astc::max(alignof(T), sizeof(void*)); + size_t real_align = astc::max(min_align, align); + #if defined(_WIN32) - ptr = _aligned_malloc(size, align); + ptr = _aligned_malloc(size, real_align); #else - error = posix_memalign(&ptr, align, size); + error = posix_memalign(&ptr, real_align, size); #endif if (error || (!ptr)) @@ -2482,9 +2228,9 @@ template void aligned_free(T* ptr) { #if defined(_WIN32) - _aligned_free(reinterpret_cast(ptr)); + _aligned_free(ptr); #else - free(reinterpret_cast(ptr)); + free(ptr); #endif } diff --git a/Source/astcenc_internal_entry.h b/Source/astcenc_internal_entry.h new file mode 100644 index 0000000000000000000000000000000000000000..26677147810ce52186bd1e979f412a1a9537a631 --- /dev/null +++ b/Source/astcenc_internal_entry.h @@ -0,0 +1,330 @@ +// SPDX-License-Identifier: Apache-2.0 +// ---------------------------------------------------------------------------- +// Copyright 2011-2024 Arm Limited +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations +// under the License. +// ---------------------------------------------------------------------------- + +/** + * @brief Functions and data declarations for the outer context. + * + * The outer context includes thread-pool management, which is slower to + * compile due to increased use of C++ stdlib. The inner context used in the + * majority of the codec library does not include this. + */ + +#ifndef ASTCENC_INTERNAL_ENTRY_INCLUDED +#define ASTCENC_INTERNAL_ENTRY_INCLUDED + +#include +#include +#include +#include + +#include "astcenc_internal.h" + +/* ============================================================================ + Parallel execution control +============================================================================ */ + +/** + * @brief A simple counter-based manager for parallel task execution. + * + * The task processing execution consists of: + * + * * A single-threaded init stage. + * * A multi-threaded processing stage. + * * A condition variable so threads can wait for processing completion. + * + * The init stage will be executed by the first thread to arrive in the critical section, there is + * no main thread in the thread pool. + * + * The processing stage uses dynamic dispatch to assign task tickets to threads on an on-demand + * basis. Threads may each therefore executed different numbers of tasks, depending on their + * processing complexity. The task queue and the task tickets are just counters; the caller must map + * these integers to an actual processing partition in a specific problem domain. + * + * The exit wait condition is needed to ensure processing has finished before a worker thread can + * progress to the next stage of the pipeline. Specifically a worker may exit the processing stage + * because there are no new tasks to assign to it while other worker threads are still processing. + * Calling @c wait() will ensure that all other worker have finished before the thread can proceed. + * + * The basic usage model: + * + * // --------- From single-threaded code --------- + * + * // Reset the tracker state + * manager->reset() + * + * // --------- From multi-threaded code --------- + * + * // Run the stage init; only first thread actually runs the lambda + * manager->init() + * + * do + * { + * // Request a task assignment + * uint task_count; + * uint base_index = manager->get_tasks(, task_count); + * + * // Process any tasks we were given (task_count <= granule size) + * if (task_count) + * { + * // Run the user task processing code for N tasks here + * ... + * + * // Flag these tasks as complete + * manager->complete_tasks(task_count); + * } + * } while (task_count); + * + * // Wait for all threads to complete tasks before progressing + * manager->wait() + * + * // Run the stage term; only first thread actually runs the lambda + * manager->term() + */ +class ParallelManager +{ +private: + /** @brief Lock used for critical section and condition synchronization. */ + std::mutex m_lock; + + /** @brief True if the stage init() step has been executed. */ + bool m_init_done; + + /** @brief True if the stage term() step has been executed. */ + bool m_term_done; + + /** @brief Condition variable for tracking stage processing completion. */ + std::condition_variable m_complete; + + /** @brief Number of tasks started, but not necessarily finished. */ + std::atomic m_start_count; + + /** @brief Number of tasks finished. */ + unsigned int m_done_count; + + /** @brief Number of tasks that need to be processed. */ + unsigned int m_task_count; + + /** @brief Progress callback (optional). */ + astcenc_progress_callback m_callback; + + /** @brief Lock used for callback synchronization. */ + std::mutex m_callback_lock; + + /** @brief Minimum progress before making a callback. */ + float m_callback_min_diff; + + /** @brief Last progress callback value. */ + float m_callback_last_value; + +public: + /** @brief Create a new ParallelManager. */ + ParallelManager() + { + reset(); + } + + /** + * @brief Reset the tracker for a new processing batch. + * + * This must be called from single-threaded code before starting the multi-threaded processing + * operations. + */ + void reset() + { + m_init_done = false; + m_term_done = false; + m_start_count = 0; + m_done_count = 0; + m_task_count = 0; + m_callback_last_value = 0.0f; + m_callback_min_diff = 1.0f; + } + + /** + * @brief Trigger the pipeline stage init step. + * + * This can be called from multi-threaded code. The first thread to hit this will process the + * initialization. Other threads will block and wait for it to complete. + * + * @param init_func Callable which executes the stage initialization. It must return the + * total number of tasks in the stage. + */ + void init(std::function init_func) + { + std::lock_guard lck(m_lock); + if (!m_init_done) + { + m_task_count = init_func(); + m_init_done = true; + } + } + + /** + * @brief Trigger the pipeline stage init step. + * + * This can be called from multi-threaded code. The first thread to hit this will process the + * initialization. Other threads will block and wait for it to complete. + * + * @param task_count Total number of tasks needing processing. + * @param callback Function pointer for progress status callbacks. + */ + void init(unsigned int task_count, astcenc_progress_callback callback) + { + std::lock_guard lck(m_lock); + if (!m_init_done) + { + m_callback = callback; + m_task_count = task_count; + m_init_done = true; + + // Report every 1% or 4096 blocks, whichever is larger, to avoid callback overhead + float min_diff = (4096.0f / static_cast(task_count)) * 100.0f; + m_callback_min_diff = astc::max(min_diff, 1.0f); + } + } + + /** + * @brief Request a task assignment. + * + * Assign up to @c granule tasks to the caller for processing. + * + * @param granule Maximum number of tasks that can be assigned. + * @param[out] count Actual number of tasks assigned, or zero if no tasks were assigned. + * + * @return Task index of the first assigned task; assigned tasks increment from this. + */ + unsigned int get_task_assignment(unsigned int granule, unsigned int& count) + { + unsigned int base = m_start_count.fetch_add(granule, std::memory_order_relaxed); + if (base >= m_task_count) + { + count = 0; + return 0; + } + + count = astc::min(m_task_count - base, granule); + return base; + } + + /** + * @brief Complete a task assignment. + * + * Mark @c count tasks as complete. This will notify all threads blocked on @c wait() if this + * completes the processing of the stage. + * + * @param count The number of completed tasks. + */ + void complete_task_assignment(unsigned int count) + { + // Note: m_done_count cannot use an atomic without the mutex; this has a race between the + // update here and the wait() for other threads + unsigned int local_count; + float local_last_value; + { + std::unique_lock lck(m_lock); + m_done_count += count; + local_count = m_done_count; + local_last_value = m_callback_last_value; + + if (m_done_count == m_task_count) + { + // Ensure the progress bar hits 100% + if (m_callback) + { + std::unique_lock cblck(m_callback_lock); + m_callback(100.0f); + m_callback_last_value = 100.0f; + } + + lck.unlock(); + m_complete.notify_all(); + } + } + + // Process progress callback if we have one + if (m_callback) + { + // Initial lockless test - have we progressed enough to emit? + float num = static_cast(local_count); + float den = static_cast(m_task_count); + float this_value = (num / den) * 100.0f; + bool report_test = (this_value - local_last_value) > m_callback_min_diff; + + // Recheck under lock, because another thread might report first + if (report_test) + { + std::unique_lock cblck(m_callback_lock); + bool report_retest = (this_value - m_callback_last_value) > m_callback_min_diff; + if (report_retest) + { + m_callback(this_value); + m_callback_last_value = this_value; + } + } + } + } + + /** + * @brief Wait for stage processing to complete. + */ + void wait() + { + std::unique_lock lck(m_lock); + m_complete.wait(lck, [this]{ return m_done_count == m_task_count; }); + } + + /** + * @brief Trigger the pipeline stage term step. + * + * This can be called from multi-threaded code. The first thread to hit this will process the + * work pool termination. Caller must have called @c wait() prior to calling this function to + * ensure that processing is complete. + * + * @param term_func Callable which executes the stage termination. + */ + void term(std::function term_func) + { + std::lock_guard lck(m_lock); + if (!m_term_done) + { + term_func(); + m_term_done = true; + } + } +}; + +/** + * @brief The astcenc compression context. + */ +struct astcenc_context +{ + /** @brief The context internal state. */ + astcenc_contexti context; + +#if !defined(ASTCENC_DECOMPRESS_ONLY) + /** @brief The parallel manager for averages computation. */ + ParallelManager manage_avg; + + /** @brief The parallel manager for compression. */ + ParallelManager manage_compress; +#endif + + /** @brief The parallel manager for decompression. */ + ParallelManager manage_decompress; +}; + +#endif diff --git a/Source/astcenc_mathlib.h b/Source/astcenc_mathlib.h index 67e989e7f5025852e1fc0995149fae22c85119f5..562d6597f2646a1e9b79192ff8283d063b994a11 100644 --- a/Source/astcenc_mathlib.h +++ b/Source/astcenc_mathlib.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -48,8 +48,6 @@ #define ASTCENC_SSE 42 #elif defined(__SSE4_1__) #define ASTCENC_SSE 41 - #elif defined(__SSE3__) - #define ASTCENC_SSE 30 #elif defined(__SSE2__) #define ASTCENC_SSE 20 #else @@ -75,10 +73,22 @@ #endif #endif +// Force vector-sized SIMD alignment #if ASTCENC_AVX #define ASTCENC_VECALIGN 32 -#else +#elif ASTCENC_SSE || ASTCENC_NEON #define ASTCENC_VECALIGN 16 +// Use default alignment for non-SIMD builds +#else + #define ASTCENC_VECALIGN 0 +#endif + +// C++11 states that alignas(0) should be ignored but GCC doesn't do +// this on some versions, so workaround and avoid emitting alignas(0) +#if ASTCENC_VECALIGN > 0 + #define ASTCENC_ALIGNAS alignas(ASTCENC_VECALIGN) +#else + #define ASTCENC_ALIGNAS #endif #if ASTCENC_SSE != 0 || ASTCENC_AVX != 0 || ASTCENC_POPCNT != 0 diff --git a/Source/astcenc_mathlib_softfloat.cpp b/Source/astcenc_mathlib_softfloat.cpp index d95fb9da367ab124679a3aae2d7cd0cd0d9bb210..42db7645496ec2d528e18c2ba4ff8068b2262954 100644 --- a/Source/astcenc_mathlib_softfloat.cpp +++ b/Source/astcenc_mathlib_softfloat.cpp @@ -273,7 +273,7 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) of the mantissa is set.) */ p = (inp - 1) & UINT32_C(0x800000); /* zero if INF, nonzero if NaN. */ - return ((inp + vlx) >> 13) | (p >> 14); + return static_cast(((inp + vlx) >> 13) | (p >> 14)); /* positive, exponent = 0, round-mode == UP; need to check whether number actually is 0. If it is, then return 0, else return 1 (the smallest representable nonzero number) @@ -283,7 +283,7 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) -inp will set the MSB if the input number is nonzero. Thus (-inp) >> 31 will turn into 0 if the input number is 0 and 1 otherwise. */ - return static_cast((-static_cast(inp))) >> 31; + return static_cast(static_cast((-static_cast(inp))) >> 31); /* negative, exponent = , round-mode == DOWN, need to check whether number is @@ -296,7 +296,7 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) the MSB set if it isn't. We then right-shift the value by 31 places to get a value that is 0 if the input is -0.0 and 1 otherwise. */ - return ((vlx - inp) >> 31) + UINT32_C(0x8000); + return static_cast(((vlx - inp) >> 31) + UINT32_C(0x8000)); /* for all other cases involving underflow/overflow, we don't need to @@ -330,7 +330,7 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) case 47: case 48: case 49: - return vlx; + return static_cast(vlx); /* for normal numbers, 'vlx' is the difference between the FP32 value of a number and the @@ -349,14 +349,14 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) case 36: case 37: case 39: - return (inp + vlx) >> 13; + return static_cast((inp + vlx) >> 13); /* normal number, round-to-nearest-even. */ case 33: case 38: p = inp + vlx; p += (inp >> 13) & 1; - return p >> 13; + return static_cast(p >> 13); /* the various denormal cases. These are not expected to be common, so their performance is a bit @@ -371,22 +371,22 @@ static sf16 sf32_to_sf16(sf32 inp, roundmode rmode) case 27: /* denormal, round towards zero. */ p = 126 - ((inp >> 23) & 0xFF); - return (((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000)) >> p) | vlx; + return static_cast((((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000)) >> p) | vlx); case 20: case 26: /* denormal, round away from zero. */ p = 126 - ((inp >> 23) & 0xFF); - return rtup_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx; + return static_cast(rtup_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx); case 24: case 29: /* denormal, round to nearest-away */ p = 126 - ((inp >> 23) & 0xFF); - return rtna_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx; + return static_cast(rtna_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx); case 23: case 28: /* denormal, round to nearest-even. */ p = 126 - ((inp >> 23) & 0xFF); - return rtne_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx; + return static_cast(rtne_shift32((inp & UINT32_C(0x7FFFFF)) + UINT32_C(0x800000), p) | vlx); } return 0; diff --git a/Source/astcenc_partition_tables.cpp b/Source/astcenc_partition_tables.cpp index 6b97e49d39c5b82f0d00f917ab14d04c32eec36f..cad42384d78f065edcea5dc1c68574ee6a592732 100644 --- a/Source/astcenc_partition_tables.cpp +++ b/Source/astcenc_partition_tables.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -21,6 +21,9 @@ #include "astcenc_internal.h" +/** @brief The number of 64-bit words needed to represent a canonical partition bit pattern. */ +#define BIT_PATTERN_WORDS (((ASTCENC_BLOCK_MAX_TEXELS * 2) + 63) / 64) + /** * @brief Generate a canonical representation of a partition pattern. * @@ -28,22 +31,22 @@ * the remapped texel index. Remapping ensures that we only match on the partition pattern, * independent of the partition order generated by the hash. * - * @param texel_count The number of texels in the block. - * @param partition_of_texel The partition assignments, in hash order. - * @param[out] bit_pattern The output bit pattern representation. + * @param texel_count The number of texels in the block. + * @param partition_of_texel The partition assignments, in hash order. + * @param[out] bit_pattern The output bit pattern representation. */ static void generate_canonical_partitioning( unsigned int texel_count, const uint8_t* partition_of_texel, - uint64_t bit_pattern[7] + uint64_t bit_pattern[BIT_PATTERN_WORDS] ) { // Clear the pattern - for (unsigned int i = 0; i < 7; i++) + for (unsigned int i = 0; i < BIT_PATTERN_WORDS; i++) { bit_pattern[i] = 0; } - // Store a mapping to reorder the raw partitions so that the the partitions are ordered such + // Store a mapping to reorder the raw partitions so that the partitions are ordered such // that the lowest texel index in partition N is smaller than the lowest texel index in // partition N + 1. int mapped_index[BLOCK_MAX_PARTITIONS]; @@ -76,19 +79,35 @@ static void generate_canonical_partitioning( * @return @c true if the patterns are the same, @c false otherwise. */ static bool compare_canonical_partitionings( - const uint64_t part1[7], - const uint64_t part2[7] + const uint64_t part1[BIT_PATTERN_WORDS], + const uint64_t part2[BIT_PATTERN_WORDS] ) { - return (part1[0] == part2[0]) && (part1[1] == part2[1]) && - (part1[2] == part2[2]) && (part1[3] == part2[3]) && - (part1[4] == part2[4]) && (part1[5] == part2[5]) && - (part1[6] == part2[6]); + return (part1[0] == part2[0]) +#if BIT_PATTERN_WORDS > 1 + && (part1[1] == part2[1]) +#endif +#if BIT_PATTERN_WORDS > 2 + && (part1[2] == part2[2]) +#endif +#if BIT_PATTERN_WORDS > 3 + && (part1[3] == part2[3]) +#endif +#if BIT_PATTERN_WORDS > 4 + && (part1[4] == part2[4]) +#endif +#if BIT_PATTERN_WORDS > 5 + && (part1[5] == part2[5]) +#endif +#if BIT_PATTERN_WORDS > 6 + && (part1[6] == part2[6]) +#endif + ; } /** * @brief Hash function used for procedural partition assignment. * - * @param inp The hash seed. + * @param inp The hash seed. * * @return The hashed value. */ @@ -116,7 +135,7 @@ static uint32_t hash52( * @param y The texel Y coordinate in the block. * @param z The texel Z coordinate in the block. * @param partition_count The total partition count of this encoding. - * @param small_block @c true if the blockhas fewer than 32 texels. + * @param small_block @c true if the block has fewer than 32 texels. * * @return The assigned partition index for this texel. */ @@ -316,25 +335,21 @@ static bool generate_one_partition_info_entry( } // Populate the partition index - pi.partition_index = partition_index; + pi.partition_index = static_cast(partition_index); // Populate the coverage bitmaps for 2/3/4 partitions uint64_t* bitmaps { nullptr }; - uint8_t* valids { nullptr }; if (partition_count == 2) { bitmaps = bsd.coverage_bitmaps_2[partition_remap_index]; - valids = bsd.partitioning_valid_2; } else if (partition_count == 3) { bitmaps = bsd.coverage_bitmaps_3[partition_remap_index]; - valids = bsd.partitioning_valid_3; } else if (partition_count == 4) { bitmaps = bsd.coverage_bitmaps_4[partition_remap_index]; - valids = bsd.partitioning_valid_4; } for (unsigned int i = 0; i < BLOCK_MAX_PARTITIONS; i++) @@ -347,9 +362,7 @@ static bool generate_one_partition_info_entry( if (bitmaps) { - // Populate the bitmap validity mask - valids[partition_remap_index] = valid ? 0 : 255; - + // Populate the partition coverage bitmap for (unsigned int i = 0; i < partition_count; i++) { bitmaps[i] = 0ULL; @@ -374,12 +387,6 @@ static void build_partition_table_for_one_partition_count( partition_info* ptab, uint64_t* canonical_patterns ) { - uint8_t* partitioning_valid[3] { - bsd.partitioning_valid_2, - bsd.partitioning_valid_3, - bsd.partitioning_valid_4 - }; - unsigned int next_index = 0; bsd.partitioning_count_selected[partition_count - 1] = 0; bsd.partitioning_count_all[partition_count - 1] = 0; @@ -397,7 +404,7 @@ static void build_partition_table_for_one_partition_count( // Tracker for things we built in the first iteration uint8_t build[BLOCK_MAX_PARTITIONINGS] { 0 }; - for (unsigned int x = 0; x < max_iter; x++) + for (unsigned int x = 0; x < max_iter; x++) { for (unsigned int i = 0; i < BLOCK_MAX_PARTITIONINGS; i++) { @@ -413,11 +420,11 @@ static void build_partition_table_for_one_partition_count( continue; } - generate_canonical_partitioning(bsd.texel_count, ptab[next_index].partition_of_texel, canonical_patterns + next_index * 7); + generate_canonical_partitioning(bsd.texel_count, ptab[next_index].partition_of_texel, canonical_patterns + next_index * BIT_PATTERN_WORDS); bool keep_canonical = true; for (unsigned int j = 0; j < next_index; j++) { - bool match = compare_canonical_partitionings(canonical_patterns + 7 * next_index, canonical_patterns + 7 * j); + bool match = compare_canonical_partitionings(canonical_patterns + next_index * BIT_PATTERN_WORDS, canonical_patterns + j * BIT_PATTERN_WORDS); if (match) { keep_canonical = false; @@ -429,7 +436,7 @@ static void build_partition_table_for_one_partition_count( { if (x == 0) { - bsd.partitioning_packed_index[partition_count - 2][i] = next_index; + bsd.partitioning_packed_index[partition_count - 2][i] = static_cast(next_index); bsd.partitioning_count_selected[partition_count - 1]++; bsd.partitioning_count_all[partition_count - 1]++; build[i] = 1; @@ -440,9 +447,8 @@ static void build_partition_table_for_one_partition_count( { if (x == 1) { - bsd.partitioning_packed_index[partition_count - 2][i] = next_index; + bsd.partitioning_packed_index[partition_count - 2][i] = static_cast(next_index); bsd.partitioning_count_all[partition_count - 1]++; - partitioning_valid[partition_count - 2][next_index] = 255; next_index++; } } @@ -465,7 +471,8 @@ void init_partition_tables( bsd.partitioning_count_selected[0] = 1; bsd.partitioning_count_all[0] = 1; - uint64_t* canonical_patterns = new uint64_t[BLOCK_MAX_PARTITIONINGS * 7]; + uint64_t* canonical_patterns = new uint64_t[BLOCK_MAX_PARTITIONINGS * BIT_PATTERN_WORDS]; + build_partition_table_for_one_partition_count(bsd, can_omit_partitionings, partition_count_cutoff, 2, par_tab2, canonical_patterns); build_partition_table_for_one_partition_count(bsd, can_omit_partitionings, partition_count_cutoff, 3, par_tab3, canonical_patterns); build_partition_table_for_one_partition_count(bsd, can_omit_partitionings, partition_count_cutoff, 4, par_tab4, canonical_patterns); diff --git a/Source/astcenc_percentile_tables.cpp b/Source/astcenc_percentile_tables.cpp index 57903050d1c02358e83b4e1c4caeaeffb24e23e5..448ddcc968e0dbac52b221329294871e36ed3b55 100644 --- a/Source/astcenc_percentile_tables.cpp +++ b/Source/astcenc_percentile_tables.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2022 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -33,42 +33,47 @@ struct packed_percentile_table { /** The block X dimension. */ uint8_t xdim; + /** The block Y dimension. */ uint8_t ydim; + /** The number of packed items in the 1 and 2 plane data. */ - uint16_t itemcounts[2]; + uint16_t item_count[2]; + /** The accumulator divisor for 1 and 2 plane data. */ uint16_t difscales[2]; - /** The initital accumulator values for 1 and 2 plane data. */ + + /** The initial accumulator values for 1 and 2 plane data. */ uint16_t initial_percs[2]; + /** The packed data for the 1 and 2 plane data. */ const uint16_t *items[2]; }; #if ASTCENC_BLOCK_MAX_TEXELS >= (4 * 4) static const uint16_t percentile_arr_4x4_0[61] { - 0x0242,0x7243,0x6A51,0x6A52,0x5A41,0x4A53,0x8851,0x3842, - 0x3852,0x3853,0x3043,0xFA33,0x1BDF,0x2022,0x1032,0x29CE, - 0x21DE,0x2823,0x0813,0x0A13,0x0A31,0x0A23,0x09CF,0x0833, - 0x0A32,0x01DF,0x0BDD,0x0BCF,0x0221,0x095F,0x0A01,0x0BDE, - 0x0BCD,0x0A22,0x09AF,0x0B5F,0x0B4D,0x0BCE,0x0BBF,0x0A11, - 0x01BF,0x0202,0x0B5D,0x1203,0x034E,0x0B8E,0x035E,0x0212, - 0x032E,0x0B4F,0x03AF,0x03AD,0x03BD,0x0BBE,0x03AE,0x039F, - 0x039E,0x033E,0x033F,0x038F,0x032F + 0x0242, 0x7243, 0x6A51, 0x6A52, 0x5A41, 0x4A53, 0x8851, 0x3842, + 0x3852, 0x3853, 0x3043, 0xFA33, 0x1BDF, 0x2022, 0x1032, 0x29CE, + 0x21DE, 0x2823, 0x0813, 0x0A13, 0x0A31, 0x0A23, 0x09CF, 0x0833, + 0x0A32, 0x01DF, 0x0BDD, 0x0BCF, 0x0221, 0x095F, 0x0A01, 0x0BDE, + 0x0BCD, 0x0A22, 0x09AF, 0x0B5F, 0x0B4D, 0x0BCE, 0x0BBF, 0x0A11, + 0x01BF, 0x0202, 0x0B5D, 0x1203, 0x034E, 0x0B8E, 0x035E, 0x0212, + 0x032E, 0x0B4F, 0x03AF, 0x03AD, 0x03BD, 0x0BBE, 0x03AE, 0x039F, + 0x039E, 0x033E, 0x033F, 0x038F, 0x032F }; static const uint16_t percentile_arr_4x4_1[84] { - 0x0452,0xFFAE,0x2433,0x1DDF,0x17CD,0x1E21,0x1C43,0x1442, - 0x3FBE,0x1FDD,0x0E31,0x0F4F,0x1423,0x0FBD,0x1451,0x0E03, - 0x05CF,0x0C32,0x0DDE,0x27AD,0x274E,0x0E02,0x0F5E,0x07AF, - 0x0F5F,0x0DCE,0x0C41,0x0422,0x0613,0x0E12,0x0611,0x0F3F, - 0x0601,0x0DBF,0x05DD,0x075D,0x0C02,0x054E,0x0431,0x0413, - 0x079F,0x05BE,0x0F4D,0x0403,0x05AF,0x055F,0x05AE,0x054F, - 0x0421,0x05BD,0x0DCD,0x0411,0x0412,0x055E,0x055D,0x073D, - 0x058E,0x072F,0x072D,0x079D,0x0D2E,0x0453,0x078D,0x053E, - 0x053F,0x059E,0x052F,0x058F,0x072E,0x078F,0x059F,0x078E, - 0x071F,0x073E,0x051F,0x070D,0x079E,0x070E,0x071D,0x0622, - 0x070F,0x071E,0x07BF,0x07CE + 0x0452, 0xFFAE, 0x2433, 0x1DDF, 0x17CD, 0x1E21, 0x1C43, 0x1442, + 0x3FBE, 0x1FDD, 0x0E31, 0x0F4F, 0x1423, 0x0FBD, 0x1451, 0x0E03, + 0x05CF, 0x0C32, 0x0DDE, 0x27AD, 0x274E, 0x0E02, 0x0F5E, 0x07AF, + 0x0F5F, 0x0DCE, 0x0C41, 0x0422, 0x0613, 0x0E12, 0x0611, 0x0F3F, + 0x0601, 0x0DBF, 0x05DD, 0x075D, 0x0C02, 0x054E, 0x0431, 0x0413, + 0x079F, 0x05BE, 0x0F4D, 0x0403, 0x05AF, 0x055F, 0x05AE, 0x054F, + 0x0421, 0x05BD, 0x0DCD, 0x0411, 0x0412, 0x055E, 0x055D, 0x073D, + 0x058E, 0x072F, 0x072D, 0x079D, 0x0D2E, 0x0453, 0x078D, 0x053E, + 0x053F, 0x059E, 0x052F, 0x058F, 0x072E, 0x078F, 0x059F, 0x078E, + 0x071F, 0x073E, 0x051F, 0x070D, 0x079E, 0x070E, 0x071D, 0x0622, + 0x070F, 0x071E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_4x4 { @@ -82,34 +87,34 @@ static const packed_percentile_table block_pcd_4x4 { #if ASTCENC_BLOCK_MAX_TEXELS >= (5 * 4) static const uint16_t percentile_arr_5x4_0[91] { - 0x02C1,0xFAD1,0xE8D3,0xDAC2,0xA8D2,0x70D1,0x50C2,0x80C3, - 0xD2C3,0x4AA2,0x2AD2,0x2242,0x2251,0x42A3,0x1A43,0x4A52, - 0x32B3,0x2A41,0x1042,0x1851,0x5892,0x10A2,0x2253,0x10B2, - 0x10B3,0x13DF,0x3083,0x08B1,0x1043,0x12B1,0x0AB2,0x1A93, - 0x1852,0x1A33,0x09CE,0x08A3,0x1022,0x1283,0x0853,0x1AA1, - 0x1093,0x11DE,0x135F,0x1832,0x195F,0x0A81,0x11CF,0x0A31, - 0x09DF,0x0B4D,0x09AF,0x03CF,0x0813,0x03DD,0x0A92,0x0A82, - 0x03CD,0x0023,0x0BDE,0x0BBF,0x1232,0x0221,0x0291,0x0A23, - 0x0833,0x035D,0x0BCE,0x01BF,0x0222,0x134E,0x0213,0x0A01, - 0x0B4F,0x0B5E,0x038E,0x032E,0x03AF,0x0A11,0x03AD,0x0203, - 0x0202,0x0BBD,0x033E,0x03AE,0x03BE,0x0212,0x033F,0x039E, - 0x039F,0x032F,0x038F + 0x02C1, 0xFAD1, 0xE8D3, 0xDAC2, 0xA8D2, 0x70D1, 0x50C2, 0x80C3, + 0xD2C3, 0x4AA2, 0x2AD2, 0x2242, 0x2251, 0x42A3, 0x1A43, 0x4A52, + 0x32B3, 0x2A41, 0x1042, 0x1851, 0x5892, 0x10A2, 0x2253, 0x10B2, + 0x10B3, 0x13DF, 0x3083, 0x08B1, 0x1043, 0x12B1, 0x0AB2, 0x1A93, + 0x1852, 0x1A33, 0x09CE, 0x08A3, 0x1022, 0x1283, 0x0853, 0x1AA1, + 0x1093, 0x11DE, 0x135F, 0x1832, 0x195F, 0x0A81, 0x11CF, 0x0A31, + 0x09DF, 0x0B4D, 0x09AF, 0x03CF, 0x0813, 0x03DD, 0x0A92, 0x0A82, + 0x03CD, 0x0023, 0x0BDE, 0x0BBF, 0x1232, 0x0221, 0x0291, 0x0A23, + 0x0833, 0x035D, 0x0BCE, 0x01BF, 0x0222, 0x134E, 0x0213, 0x0A01, + 0x0B4F, 0x0B5E, 0x038E, 0x032E, 0x03AF, 0x0A11, 0x03AD, 0x0203, + 0x0202, 0x0BBD, 0x033E, 0x03AE, 0x03BE, 0x0212, 0x033F, 0x039E, + 0x039F, 0x032F, 0x038F }; static const uint16_t percentile_arr_5x4_1[104] { - 0x0433,0xB621,0x5452,0x4443,0x7FAE,0xFCA3,0x7CC2,0x24B2, - 0x45DF,0x44B3,0x7631,0x27CD,0x1CD1,0x1E03,0x4FBE,0x774F, - 0x1C42,0x7691,0x24A2,0x2681,0x3C23,0x3C93,0x0FBD,0x1C32, - 0x1E82,0x1E12,0x0F4E,0x1602,0x0FAD,0x0C51,0x1FDD,0x0E13, - 0x0DCF,0x175E,0x0C22,0x175F,0x15DE,0x0CB1,0x17AF,0x1CC1, - 0x1F3F,0x1483,0x0441,0x0C91,0x04D2,0x0DCE,0x154E,0x079F, - 0x0CA1,0x0F5D,0x0431,0x15DD,0x05BF,0x0C92,0x0611,0x0C82, - 0x0402,0x074D,0x0DBD,0x055E,0x05BE,0x0DCD,0x0421,0x05AF, - 0x0403,0x0D4F,0x055F,0x05AE,0x0413,0x0E01,0x055D,0x073D, - 0x0C12,0x0692,0x0411,0x072D,0x078D,0x079D,0x058E,0x0D2E, - 0x0453,0x072F,0x059E,0x052F,0x071F,0x053F,0x053E,0x078F, - 0x058F,0x051F,0x0F2E,0x059F,0x078E,0x073E,0x071D,0x070D, - 0x070E,0x079E,0x0622,0x0683,0x070F,0x071E,0x07BF,0x07CE + 0x0433, 0xB621, 0x5452, 0x4443, 0x7FAE, 0xFCA3, 0x7CC2, 0x24B2, + 0x45DF, 0x44B3, 0x7631, 0x27CD, 0x1CD1, 0x1E03, 0x4FBE, 0x774F, + 0x1C42, 0x7691, 0x24A2, 0x2681, 0x3C23, 0x3C93, 0x0FBD, 0x1C32, + 0x1E82, 0x1E12, 0x0F4E, 0x1602, 0x0FAD, 0x0C51, 0x1FDD, 0x0E13, + 0x0DCF, 0x175E, 0x0C22, 0x175F, 0x15DE, 0x0CB1, 0x17AF, 0x1CC1, + 0x1F3F, 0x1483, 0x0441, 0x0C91, 0x04D2, 0x0DCE, 0x154E, 0x079F, + 0x0CA1, 0x0F5D, 0x0431, 0x15DD, 0x05BF, 0x0C92, 0x0611, 0x0C82, + 0x0402, 0x074D, 0x0DBD, 0x055E, 0x05BE, 0x0DCD, 0x0421, 0x05AF, + 0x0403, 0x0D4F, 0x055F, 0x05AE, 0x0413, 0x0E01, 0x055D, 0x073D, + 0x0C12, 0x0692, 0x0411, 0x072D, 0x078D, 0x079D, 0x058E, 0x0D2E, + 0x0453, 0x072F, 0x059E, 0x052F, 0x071F, 0x053F, 0x053E, 0x078F, + 0x058F, 0x051F, 0x0F2E, 0x059F, 0x078E, 0x073E, 0x071D, 0x070D, + 0x070E, 0x079E, 0x0622, 0x0683, 0x070F, 0x071E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_5x4 { @@ -123,42 +128,42 @@ static const packed_percentile_table block_pcd_5x4 { #if ASTCENC_BLOCK_MAX_TEXELS >= (5 * 5) static const uint16_t percentile_arr_5x5_0[129] { - 0x00F3,0xF8F2,0x70E3,0x62E1,0x60E1,0x4AC1,0x3261,0x38D3, - 0x3271,0x5AF1,0x5873,0x2AD1,0x28E2,0x28F1,0x2262,0x9AC2, - 0x18D2,0x1072,0x1071,0x22A2,0x2062,0x1A51,0x10C2,0x0892, - 0x08D1,0x1AA3,0x23EE,0x08C3,0x0BEF,0x2242,0x0863,0x0AB3, - 0x0BFF,0x0A93,0x08A2,0x0A41,0x1083,0x0842,0x10B3,0x21EE, - 0x10B2,0x00B1,0x1263,0x12C3,0x0A83,0x0851,0x11FE,0x0253, - 0x09FD,0x0A72,0x09FF,0x1AB2,0x0BDF,0x0A33,0x0243,0x0B7F, - 0x0AB1,0x12D2,0x0252,0x096F,0x00A3,0x0893,0x0822,0x0843, - 0x097E,0x097F,0x01EF,0x09CE,0x03FE,0x0A81,0x036F,0x0052, - 0x13FD,0x0AA1,0x1853,0x036D,0x0A92,0x0832,0x01DE,0x0A82, - 0x0BED,0x0231,0x0BBF,0x03DD,0x0B6E,0x01AF,0x0813,0x0023, - 0x0A91,0x015F,0x037E,0x01CF,0x0232,0x0BCD,0x0221,0x0BDE, - 0x0213,0x035F,0x0B7D,0x0223,0x01BF,0x0BCF,0x01DF,0x0033, - 0x0222,0x03CE,0x0A01,0x03AF,0x034D,0x0B8E,0x032E,0x0203, - 0x0211,0x0202,0x0B5D,0x03AD,0x034E,0x03AE,0x034F,0x033F, - 0x039F,0x03BD,0x03BE,0x035E,0x0212,0x033E,0x039E,0x032F, + 0x00F3, 0xF8F2, 0x70E3, 0x62E1, 0x60E1, 0x4AC1, 0x3261, 0x38D3, + 0x3271, 0x5AF1, 0x5873, 0x2AD1, 0x28E2, 0x28F1, 0x2262, 0x9AC2, + 0x18D2, 0x1072, 0x1071, 0x22A2, 0x2062, 0x1A51, 0x10C2, 0x0892, + 0x08D1, 0x1AA3, 0x23EE, 0x08C3, 0x0BEF, 0x2242, 0x0863, 0x0AB3, + 0x0BFF, 0x0A93, 0x08A2, 0x0A41, 0x1083, 0x0842, 0x10B3, 0x21EE, + 0x10B2, 0x00B1, 0x1263, 0x12C3, 0x0A83, 0x0851, 0x11FE, 0x0253, + 0x09FD, 0x0A72, 0x09FF, 0x1AB2, 0x0BDF, 0x0A33, 0x0243, 0x0B7F, + 0x0AB1, 0x12D2, 0x0252, 0x096F, 0x00A3, 0x0893, 0x0822, 0x0843, + 0x097E, 0x097F, 0x01EF, 0x09CE, 0x03FE, 0x0A81, 0x036F, 0x0052, + 0x13FD, 0x0AA1, 0x1853, 0x036D, 0x0A92, 0x0832, 0x01DE, 0x0A82, + 0x0BED, 0x0231, 0x0BBF, 0x03DD, 0x0B6E, 0x01AF, 0x0813, 0x0023, + 0x0A91, 0x015F, 0x037E, 0x01CF, 0x0232, 0x0BCD, 0x0221, 0x0BDE, + 0x0213, 0x035F, 0x0B7D, 0x0223, 0x01BF, 0x0BCF, 0x01DF, 0x0033, + 0x0222, 0x03CE, 0x0A01, 0x03AF, 0x034D, 0x0B8E, 0x032E, 0x0203, + 0x0211, 0x0202, 0x0B5D, 0x03AD, 0x034E, 0x03AE, 0x034F, 0x033F, + 0x039F, 0x03BD, 0x03BE, 0x035E, 0x0212, 0x033E, 0x039E, 0x032F, 0x038F }; static const uint16_t percentile_arr_5x5_1[126] { - 0x0443,0x6452,0xFE21,0x27AE,0x2433,0x1FCD,0x25DF,0x6CC2, - 0x2C62,0x1F4F,0x4C42,0x1FBE,0x0DEF,0x34A3,0x0E03,0x54B2, - 0x1F7D,0x17DD,0x0DFF,0x0CD1,0x0E31,0x0C71,0x1CF1,0x15FE, - 0x1691,0x1681,0x24B3,0x174E,0x0F6E,0x0493,0x175E,0x1C51, - 0x17BD,0x076D,0x2CA2,0x05EE,0x1472,0x2423,0x0DCF,0x0432, - 0x15DE,0x0612,0x0CD2,0x0682,0x0F5F,0x07AD,0x0602,0x0CE1, - 0x0C91,0x0FAF,0x073F,0x0E13,0x0D7F,0x0DCE,0x0422,0x0D7D, - 0x0441,0x05FD,0x0CB1,0x0C83,0x04C1,0x0461,0x0F9F,0x0DDD, - 0x056E,0x0C92,0x0482,0x0431,0x05ED,0x0D6F,0x075D,0x0402, - 0x057E,0x0DBF,0x04A1,0x054E,0x0F4D,0x0403,0x05CD,0x0453, - 0x05AE,0x0421,0x0F1F,0x05BE,0x0601,0x0611,0x05BD,0x05AF, - 0x078D,0x072D,0x073D,0x055E,0x0F9D,0x0411,0x0413,0x0412, - 0x055F,0x077E,0x055D,0x052E,0x054F,0x053E,0x058E,0x078F, - 0x059E,0x071D,0x0E92,0x053F,0x059F,0x051F,0x072F,0x052F, - 0x070D,0x079E,0x058F,0x072E,0x070E,0x078E,0x070F,0x073E, - 0x0622,0x0683,0x071E,0x076F,0x07BF,0x07CE + 0x0443, 0x6452, 0xFE21, 0x27AE, 0x2433, 0x1FCD, 0x25DF, 0x6CC2, + 0x2C62, 0x1F4F, 0x4C42, 0x1FBE, 0x0DEF, 0x34A3, 0x0E03, 0x54B2, + 0x1F7D, 0x17DD, 0x0DFF, 0x0CD1, 0x0E31, 0x0C71, 0x1CF1, 0x15FE, + 0x1691, 0x1681, 0x24B3, 0x174E, 0x0F6E, 0x0493, 0x175E, 0x1C51, + 0x17BD, 0x076D, 0x2CA2, 0x05EE, 0x1472, 0x2423, 0x0DCF, 0x0432, + 0x15DE, 0x0612, 0x0CD2, 0x0682, 0x0F5F, 0x07AD, 0x0602, 0x0CE1, + 0x0C91, 0x0FAF, 0x073F, 0x0E13, 0x0D7F, 0x0DCE, 0x0422, 0x0D7D, + 0x0441, 0x05FD, 0x0CB1, 0x0C83, 0x04C1, 0x0461, 0x0F9F, 0x0DDD, + 0x056E, 0x0C92, 0x0482, 0x0431, 0x05ED, 0x0D6F, 0x075D, 0x0402, + 0x057E, 0x0DBF, 0x04A1, 0x054E, 0x0F4D, 0x0403, 0x05CD, 0x0453, + 0x05AE, 0x0421, 0x0F1F, 0x05BE, 0x0601, 0x0611, 0x05BD, 0x05AF, + 0x078D, 0x072D, 0x073D, 0x055E, 0x0F9D, 0x0411, 0x0413, 0x0412, + 0x055F, 0x077E, 0x055D, 0x052E, 0x054F, 0x053E, 0x058E, 0x078F, + 0x059E, 0x071D, 0x0E92, 0x053F, 0x059F, 0x051F, 0x072F, 0x052F, + 0x070D, 0x079E, 0x058F, 0x072E, 0x070E, 0x078E, 0x070F, 0x073E, + 0x0622, 0x0683, 0x071E, 0x076F, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_5x5 { @@ -172,48 +177,48 @@ static const packed_percentile_table block_pcd_5x5 { #if ASTCENC_BLOCK_MAX_TEXELS >= (6 * 5) static const uint16_t percentile_arr_6x5_0[165] { - 0x0163,0xF8F3,0x9962,0x8972,0x7961,0x7173,0x6953,0x5943, - 0x4B41,0x3AE1,0x38E3,0x6971,0x32C1,0x28D3,0x2A61,0xC8F2, - 0x2271,0x4873,0x5B21,0x3AD1,0x1B13,0x1952,0x1B51,0x12F1, - 0x1A62,0x1322,0x1951,0x10E2,0x1B31,0x20F1,0x2102,0x2072, - 0x10D2,0x1142,0x2912,0x3871,0x2BEE,0x0862,0x1123,0x0AC2, - 0x12A2,0x0A51,0x1922,0x0941,0x1BEF,0x0B42,0x08D1,0x13FF, - 0x1933,0x08C3,0x08C2,0x1131,0x08E1,0x2903,0x0863,0x0B32, - 0x1132,0x1AC3,0x0A42,0x1A41,0x0042,0x21EE,0x09FF,0x03DF, - 0x0AA3,0x11FE,0x02B3,0x0B11,0x10B3,0x0B03,0x11FD,0x0913, - 0x0A53,0x037F,0x1263,0x0051,0x0A33,0x0B01,0x016F,0x0A72, - 0x1312,0x08A2,0x10B1,0x0BFE,0x11EF,0x0B02,0x0A52,0x0043, - 0x0822,0x01CE,0x0A43,0x097F,0x036F,0x08B2,0x03FD,0x0A83, - 0x0B33,0x0AB1,0x017E,0x0B23,0x0852,0x02D2,0x0BBF,0x0BDD, - 0x03ED,0x0AB2,0x02A1,0x0853,0x036D,0x0892,0x0032,0x0A31, - 0x0083,0x09DE,0x0A93,0x08A3,0x1213,0x0BDE,0x03CD,0x036E, - 0x037E,0x0A21,0x0023,0x0BCF,0x01CF,0x0013,0x01AF,0x0A92, - 0x0232,0x035F,0x0093,0x0B7D,0x015F,0x0282,0x01BF,0x09DF, - 0x03CE,0x0223,0x0833,0x0222,0x03AF,0x0A01,0x0291,0x0B4D, - 0x032E,0x038E,0x0203,0x0281,0x035D,0x03AD,0x0B9F,0x0202, - 0x034F,0x03BE,0x0211,0x03AE,0x03BD,0x0212,0x034E,0x033F, - 0x033E,0x035E,0x039E,0x032F,0x038F + 0x0163, 0xF8F3, 0x9962, 0x8972, 0x7961, 0x7173, 0x6953, 0x5943, + 0x4B41, 0x3AE1, 0x38E3, 0x6971, 0x32C1, 0x28D3, 0x2A61, 0xC8F2, + 0x2271, 0x4873, 0x5B21, 0x3AD1, 0x1B13, 0x1952, 0x1B51, 0x12F1, + 0x1A62, 0x1322, 0x1951, 0x10E2, 0x1B31, 0x20F1, 0x2102, 0x2072, + 0x10D2, 0x1142, 0x2912, 0x3871, 0x2BEE, 0x0862, 0x1123, 0x0AC2, + 0x12A2, 0x0A51, 0x1922, 0x0941, 0x1BEF, 0x0B42, 0x08D1, 0x13FF, + 0x1933, 0x08C3, 0x08C2, 0x1131, 0x08E1, 0x2903, 0x0863, 0x0B32, + 0x1132, 0x1AC3, 0x0A42, 0x1A41, 0x0042, 0x21EE, 0x09FF, 0x03DF, + 0x0AA3, 0x11FE, 0x02B3, 0x0B11, 0x10B3, 0x0B03, 0x11FD, 0x0913, + 0x0A53, 0x037F, 0x1263, 0x0051, 0x0A33, 0x0B01, 0x016F, 0x0A72, + 0x1312, 0x08A2, 0x10B1, 0x0BFE, 0x11EF, 0x0B02, 0x0A52, 0x0043, + 0x0822, 0x01CE, 0x0A43, 0x097F, 0x036F, 0x08B2, 0x03FD, 0x0A83, + 0x0B33, 0x0AB1, 0x017E, 0x0B23, 0x0852, 0x02D2, 0x0BBF, 0x0BDD, + 0x03ED, 0x0AB2, 0x02A1, 0x0853, 0x036D, 0x0892, 0x0032, 0x0A31, + 0x0083, 0x09DE, 0x0A93, 0x08A3, 0x1213, 0x0BDE, 0x03CD, 0x036E, + 0x037E, 0x0A21, 0x0023, 0x0BCF, 0x01CF, 0x0013, 0x01AF, 0x0A92, + 0x0232, 0x035F, 0x0093, 0x0B7D, 0x015F, 0x0282, 0x01BF, 0x09DF, + 0x03CE, 0x0223, 0x0833, 0x0222, 0x03AF, 0x0A01, 0x0291, 0x0B4D, + 0x032E, 0x038E, 0x0203, 0x0281, 0x035D, 0x03AD, 0x0B9F, 0x0202, + 0x034F, 0x03BE, 0x0211, 0x03AE, 0x03BD, 0x0212, 0x034E, 0x033F, + 0x033E, 0x035E, 0x039E, 0x032F, 0x038F }; static const uint16_t percentile_arr_6x5_1[145] { - 0x0443,0xEFAE,0x2CC2,0x2E21,0x2C52,0x7C33,0x47CD,0x25DF, - 0x3CA3,0xFFBE,0x2551,0x24B3,0x474F,0x1513,0x2691,0x1603, - 0x1462,0x1D32,0x14B2,0x5442,0x2CD2,0x35EF,0x0CD1,0x3D22, - 0x17BD,0x0FDD,0x0DFF,0x2631,0x177D,0x0CF1,0x1E81,0x0E82, - 0x1DFE,0x0F5E,0x0701,0x2CA2,0x1D03,0x0F4E,0x1471,0x0C51, - 0x1F6E,0x2FAF,0x0561,0x0C72,0x176D,0x0FAD,0x0DEE,0x05CF, - 0x0E13,0x0F5F,0x0E12,0x0C23,0x1E02,0x1D12,0x0CB1,0x0C32, - 0x0C93,0x15DE,0x0F9F,0x0F3F,0x0D41,0x0C41,0x0CC1,0x0D31, - 0x0C22,0x05FD,0x057F,0x0D01,0x0461,0x04E1,0x0D7D,0x05CE, - 0x0502,0x0C31,0x05ED,0x05DD,0x0511,0x0F11,0x0491,0x0D6F, - 0x0521,0x056E,0x0C83,0x0D23,0x04A1,0x0C02,0x075D,0x05BF, - 0x0C21,0x079D,0x0482,0x05BD,0x0DBE,0x05CD,0x054E,0x057E, - 0x0DAE,0x074D,0x078D,0x0542,0x0492,0x05AF,0x0611,0x0F3D, - 0x0601,0x071F,0x055E,0x059E,0x0571,0x054F,0x0412,0x0453, - 0x058E,0x0413,0x0D3E,0x077E,0x072D,0x052E,0x059F,0x055D, - 0x072F,0x0403,0x0411,0x058F,0x055F,0x0692,0x078E,0x053F, - 0x0D2F,0x078F,0x070D,0x071D,0x051F,0x072E,0x079E,0x070E, - 0x070F,0x073E,0x0622,0x0683,0x0702,0x071E,0x076F,0x07BF, + 0x0443, 0xEFAE, 0x2CC2, 0x2E21, 0x2C52, 0x7C33, 0x47CD, 0x25DF, + 0x3CA3, 0xFFBE, 0x2551, 0x24B3, 0x474F, 0x1513, 0x2691, 0x1603, + 0x1462, 0x1D32, 0x14B2, 0x5442, 0x2CD2, 0x35EF, 0x0CD1, 0x3D22, + 0x17BD, 0x0FDD, 0x0DFF, 0x2631, 0x177D, 0x0CF1, 0x1E81, 0x0E82, + 0x1DFE, 0x0F5E, 0x0701, 0x2CA2, 0x1D03, 0x0F4E, 0x1471, 0x0C51, + 0x1F6E, 0x2FAF, 0x0561, 0x0C72, 0x176D, 0x0FAD, 0x0DEE, 0x05CF, + 0x0E13, 0x0F5F, 0x0E12, 0x0C23, 0x1E02, 0x1D12, 0x0CB1, 0x0C32, + 0x0C93, 0x15DE, 0x0F9F, 0x0F3F, 0x0D41, 0x0C41, 0x0CC1, 0x0D31, + 0x0C22, 0x05FD, 0x057F, 0x0D01, 0x0461, 0x04E1, 0x0D7D, 0x05CE, + 0x0502, 0x0C31, 0x05ED, 0x05DD, 0x0511, 0x0F11, 0x0491, 0x0D6F, + 0x0521, 0x056E, 0x0C83, 0x0D23, 0x04A1, 0x0C02, 0x075D, 0x05BF, + 0x0C21, 0x079D, 0x0482, 0x05BD, 0x0DBE, 0x05CD, 0x054E, 0x057E, + 0x0DAE, 0x074D, 0x078D, 0x0542, 0x0492, 0x05AF, 0x0611, 0x0F3D, + 0x0601, 0x071F, 0x055E, 0x059E, 0x0571, 0x054F, 0x0412, 0x0453, + 0x058E, 0x0413, 0x0D3E, 0x077E, 0x072D, 0x052E, 0x059F, 0x055D, + 0x072F, 0x0403, 0x0411, 0x058F, 0x055F, 0x0692, 0x078E, 0x053F, + 0x0D2F, 0x078F, 0x070D, 0x071D, 0x051F, 0x072E, 0x079E, 0x070E, + 0x070F, 0x073E, 0x0622, 0x0683, 0x0702, 0x071E, 0x076F, 0x07BF, 0x07CE }; @@ -228,56 +233,56 @@ static const packed_percentile_table block_pcd_6x5 { #if ASTCENC_BLOCK_MAX_TEXELS >= (6 * 6) static const uint16_t percentile_arr_6x6_0[206] { - 0x006F,0xF908,0xF104,0xE918,0xE963,0xD114,0xB0F3,0xA07E, - 0x7972,0x705F,0x687F,0x6162,0x5953,0x586E,0x610C,0x524D, - 0x5973,0x9943,0x98E3,0x904F,0x8341,0x7AC1,0x3A61,0x70D3, - 0xA073,0x6AE1,0x30F2,0x3313,0x2B21,0x9A2E,0x4322,0x225D, - 0x2331,0x2271,0x22D1,0x1A2D,0x221F,0x22F1,0x1971,0x6952, - 0x1951,0x187D,0x18F1,0x1902,0x185E,0x1B51,0x105D,0x1A3D, - 0x30E2,0x10D2,0x1961,0x12A2,0x6072,0x3942,0x386D,0x33EE, - 0x104E,0x4923,0x101E,0x2122,0x1251,0x1141,0x182F,0x3133, - 0x080E,0x1262,0x123E,0x1B32,0x102E,0x1931,0x10D1,0x1912, - 0x0871,0x12C2,0x08C2,0x1103,0x0B03,0x1062,0x083D,0x08E1, - 0x1132,0x184D,0x0863,0x08C3,0x303F,0x083E,0x10B3,0x12A3, - 0x0BEF,0x0B11,0x1A42,0x2233,0x13FF,0x080F,0x0A41,0x0AC3, - 0x0842,0x1A63,0x0BDF,0x09FF,0x12B3,0x124E,0x0B12,0x0B42, - 0x0A2F,0x1253,0x0913,0x1051,0x0B01,0x120F,0x0B02,0x08A2, - 0x0BBF,0x00B1,0x22B1,0x01EE,0x1B33,0x0B23,0x0283,0x13FD, - 0x0AB2,0x11FD,0x09FE,0x0A43,0x08B2,0x0A1D,0x0A52,0x023F, - 0x101F,0x01CE,0x0A31,0x0BDD,0x0293,0x1822,0x12A1,0x03FE, - 0x121E,0x0843,0x0272,0x0B6F,0x0052,0x0A0D,0x0BED,0x12D2, - 0x1B7F,0x1053,0x0032,0x01DE,0x08A3,0x020E,0x0883,0x09EF, - 0x0892,0x0A21,0x03CD,0x0B5F,0x0213,0x0A32,0x016F,0x1292, - 0x03DE,0x017E,0x0BAF,0x0223,0x1093,0x0BCF,0x037E,0x01DF, - 0x09CF,0x015F,0x09AF,0x0023,0x01BF,0x0222,0x0282,0x03CE, - 0x1013,0x036E,0x097F,0x0033,0x0A01,0x0B6D,0x03BE,0x037D, - 0x0281,0x0BAE,0x0203,0x032E,0x034D,0x034F,0x0291,0x0211, - 0x038E,0x03BD,0x039E,0x0BAD,0x033E,0x034E,0x039F,0x0202, - 0x035D,0x0212,0x033F,0x035E,0x038F,0x032F + 0x006F, 0xF908, 0xF104, 0xE918, 0xE963, 0xD114, 0xB0F3, 0xA07E, + 0x7972, 0x705F, 0x687F, 0x6162, 0x5953, 0x586E, 0x610C, 0x524D, + 0x5973, 0x9943, 0x98E3, 0x904F, 0x8341, 0x7AC1, 0x3A61, 0x70D3, + 0xA073, 0x6AE1, 0x30F2, 0x3313, 0x2B21, 0x9A2E, 0x4322, 0x225D, + 0x2331, 0x2271, 0x22D1, 0x1A2D, 0x221F, 0x22F1, 0x1971, 0x6952, + 0x1951, 0x187D, 0x18F1, 0x1902, 0x185E, 0x1B51, 0x105D, 0x1A3D, + 0x30E2, 0x10D2, 0x1961, 0x12A2, 0x6072, 0x3942, 0x386D, 0x33EE, + 0x104E, 0x4923, 0x101E, 0x2122, 0x1251, 0x1141, 0x182F, 0x3133, + 0x080E, 0x1262, 0x123E, 0x1B32, 0x102E, 0x1931, 0x10D1, 0x1912, + 0x0871, 0x12C2, 0x08C2, 0x1103, 0x0B03, 0x1062, 0x083D, 0x08E1, + 0x1132, 0x184D, 0x0863, 0x08C3, 0x303F, 0x083E, 0x10B3, 0x12A3, + 0x0BEF, 0x0B11, 0x1A42, 0x2233, 0x13FF, 0x080F, 0x0A41, 0x0AC3, + 0x0842, 0x1A63, 0x0BDF, 0x09FF, 0x12B3, 0x124E, 0x0B12, 0x0B42, + 0x0A2F, 0x1253, 0x0913, 0x1051, 0x0B01, 0x120F, 0x0B02, 0x08A2, + 0x0BBF, 0x00B1, 0x22B1, 0x01EE, 0x1B33, 0x0B23, 0x0283, 0x13FD, + 0x0AB2, 0x11FD, 0x09FE, 0x0A43, 0x08B2, 0x0A1D, 0x0A52, 0x023F, + 0x101F, 0x01CE, 0x0A31, 0x0BDD, 0x0293, 0x1822, 0x12A1, 0x03FE, + 0x121E, 0x0843, 0x0272, 0x0B6F, 0x0052, 0x0A0D, 0x0BED, 0x12D2, + 0x1B7F, 0x1053, 0x0032, 0x01DE, 0x08A3, 0x020E, 0x0883, 0x09EF, + 0x0892, 0x0A21, 0x03CD, 0x0B5F, 0x0213, 0x0A32, 0x016F, 0x1292, + 0x03DE, 0x017E, 0x0BAF, 0x0223, 0x1093, 0x0BCF, 0x037E, 0x01DF, + 0x09CF, 0x015F, 0x09AF, 0x0023, 0x01BF, 0x0222, 0x0282, 0x03CE, + 0x1013, 0x036E, 0x097F, 0x0033, 0x0A01, 0x0B6D, 0x03BE, 0x037D, + 0x0281, 0x0BAE, 0x0203, 0x032E, 0x034D, 0x034F, 0x0291, 0x0211, + 0x038E, 0x03BD, 0x039E, 0x0BAD, 0x033E, 0x034E, 0x039F, 0x0202, + 0x035D, 0x0212, 0x033F, 0x035E, 0x038F, 0x032F }; static const uint16_t percentile_arr_6x6_1[164] { - 0x07AE,0x8443,0x7E21,0x77CD,0x6C62,0x9433,0x6452,0x34C2, - 0x5DDF,0xC7BE,0x25EF,0x24A3,0x3CF1,0xFDFF,0x177D,0x1F4F, - 0xC551,0x5CB3,0x1532,0x1513,0x143E,0x245D,0x14B2,0x2472, - 0x14D2,0x1FBD,0x1631,0x2DFE,0x1691,0x17DD,0x2E03,0x376E, - 0x2442,0x0F6D,0x3C71,0x2CD1,0x2522,0x6C51,0x260D,0x17AF, - 0x0DEE,0x1C1F,0x2F01,0x142E,0x0CA2,0x0FAD,0x3D03,0x275E, - 0x1681,0x274E,0x1682,0x1C23,0x273F,0x0F5F,0x05DE,0x15FD, - 0x0DCF,0x1E02,0x04B1,0x144D,0x0E12,0x0D12,0x1CC1,0x0E13, - 0x1C6D,0x0C32,0x043D,0x0C61,0x0F9F,0x04E1,0x0DCE,0x0D41, - 0x1C93,0x0C22,0x061D,0x0D7F,0x0C41,0x0561,0x0531,0x0D21, - 0x0711,0x0C91,0x0501,0x0C1E,0x040F,0x15DD,0x0431,0x0C2F, - 0x057D,0x0C2D,0x0DBE,0x040E,0x0D02,0x0D11,0x054E,0x040D, - 0x0D23,0x0DBF,0x04A1,0x05ED,0x0C1D,0x05BD,0x072D,0x056E, - 0x0483,0x0F3D,0x0482,0x078D,0x0F5D,0x0453,0x0D9E,0x0C4E, - 0x05CD,0x079D,0x0402,0x05AE,0x0F1F,0x0542,0x074D,0x056F, - 0x0421,0x0D4F,0x0601,0x0571,0x0492,0x059F,0x053F,0x05AF, - 0x0611,0x055E,0x0D8E,0x053E,0x055D,0x047D,0x0411,0x052E, - 0x058F,0x051F,0x055F,0x0D7E,0x072F,0x052F,0x0412,0x078F, - 0x0403,0x077E,0x070D,0x070E,0x078E,0x0F1D,0x072E,0x0413, - 0x070F,0x0692,0x079E,0x060E,0x0622,0x0683,0x0702,0x071E, - 0x073E,0x076F,0x07BF,0x07CE + 0x07AE, 0x8443, 0x7E21, 0x77CD, 0x6C62, 0x9433, 0x6452, 0x34C2, + 0x5DDF, 0xC7BE, 0x25EF, 0x24A3, 0x3CF1, 0xFDFF, 0x177D, 0x1F4F, + 0xC551, 0x5CB3, 0x1532, 0x1513, 0x143E, 0x245D, 0x14B2, 0x2472, + 0x14D2, 0x1FBD, 0x1631, 0x2DFE, 0x1691, 0x17DD, 0x2E03, 0x376E, + 0x2442, 0x0F6D, 0x3C71, 0x2CD1, 0x2522, 0x6C51, 0x260D, 0x17AF, + 0x0DEE, 0x1C1F, 0x2F01, 0x142E, 0x0CA2, 0x0FAD, 0x3D03, 0x275E, + 0x1681, 0x274E, 0x1682, 0x1C23, 0x273F, 0x0F5F, 0x05DE, 0x15FD, + 0x0DCF, 0x1E02, 0x04B1, 0x144D, 0x0E12, 0x0D12, 0x1CC1, 0x0E13, + 0x1C6D, 0x0C32, 0x043D, 0x0C61, 0x0F9F, 0x04E1, 0x0DCE, 0x0D41, + 0x1C93, 0x0C22, 0x061D, 0x0D7F, 0x0C41, 0x0561, 0x0531, 0x0D21, + 0x0711, 0x0C91, 0x0501, 0x0C1E, 0x040F, 0x15DD, 0x0431, 0x0C2F, + 0x057D, 0x0C2D, 0x0DBE, 0x040E, 0x0D02, 0x0D11, 0x054E, 0x040D, + 0x0D23, 0x0DBF, 0x04A1, 0x05ED, 0x0C1D, 0x05BD, 0x072D, 0x056E, + 0x0483, 0x0F3D, 0x0482, 0x078D, 0x0F5D, 0x0453, 0x0D9E, 0x0C4E, + 0x05CD, 0x079D, 0x0402, 0x05AE, 0x0F1F, 0x0542, 0x074D, 0x056F, + 0x0421, 0x0D4F, 0x0601, 0x0571, 0x0492, 0x059F, 0x053F, 0x05AF, + 0x0611, 0x055E, 0x0D8E, 0x053E, 0x055D, 0x047D, 0x0411, 0x052E, + 0x058F, 0x051F, 0x055F, 0x0D7E, 0x072F, 0x052F, 0x0412, 0x078F, + 0x0403, 0x077E, 0x070D, 0x070E, 0x078E, 0x0F1D, 0x072E, 0x0413, + 0x070F, 0x0692, 0x079E, 0x060E, 0x0622, 0x0683, 0x0702, 0x071E, + 0x073E, 0x076F, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_6x6 { @@ -291,59 +296,59 @@ static const packed_percentile_table block_pcd_6x6 { #if ASTCENC_BLOCK_MAX_TEXELS >= (8 * 5) static const uint16_t percentile_arr_8x5_0[226] { - 0x0066,0xF865,0xE963,0xA856,0xA1F2,0x9875,0x91C3,0x91E2, - 0x80F3,0x8076,0x61E3,0x6153,0x5172,0x59D2,0x51D3,0x5047, - 0xA943,0x49B3,0x4846,0x4962,0xC037,0x4173,0x39F1,0x7027, - 0xA2C1,0x3AE1,0x9341,0x30D3,0x5225,0x2A61,0x33C1,0x28E3, - 0x53A1,0x49C2,0x2A06,0x4055,0x2006,0x21D1,0x2271,0x4321, - 0x3873,0x18F2,0x2015,0x1A15,0x1857,0x52D1,0x3045,0x4835, - 0x1952,0x29E1,0x3207,0x1036,0x1816,0x2A16,0x2971,0x13B1, - 0x2A17,0x2351,0x1025,0x1826,0x30E2,0x1262,0x20F1,0x1007, - 0x1072,0x1151,0x10D2,0x1235,0x1205,0x1062,0x4AF1,0x1251, - 0x0B31,0x1381,0x13EE,0x1B92,0x13EF,0x0942,0x1AA2,0x13FF, - 0x1161,0x0B93,0x19A2,0x11B1,0x08D1,0x12C2,0x0B13,0x1B22, - 0x2123,0x09A3,0x2071,0x1B7F,0x1817,0x0A42,0x10C2,0x1233, - 0x08C3,0x0A41,0x0B42,0x09C1,0x0933,0x1AB3,0x1382,0x1BDF, - 0x2122,0x0A53,0x0AC3,0x20E1,0x0941,0x0931,0x0042,0x0BA2, - 0x0AA3,0x0992,0x0863,0x08B3,0x11B2,0x0902,0x1283,0x09FF, - 0x0B83,0x0982,0x0932,0x0BFE,0x0B32,0x0BBF,0x11FE,0x036F, - 0x0851,0x08B1,0x18A2,0x11EE,0x0A52,0x0BB2,0x01FD,0x0A43, - 0x1A63,0x1193,0x0B91,0x0043,0x1231,0x0A26,0x0AB1,0x03FD, - 0x096F,0x00B2,0x0983,0x0A72,0x01CE,0x0BDD,0x0022,0x0B11, - 0x1213,0x0B6D,0x017E,0x1333,0x0112,0x0852,0x02D2,0x097F, - 0x01EF,0x0AB2,0x0293,0x0853,0x0BED,0x0B12,0x1303,0x02A1, - 0x0892,0x0032,0x0883,0x0B6E,0x0292,0x0A32,0x037E,0x0B23, - 0x0103,0x0A21,0x0B01,0x0302,0x0BCD,0x00A3,0x0BCF,0x0BDE, - 0x0113,0x01DE,0x0B5F,0x0013,0x0BAF,0x0223,0x0222,0x0A82, - 0x0833,0x0023,0x09CF,0x037D,0x01AF,0x095F,0x03CE,0x09DF, - 0x01BF,0x0893,0x0203,0x0201,0x0B4D,0x03BE,0x032E,0x03AE, - 0x0291,0x0A02,0x0211,0x039F,0x0281,0x038E,0x03AD,0x033F, - 0x035D,0x033E,0x034E,0x034F,0x0212,0x03BD,0x032F,0x035E, - 0x038F,0x039E + 0x0066, 0xF865, 0xE963, 0xA856, 0xA1F2, 0x9875, 0x91C3, 0x91E2, + 0x80F3, 0x8076, 0x61E3, 0x6153, 0x5172, 0x59D2, 0x51D3, 0x5047, + 0xA943, 0x49B3, 0x4846, 0x4962, 0xC037, 0x4173, 0x39F1, 0x7027, + 0xA2C1, 0x3AE1, 0x9341, 0x30D3, 0x5225, 0x2A61, 0x33C1, 0x28E3, + 0x53A1, 0x49C2, 0x2A06, 0x4055, 0x2006, 0x21D1, 0x2271, 0x4321, + 0x3873, 0x18F2, 0x2015, 0x1A15, 0x1857, 0x52D1, 0x3045, 0x4835, + 0x1952, 0x29E1, 0x3207, 0x1036, 0x1816, 0x2A16, 0x2971, 0x13B1, + 0x2A17, 0x2351, 0x1025, 0x1826, 0x30E2, 0x1262, 0x20F1, 0x1007, + 0x1072, 0x1151, 0x10D2, 0x1235, 0x1205, 0x1062, 0x4AF1, 0x1251, + 0x0B31, 0x1381, 0x13EE, 0x1B92, 0x13EF, 0x0942, 0x1AA2, 0x13FF, + 0x1161, 0x0B93, 0x19A2, 0x11B1, 0x08D1, 0x12C2, 0x0B13, 0x1B22, + 0x2123, 0x09A3, 0x2071, 0x1B7F, 0x1817, 0x0A42, 0x10C2, 0x1233, + 0x08C3, 0x0A41, 0x0B42, 0x09C1, 0x0933, 0x1AB3, 0x1382, 0x1BDF, + 0x2122, 0x0A53, 0x0AC3, 0x20E1, 0x0941, 0x0931, 0x0042, 0x0BA2, + 0x0AA3, 0x0992, 0x0863, 0x08B3, 0x11B2, 0x0902, 0x1283, 0x09FF, + 0x0B83, 0x0982, 0x0932, 0x0BFE, 0x0B32, 0x0BBF, 0x11FE, 0x036F, + 0x0851, 0x08B1, 0x18A2, 0x11EE, 0x0A52, 0x0BB2, 0x01FD, 0x0A43, + 0x1A63, 0x1193, 0x0B91, 0x0043, 0x1231, 0x0A26, 0x0AB1, 0x03FD, + 0x096F, 0x00B2, 0x0983, 0x0A72, 0x01CE, 0x0BDD, 0x0022, 0x0B11, + 0x1213, 0x0B6D, 0x017E, 0x1333, 0x0112, 0x0852, 0x02D2, 0x097F, + 0x01EF, 0x0AB2, 0x0293, 0x0853, 0x0BED, 0x0B12, 0x1303, 0x02A1, + 0x0892, 0x0032, 0x0883, 0x0B6E, 0x0292, 0x0A32, 0x037E, 0x0B23, + 0x0103, 0x0A21, 0x0B01, 0x0302, 0x0BCD, 0x00A3, 0x0BCF, 0x0BDE, + 0x0113, 0x01DE, 0x0B5F, 0x0013, 0x0BAF, 0x0223, 0x0222, 0x0A82, + 0x0833, 0x0023, 0x09CF, 0x037D, 0x01AF, 0x095F, 0x03CE, 0x09DF, + 0x01BF, 0x0893, 0x0203, 0x0201, 0x0B4D, 0x03BE, 0x032E, 0x03AE, + 0x0291, 0x0A02, 0x0211, 0x039F, 0x0281, 0x038E, 0x03AD, 0x033F, + 0x035D, 0x033E, 0x034E, 0x034F, 0x0212, 0x03BD, 0x032F, 0x035E, + 0x038F, 0x039E }; static const uint16_t percentile_arr_8x5_1[167] { - 0x0621,0xFCC2,0x3443,0xA433,0x5532,0x2551,0x6CA3,0x27AE, - 0x6452,0x8E03,0x3CB3,0x4DA2,0x6DDF,0x37CD,0x6F01,0x1691, - 0x2E82,0x27BE,0x1513,0x34D2,0x1D22,0x3E31,0x2593,0x2CB2, - 0x1C16,0x374F,0x0DD1,0x2583,0x6613,0x0CD1,0x0C35,0x1462, - 0x3E81,0x2612,0x2C42,0x3407,0x14A2,0x0E02,0x1CF1,0x0C06, - 0x17BD,0x0F7D,0x1D23,0x35B1,0x179F,0x0D92,0x0F5E,0x1451, - 0x04B1,0x1F6E,0x0DEF,0x0D31,0x374E,0x15C1,0x0541,0x2405, - 0x17AD,0x0471,0x1472,0x0DFE,0x0711,0x0FDD,0x0DFF,0x0432, - 0x1D82,0x0423,0x0F6D,0x07AF,0x0F5F,0x04C1,0x1542,0x0561, - 0x0DCF,0x1D03,0x1493,0x0422,0x0445,0x0D12,0x0C25,0x0415, - 0x0DA1,0x1591,0x0DEE,0x05DE,0x0C31,0x0491,0x0441,0x0D21, - 0x078D,0x057D,0x0C61,0x0F3F,0x0581,0x0D6E,0x0501,0x0CA1, - 0x04E1,0x0DFD,0x057F,0x0502,0x0511,0x0C82,0x0483,0x0C03, - 0x079D,0x0402,0x0DDD,0x0611,0x05AE,0x0DCE,0x056F,0x0421, - 0x057E,0x071F,0x0DBF,0x05BE,0x0412,0x059F,0x054E,0x077E, - 0x0C26,0x05ED,0x073D,0x0601,0x0492,0x0453,0x075D,0x058E, - 0x0F2D,0x05CD,0x0571,0x053E,0x0692,0x05BD,0x054F,0x055E, - 0x0411,0x0F1D,0x074D,0x059E,0x05AF,0x070D,0x053F,0x058F, - 0x0413,0x070F,0x055D,0x070E,0x078F,0x052E,0x072F,0x055F, - 0x078E,0x0F2E,0x052F,0x051F,0x0417,0x071E,0x0781,0x0622, - 0x0683,0x0702,0x073E,0x076F,0x079E,0x07BF,0x07CE + 0x0621, 0xFCC2, 0x3443, 0xA433, 0x5532, 0x2551, 0x6CA3, 0x27AE, + 0x6452, 0x8E03, 0x3CB3, 0x4DA2, 0x6DDF, 0x37CD, 0x6F01, 0x1691, + 0x2E82, 0x27BE, 0x1513, 0x34D2, 0x1D22, 0x3E31, 0x2593, 0x2CB2, + 0x1C16, 0x374F, 0x0DD1, 0x2583, 0x6613, 0x0CD1, 0x0C35, 0x1462, + 0x3E81, 0x2612, 0x2C42, 0x3407, 0x14A2, 0x0E02, 0x1CF1, 0x0C06, + 0x17BD, 0x0F7D, 0x1D23, 0x35B1, 0x179F, 0x0D92, 0x0F5E, 0x1451, + 0x04B1, 0x1F6E, 0x0DEF, 0x0D31, 0x374E, 0x15C1, 0x0541, 0x2405, + 0x17AD, 0x0471, 0x1472, 0x0DFE, 0x0711, 0x0FDD, 0x0DFF, 0x0432, + 0x1D82, 0x0423, 0x0F6D, 0x07AF, 0x0F5F, 0x04C1, 0x1542, 0x0561, + 0x0DCF, 0x1D03, 0x1493, 0x0422, 0x0445, 0x0D12, 0x0C25, 0x0415, + 0x0DA1, 0x1591, 0x0DEE, 0x05DE, 0x0C31, 0x0491, 0x0441, 0x0D21, + 0x078D, 0x057D, 0x0C61, 0x0F3F, 0x0581, 0x0D6E, 0x0501, 0x0CA1, + 0x04E1, 0x0DFD, 0x057F, 0x0502, 0x0511, 0x0C82, 0x0483, 0x0C03, + 0x079D, 0x0402, 0x0DDD, 0x0611, 0x05AE, 0x0DCE, 0x056F, 0x0421, + 0x057E, 0x071F, 0x0DBF, 0x05BE, 0x0412, 0x059F, 0x054E, 0x077E, + 0x0C26, 0x05ED, 0x073D, 0x0601, 0x0492, 0x0453, 0x075D, 0x058E, + 0x0F2D, 0x05CD, 0x0571, 0x053E, 0x0692, 0x05BD, 0x054F, 0x055E, + 0x0411, 0x0F1D, 0x074D, 0x059E, 0x05AF, 0x070D, 0x053F, 0x058F, + 0x0413, 0x070F, 0x055D, 0x070E, 0x078F, 0x052E, 0x072F, 0x055F, + 0x078E, 0x0F2E, 0x052F, 0x051F, 0x0417, 0x071E, 0x0781, 0x0622, + 0x0683, 0x0702, 0x073E, 0x076F, 0x079E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_8x5 { @@ -357,68 +362,68 @@ static const packed_percentile_table block_pcd_8x5 { #if ASTCENC_BLOCK_MAX_TEXELS >= (8 * 6) static const uint16_t percentile_arr_8x6_0[273] { - 0x0154,0xF944,0xE066,0xA128,0x9963,0x8118,0x806F,0x79F2, - 0x79E2,0x7108,0xD934,0x6056,0x69C3,0x60F3,0x5972,0x59E3, - 0x5075,0x91B3,0xC9D2,0x807E,0x385F,0x4153,0x3943,0x4162, - 0x3837,0x3847,0x7173,0x31D3,0x6948,0x3046,0x307F,0x5827, - 0x3114,0x32C1,0x3076,0x2A4D,0x58E3,0x306E,0x2924,0x2A61, - 0x29F1,0x50D3,0x704F,0x210C,0x2BA1,0x2225,0x2873,0x4865, - 0x2206,0x8341,0x2006,0x3B21,0x18F2,0x21C2,0x1A1F,0x23C1, - 0x3AE1,0x1855,0x19D1,0x1A15,0x3815,0x1207,0x1835,0x2A2E, - 0x1A16,0x1836,0x2271,0x2845,0x1A2D,0x11E1,0x1816,0x1171, - 0x2217,0x1952,0x12D1,0x3904,0x125D,0x4BB1,0x207D,0x10E2, - 0x1026,0x2025,0x12F1,0x28F1,0x105D,0x1235,0x12A2,0x1007, - 0x123D,0x1A05,0x1072,0x1331,0x101E,0x0951,0x10D2,0x1057, - 0x1B92,0x185E,0x1251,0x19A2,0x186D,0x0B81,0x2BEE,0x080E, - 0x1A33,0x1942,0x0B13,0x0B51,0x11A3,0x0923,0x2322,0x09B1, - 0x184E,0x1161,0x18D1,0x0933,0x0B93,0x4A62,0x1017,0x082F, - 0x0A42,0x0B82,0x0AA3,0x0A41,0x08C2,0x08B3,0x0A3E,0x22B3, - 0x0871,0x1BBF,0x09C1,0x0AC2,0x09B2,0x0BEF,0x082E,0x1062, - 0x0922,0x08C3,0x1063,0x0A53,0x0BDF,0x080F,0x0B42,0x0A83, - 0x084D,0x103F,0x0931,0x08E1,0x0A0F,0x1BA2,0x09FF,0x1332, - 0x03FF,0x0941,0x12C3,0x0A63,0x003D,0x0842,0x083E,0x0B83, - 0x0BB2,0x0A31,0x0932,0x1102,0x0992,0x0982,0x1051,0x08B1, - 0x0A2F,0x121E,0x02B1,0x0A4E,0x11EE,0x00A2,0x1022,0x0043, - 0x0A52,0x0A1D,0x0226,0x1193,0x03DD,0x08B2,0x0BFD,0x0A43, - 0x0A13,0x0AB2,0x01FD,0x09FE,0x020D,0x081F,0x0B33,0x0053, - 0x0B91,0x0293,0x0B11,0x0B7F,0x0AA1,0x0B03,0x0A0E,0x03FE, - 0x01CE,0x0B6F,0x0183,0x0912,0x023F,0x0852,0x0A21,0x0323, - 0x03ED,0x0A32,0x13AF,0x0272,0x08A3,0x0B12,0x0083,0x0832, - 0x13CD,0x0223,0x0A92,0x0092,0x0AD2,0x0301,0x0302,0x0BDE, - 0x0A22,0x01EF,0x0B5F,0x0103,0x0BCF,0x096F,0x017E,0x0113, - 0x01DE,0x0823,0x0282,0x0B6E,0x015F,0x0813,0x01AF,0x01CF, - 0x0B7E,0x0033,0x01DF,0x0BCE,0x01BF,0x036D,0x0A03,0x017F, - 0x03BE,0x0201,0x0893,0x038E,0x034D,0x03AE,0x0202,0x039F, - 0x0291,0x0A11,0x032E,0x033F,0x034F,0x0281,0x037D,0x03BD, - 0x0212,0x033E,0x035E,0x034E,0x035D,0x03AD,0x032F,0x038F, + 0x0154, 0xF944, 0xE066, 0xA128, 0x9963, 0x8118, 0x806F, 0x79F2, + 0x79E2, 0x7108, 0xD934, 0x6056, 0x69C3, 0x60F3, 0x5972, 0x59E3, + 0x5075, 0x91B3, 0xC9D2, 0x807E, 0x385F, 0x4153, 0x3943, 0x4162, + 0x3837, 0x3847, 0x7173, 0x31D3, 0x6948, 0x3046, 0x307F, 0x5827, + 0x3114, 0x32C1, 0x3076, 0x2A4D, 0x58E3, 0x306E, 0x2924, 0x2A61, + 0x29F1, 0x50D3, 0x704F, 0x210C, 0x2BA1, 0x2225, 0x2873, 0x4865, + 0x2206, 0x8341, 0x2006, 0x3B21, 0x18F2, 0x21C2, 0x1A1F, 0x23C1, + 0x3AE1, 0x1855, 0x19D1, 0x1A15, 0x3815, 0x1207, 0x1835, 0x2A2E, + 0x1A16, 0x1836, 0x2271, 0x2845, 0x1A2D, 0x11E1, 0x1816, 0x1171, + 0x2217, 0x1952, 0x12D1, 0x3904, 0x125D, 0x4BB1, 0x207D, 0x10E2, + 0x1026, 0x2025, 0x12F1, 0x28F1, 0x105D, 0x1235, 0x12A2, 0x1007, + 0x123D, 0x1A05, 0x1072, 0x1331, 0x101E, 0x0951, 0x10D2, 0x1057, + 0x1B92, 0x185E, 0x1251, 0x19A2, 0x186D, 0x0B81, 0x2BEE, 0x080E, + 0x1A33, 0x1942, 0x0B13, 0x0B51, 0x11A3, 0x0923, 0x2322, 0x09B1, + 0x184E, 0x1161, 0x18D1, 0x0933, 0x0B93, 0x4A62, 0x1017, 0x082F, + 0x0A42, 0x0B82, 0x0AA3, 0x0A41, 0x08C2, 0x08B3, 0x0A3E, 0x22B3, + 0x0871, 0x1BBF, 0x09C1, 0x0AC2, 0x09B2, 0x0BEF, 0x082E, 0x1062, + 0x0922, 0x08C3, 0x1063, 0x0A53, 0x0BDF, 0x080F, 0x0B42, 0x0A83, + 0x084D, 0x103F, 0x0931, 0x08E1, 0x0A0F, 0x1BA2, 0x09FF, 0x1332, + 0x03FF, 0x0941, 0x12C3, 0x0A63, 0x003D, 0x0842, 0x083E, 0x0B83, + 0x0BB2, 0x0A31, 0x0932, 0x1102, 0x0992, 0x0982, 0x1051, 0x08B1, + 0x0A2F, 0x121E, 0x02B1, 0x0A4E, 0x11EE, 0x00A2, 0x1022, 0x0043, + 0x0A52, 0x0A1D, 0x0226, 0x1193, 0x03DD, 0x08B2, 0x0BFD, 0x0A43, + 0x0A13, 0x0AB2, 0x01FD, 0x09FE, 0x020D, 0x081F, 0x0B33, 0x0053, + 0x0B91, 0x0293, 0x0B11, 0x0B7F, 0x0AA1, 0x0B03, 0x0A0E, 0x03FE, + 0x01CE, 0x0B6F, 0x0183, 0x0912, 0x023F, 0x0852, 0x0A21, 0x0323, + 0x03ED, 0x0A32, 0x13AF, 0x0272, 0x08A3, 0x0B12, 0x0083, 0x0832, + 0x13CD, 0x0223, 0x0A92, 0x0092, 0x0AD2, 0x0301, 0x0302, 0x0BDE, + 0x0A22, 0x01EF, 0x0B5F, 0x0103, 0x0BCF, 0x096F, 0x017E, 0x0113, + 0x01DE, 0x0823, 0x0282, 0x0B6E, 0x015F, 0x0813, 0x01AF, 0x01CF, + 0x0B7E, 0x0033, 0x01DF, 0x0BCE, 0x01BF, 0x036D, 0x0A03, 0x017F, + 0x03BE, 0x0201, 0x0893, 0x038E, 0x034D, 0x03AE, 0x0202, 0x039F, + 0x0291, 0x0A11, 0x032E, 0x033F, 0x034F, 0x0281, 0x037D, 0x03BD, + 0x0212, 0x033E, 0x035E, 0x034E, 0x035D, 0x03AD, 0x032F, 0x038F, 0x039E }; static const uint16_t percentile_arr_8x6_1[186] { - 0x0621,0xFC33,0x37AE,0x1CC2,0x2C43,0xAD32,0x34A3,0x4551, - 0x6452,0x5C62,0x1FCD,0x14F1,0x4CB3,0x24D2,0x15DF,0x0FBE, - 0x2603,0x3DA2,0x2E31,0x25D1,0x25EF,0x0D22,0x2E91,0x1E82, - 0x0FBD,0x1513,0x0CB2,0x0CD1,0x0F4F,0x1F7D,0x1701,0x0C16, - 0x2593,0x2C42,0x0C72,0x14A2,0x0F6E,0x0C35,0x0C71,0x0D83, - 0x0C07,0x1DFF,0x043E,0x1613,0x07DD,0x0FAD,0x1451,0x076D, - 0x0E81,0x05FE,0x0406,0x0E0D,0x045D,0x2612,0x0E02,0x07AF, - 0x0DB1,0x0F5E,0x15C1,0x0C23,0x1523,0x0C1F,0x0D92,0x04B1, - 0x0D31,0x0432,0x0D61,0x0F4E,0x0D41,0x0DEE,0x0D42,0x04C1, - 0x0CE1,0x079F,0x0C2E,0x0405,0x0C22,0x0461,0x0E1D,0x0582, - 0x073F,0x0571,0x0C4D,0x0DFD,0x05CE,0x0C6D,0x05DE,0x0415, - 0x0C45,0x075F,0x0C41,0x0D03,0x05A1,0x0711,0x05CF,0x0425, - 0x0C93,0x0D21,0x0591,0x043D,0x0D12,0x0501,0x040F,0x0511, - 0x0431,0x0C03,0x04A1,0x078D,0x0581,0x041E,0x040D,0x0C02, - 0x040E,0x05DD,0x057F,0x079D,0x042D,0x0D9F,0x0502,0x056E, - 0x0412,0x071F,0x044E,0x05BF,0x0C1D,0x0482,0x05AE,0x042F, - 0x057D,0x0491,0x054E,0x047D,0x0DBE,0x0611,0x0492,0x0601, - 0x05BD,0x05CD,0x0426,0x05ED,0x072D,0x073D,0x0483,0x0F5D, - 0x0421,0x056F,0x053F,0x058E,0x054F,0x078F,0x053E,0x059E, - 0x057E,0x051F,0x055D,0x0413,0x070D,0x05AF,0x0411,0x0453, - 0x0D5E,0x077E,0x052F,0x070F,0x074D,0x0692,0x070E,0x072F, - 0x072E,0x058F,0x071D,0x052E,0x0417,0x073E,0x0781,0x078E, - 0x055F,0x060E,0x0622,0x0683,0x0702,0x071E,0x076F,0x079E, - 0x07BF,0x07CE + 0x0621, 0xFC33, 0x37AE, 0x1CC2, 0x2C43, 0xAD32, 0x34A3, 0x4551, + 0x6452, 0x5C62, 0x1FCD, 0x14F1, 0x4CB3, 0x24D2, 0x15DF, 0x0FBE, + 0x2603, 0x3DA2, 0x2E31, 0x25D1, 0x25EF, 0x0D22, 0x2E91, 0x1E82, + 0x0FBD, 0x1513, 0x0CB2, 0x0CD1, 0x0F4F, 0x1F7D, 0x1701, 0x0C16, + 0x2593, 0x2C42, 0x0C72, 0x14A2, 0x0F6E, 0x0C35, 0x0C71, 0x0D83, + 0x0C07, 0x1DFF, 0x043E, 0x1613, 0x07DD, 0x0FAD, 0x1451, 0x076D, + 0x0E81, 0x05FE, 0x0406, 0x0E0D, 0x045D, 0x2612, 0x0E02, 0x07AF, + 0x0DB1, 0x0F5E, 0x15C1, 0x0C23, 0x1523, 0x0C1F, 0x0D92, 0x04B1, + 0x0D31, 0x0432, 0x0D61, 0x0F4E, 0x0D41, 0x0DEE, 0x0D42, 0x04C1, + 0x0CE1, 0x079F, 0x0C2E, 0x0405, 0x0C22, 0x0461, 0x0E1D, 0x0582, + 0x073F, 0x0571, 0x0C4D, 0x0DFD, 0x05CE, 0x0C6D, 0x05DE, 0x0415, + 0x0C45, 0x075F, 0x0C41, 0x0D03, 0x05A1, 0x0711, 0x05CF, 0x0425, + 0x0C93, 0x0D21, 0x0591, 0x043D, 0x0D12, 0x0501, 0x040F, 0x0511, + 0x0431, 0x0C03, 0x04A1, 0x078D, 0x0581, 0x041E, 0x040D, 0x0C02, + 0x040E, 0x05DD, 0x057F, 0x079D, 0x042D, 0x0D9F, 0x0502, 0x056E, + 0x0412, 0x071F, 0x044E, 0x05BF, 0x0C1D, 0x0482, 0x05AE, 0x042F, + 0x057D, 0x0491, 0x054E, 0x047D, 0x0DBE, 0x0611, 0x0492, 0x0601, + 0x05BD, 0x05CD, 0x0426, 0x05ED, 0x072D, 0x073D, 0x0483, 0x0F5D, + 0x0421, 0x056F, 0x053F, 0x058E, 0x054F, 0x078F, 0x053E, 0x059E, + 0x057E, 0x051F, 0x055D, 0x0413, 0x070D, 0x05AF, 0x0411, 0x0453, + 0x0D5E, 0x077E, 0x052F, 0x070F, 0x074D, 0x0692, 0x070E, 0x072F, + 0x072E, 0x058F, 0x071D, 0x052E, 0x0417, 0x073E, 0x0781, 0x078E, + 0x055F, 0x060E, 0x0622, 0x0683, 0x0702, 0x071E, 0x076F, 0x079E, + 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_8x6 { @@ -432,79 +437,79 @@ static const packed_percentile_table block_pcd_8x6 { #if ASTCENC_BLOCK_MAX_TEXELS >= (8 * 8) static const uint16_t percentile_arr_8x8_0[347] { - 0x0334,0xFD44,0xDD14,0x9154,0x9B08,0x906A,0x8928,0x8108, - 0xE866,0xC918,0x606F,0xC0FE,0x5963,0x58EE,0x6534,0x505A, - 0x51E2,0xA8CF,0x5354,0x5314,0x5134,0x5524,0x48F3,0x504B, - 0x487E,0x5344,0x49C3,0x4972,0x49F2,0x4856,0xD0EF,0x81D2, - 0x78DE,0x4261,0x3AC1,0x71E3,0x6879,0x390C,0x3143,0x31B3, - 0x385F,0x3153,0x306E,0x3037,0x30DF,0x3162,0x304F,0x3075, - 0xB03B,0x2847,0x28E3,0x2914,0x507F,0x28BF,0x5173,0x5073, - 0x20D3,0x2A06,0x2827,0x2508,0x2229,0x29D3,0x204A,0x207A, - 0x2046,0x4148,0x20FD,0x4225,0x23A1,0x3944,0x2065,0x1924, - 0x2324,0x1806,0x19F1,0x2215,0x1876,0x22AD,0x502B,0x1B04, - 0x18F2,0x3A4D,0x3216,0x3504,0x18DD,0x1B21,0x10CE,0x1869, - 0x1B41,0x1855,0x1207,0x1AE1,0x2845,0x19D1,0x2A0A,0x1A2D, - 0x2A1A,0x11C2,0x1A0B,0x1217,0x2816,0x121B,0x1271,0x2AD1, - 0x1035,0x1015,0x287D,0x12F1,0x43C1,0x1171,0x1A05,0x08E2, - 0x11E1,0x3251,0x2049,0x20F1,0x12CD,0x0A39,0x1219,0x1059, - 0x1104,0x1036,0x1872,0x3007,0x08ED,0x205E,0x1026,0x0952, - 0x1392,0x1019,0x0951,0x100A,0x13EE,0x08D2,0x1242,0x0ABD, - 0x22A2,0x0BDF,0x2B81,0x0A35,0x13B1,0x0839,0x13BF,0x0A33, - 0x1B31,0x205D,0x1241,0x183A,0x2025,0x0B93,0x0A3D,0x1017, - 0x1313,0x1253,0x082A,0x204E,0x09A2,0x080B,0x0A1F,0x125D, - 0x0A2E,0x081A,0x08D1,0x082F,0x086D,0x1B82,0x0A09,0x0B22, - 0x1062,0x11A3,0x2161,0x0923,0x129F,0x1A62,0x0871,0x0942, - 0x081B,0x1133,0x18AE,0x0A9E,0x0863,0x09FF,0x18C2,0x0B51, - 0x08BD,0x0AA3,0x09B1,0x1AC2,0x08B3,0x0829,0x0BEF,0x0B83, - 0x0AAE,0x0A8D,0x1857,0x185B,0x08AF,0x103F,0x08C3,0x09B2, - 0x0A4E,0x11C1,0x0A31,0x0B42,0x0A83,0x0BFF,0x13DD,0x00CD, - 0x0AB3,0x0842,0x08BE,0x0922,0x1A8E,0x08E1,0x002E,0x0BA2, - 0x0A8F,0x2263,0x0252,0x0B32,0x0AC3,0x0941,0x0A43,0x083D, - 0x083E,0x0A3E,0x084D,0x1131,0x136F,0x0AB1,0x0193,0x0BFD, - 0x0391,0x0851,0x13AF,0x0843,0x0213,0x1226,0x0932,0x03B2, - 0x0902,0x0BCD,0x0221,0x089E,0x00B1,0x0BDE,0x03FE,0x02A1, - 0x0982,0x009F,0x080E,0x0B5F,0x02BE,0x0A32,0x0A2A,0x01EE, - 0x0053,0x0AB2,0x0192,0x09FD,0x0052,0x0B03,0x0293,0x00A2, - 0x0B7F,0x0BED,0x0311,0x08B2,0x0A72,0x088E,0x0333,0x0B12, - 0x0A23,0x0822,0x0083,0x11CE,0x021D,0x08A3,0x088F,0x029D, - 0x0A22,0x0A3F,0x01FE,0x020F,0x0983,0x02D2,0x0292,0x0B23, - 0x001E,0x0BCF,0x03CE,0x09AF,0x0B02,0x0301,0x022F,0x137E, - 0x021E,0x09EF,0x016F,0x0112,0x097E,0x080F,0x020D,0x0092, - 0x01DE,0x09DF,0x0032,0x0033,0x0A82,0x03BE,0x0B6E,0x001F, - 0x020E,0x0023,0x09CF,0x0113,0x0103,0x0013,0x0BAE,0x0203, - 0x0BAD,0x01BF,0x034F,0x095F,0x036D,0x0202,0x017F,0x0093, - 0x0201,0x034D,0x0212,0x035D,0x03BD,0x0B3F,0x035E,0x0211, - 0x0281,0x0291,0x032E,0x037D,0x034E,0x038E,0x039F,0x032F, - 0x033E,0x038F,0x039E + 0x0334, 0xFD44, 0xDD14, 0x9154, 0x9B08, 0x906A, 0x8928, 0x8108, + 0xE866, 0xC918, 0x606F, 0xC0FE, 0x5963, 0x58EE, 0x6534, 0x505A, + 0x51E2, 0xA8CF, 0x5354, 0x5314, 0x5134, 0x5524, 0x48F3, 0x504B, + 0x487E, 0x5344, 0x49C3, 0x4972, 0x49F2, 0x4856, 0xD0EF, 0x81D2, + 0x78DE, 0x4261, 0x3AC1, 0x71E3, 0x6879, 0x390C, 0x3143, 0x31B3, + 0x385F, 0x3153, 0x306E, 0x3037, 0x30DF, 0x3162, 0x304F, 0x3075, + 0xB03B, 0x2847, 0x28E3, 0x2914, 0x507F, 0x28BF, 0x5173, 0x5073, + 0x20D3, 0x2A06, 0x2827, 0x2508, 0x2229, 0x29D3, 0x204A, 0x207A, + 0x2046, 0x4148, 0x20FD, 0x4225, 0x23A1, 0x3944, 0x2065, 0x1924, + 0x2324, 0x1806, 0x19F1, 0x2215, 0x1876, 0x22AD, 0x502B, 0x1B04, + 0x18F2, 0x3A4D, 0x3216, 0x3504, 0x18DD, 0x1B21, 0x10CE, 0x1869, + 0x1B41, 0x1855, 0x1207, 0x1AE1, 0x2845, 0x19D1, 0x2A0A, 0x1A2D, + 0x2A1A, 0x11C2, 0x1A0B, 0x1217, 0x2816, 0x121B, 0x1271, 0x2AD1, + 0x1035, 0x1015, 0x287D, 0x12F1, 0x43C1, 0x1171, 0x1A05, 0x08E2, + 0x11E1, 0x3251, 0x2049, 0x20F1, 0x12CD, 0x0A39, 0x1219, 0x1059, + 0x1104, 0x1036, 0x1872, 0x3007, 0x08ED, 0x205E, 0x1026, 0x0952, + 0x1392, 0x1019, 0x0951, 0x100A, 0x13EE, 0x08D2, 0x1242, 0x0ABD, + 0x22A2, 0x0BDF, 0x2B81, 0x0A35, 0x13B1, 0x0839, 0x13BF, 0x0A33, + 0x1B31, 0x205D, 0x1241, 0x183A, 0x2025, 0x0B93, 0x0A3D, 0x1017, + 0x1313, 0x1253, 0x082A, 0x204E, 0x09A2, 0x080B, 0x0A1F, 0x125D, + 0x0A2E, 0x081A, 0x08D1, 0x082F, 0x086D, 0x1B82, 0x0A09, 0x0B22, + 0x1062, 0x11A3, 0x2161, 0x0923, 0x129F, 0x1A62, 0x0871, 0x0942, + 0x081B, 0x1133, 0x18AE, 0x0A9E, 0x0863, 0x09FF, 0x18C2, 0x0B51, + 0x08BD, 0x0AA3, 0x09B1, 0x1AC2, 0x08B3, 0x0829, 0x0BEF, 0x0B83, + 0x0AAE, 0x0A8D, 0x1857, 0x185B, 0x08AF, 0x103F, 0x08C3, 0x09B2, + 0x0A4E, 0x11C1, 0x0A31, 0x0B42, 0x0A83, 0x0BFF, 0x13DD, 0x00CD, + 0x0AB3, 0x0842, 0x08BE, 0x0922, 0x1A8E, 0x08E1, 0x002E, 0x0BA2, + 0x0A8F, 0x2263, 0x0252, 0x0B32, 0x0AC3, 0x0941, 0x0A43, 0x083D, + 0x083E, 0x0A3E, 0x084D, 0x1131, 0x136F, 0x0AB1, 0x0193, 0x0BFD, + 0x0391, 0x0851, 0x13AF, 0x0843, 0x0213, 0x1226, 0x0932, 0x03B2, + 0x0902, 0x0BCD, 0x0221, 0x089E, 0x00B1, 0x0BDE, 0x03FE, 0x02A1, + 0x0982, 0x009F, 0x080E, 0x0B5F, 0x02BE, 0x0A32, 0x0A2A, 0x01EE, + 0x0053, 0x0AB2, 0x0192, 0x09FD, 0x0052, 0x0B03, 0x0293, 0x00A2, + 0x0B7F, 0x0BED, 0x0311, 0x08B2, 0x0A72, 0x088E, 0x0333, 0x0B12, + 0x0A23, 0x0822, 0x0083, 0x11CE, 0x021D, 0x08A3, 0x088F, 0x029D, + 0x0A22, 0x0A3F, 0x01FE, 0x020F, 0x0983, 0x02D2, 0x0292, 0x0B23, + 0x001E, 0x0BCF, 0x03CE, 0x09AF, 0x0B02, 0x0301, 0x022F, 0x137E, + 0x021E, 0x09EF, 0x016F, 0x0112, 0x097E, 0x080F, 0x020D, 0x0092, + 0x01DE, 0x09DF, 0x0032, 0x0033, 0x0A82, 0x03BE, 0x0B6E, 0x001F, + 0x020E, 0x0023, 0x09CF, 0x0113, 0x0103, 0x0013, 0x0BAE, 0x0203, + 0x0BAD, 0x01BF, 0x034F, 0x095F, 0x036D, 0x0202, 0x017F, 0x0093, + 0x0201, 0x034D, 0x0212, 0x035D, 0x03BD, 0x0B3F, 0x035E, 0x0211, + 0x0281, 0x0291, 0x032E, 0x037D, 0x034E, 0x038E, 0x039F, 0x032F, + 0x033E, 0x038F, 0x039E }; static const uint16_t percentile_arr_8x8_1[208] { - 0x0621,0x3443,0x47CD,0x97AE,0xFC62,0x14F1,0x24C2,0x25DF, - 0x3C33,0x1C52,0x9C72,0x0FBE,0x0C5D,0x343E,0x24A3,0x1551, - 0x5D32,0x1CD2,0x15EF,0x4E31,0x04DD,0x1FDD,0x174F,0x0DD1, - 0x3E0D,0x15FF,0x0DA2,0x1E03,0x17BD,0x177D,0x14B3,0x0471, - 0x0CAE,0x1C1F,0x04D1,0x0F6E,0x0DFE,0x1C42,0x0C16,0x0D22, - 0x0C9F,0x2C2E,0x0FAD,0x0571,0x147D,0x0C07,0x04B2,0x0F6D, - 0x0F5E,0x07AF,0x146D,0x0C51,0x0593,0x2583,0x0C4E,0x040B, - 0x0C35,0x0513,0x0E91,0x0406,0x073F,0x144D,0x0561,0x048F, - 0x0F01,0x0F4E,0x0CA2,0x075F,0x1682,0x04E1,0x0C1A,0x04BD, - 0x0542,0x0D41,0x0DEE,0x04CD,0x0DCF,0x04B1,0x0C15,0x0C3D, - 0x0423,0x0592,0x0DDE,0x0422,0x0432,0x05FD,0x0DC1,0x05B1, - 0x0DCE,0x0612,0x0C2F,0x0445,0x0602,0x0531,0x0439,0x0E81, - 0x0582,0x0C61,0x061D,0x049E,0x0405,0x0409,0x0DBE,0x079F, - 0x0D21,0x04C1,0x0C0A,0x0E13,0x04AD,0x040E,0x0581,0x0419, - 0x05DD,0x0D03,0x049D,0x0449,0x0429,0x048E,0x0DA1,0x0425, - 0x0512,0x0501,0x0431,0x0523,0x0441,0x042D,0x040F,0x0D7D, - 0x0511,0x0502,0x05BF,0x04A1,0x0C03,0x0402,0x079D,0x05AE, - 0x075D,0x057F,0x041D,0x048D,0x042A,0x0453,0x05AF,0x078D, - 0x0C0D,0x073D,0x0491,0x0591,0x05BD,0x072D,0x057E,0x051F, - 0x0482,0x0492,0x041E,0x0412,0x0D9F,0x0421,0x0493,0x0711, - 0x056E,0x059E,0x054E,0x0611,0x05ED,0x074D,0x070F,0x056F, - 0x052F,0x053F,0x071F,0x054F,0x05CD,0x0483,0x055E,0x072F, - 0x0E01,0x0426,0x058F,0x0413,0x078F,0x071D,0x055F,0x058E, - 0x0411,0x053E,0x071E,0x055D,0x077E,0x052E,0x0692,0x0417, - 0x070D,0x078E,0x070E,0x072E,0x041B,0x060E,0x0622,0x0683, - 0x068D,0x0702,0x073E,0x076F,0x0781,0x079E,0x07BF,0x07CE + 0x0621, 0x3443, 0x47CD, 0x97AE, 0xFC62, 0x14F1, 0x24C2, 0x25DF, + 0x3C33, 0x1C52, 0x9C72, 0x0FBE, 0x0C5D, 0x343E, 0x24A3, 0x1551, + 0x5D32, 0x1CD2, 0x15EF, 0x4E31, 0x04DD, 0x1FDD, 0x174F, 0x0DD1, + 0x3E0D, 0x15FF, 0x0DA2, 0x1E03, 0x17BD, 0x177D, 0x14B3, 0x0471, + 0x0CAE, 0x1C1F, 0x04D1, 0x0F6E, 0x0DFE, 0x1C42, 0x0C16, 0x0D22, + 0x0C9F, 0x2C2E, 0x0FAD, 0x0571, 0x147D, 0x0C07, 0x04B2, 0x0F6D, + 0x0F5E, 0x07AF, 0x146D, 0x0C51, 0x0593, 0x2583, 0x0C4E, 0x040B, + 0x0C35, 0x0513, 0x0E91, 0x0406, 0x073F, 0x144D, 0x0561, 0x048F, + 0x0F01, 0x0F4E, 0x0CA2, 0x075F, 0x1682, 0x04E1, 0x0C1A, 0x04BD, + 0x0542, 0x0D41, 0x0DEE, 0x04CD, 0x0DCF, 0x04B1, 0x0C15, 0x0C3D, + 0x0423, 0x0592, 0x0DDE, 0x0422, 0x0432, 0x05FD, 0x0DC1, 0x05B1, + 0x0DCE, 0x0612, 0x0C2F, 0x0445, 0x0602, 0x0531, 0x0439, 0x0E81, + 0x0582, 0x0C61, 0x061D, 0x049E, 0x0405, 0x0409, 0x0DBE, 0x079F, + 0x0D21, 0x04C1, 0x0C0A, 0x0E13, 0x04AD, 0x040E, 0x0581, 0x0419, + 0x05DD, 0x0D03, 0x049D, 0x0449, 0x0429, 0x048E, 0x0DA1, 0x0425, + 0x0512, 0x0501, 0x0431, 0x0523, 0x0441, 0x042D, 0x040F, 0x0D7D, + 0x0511, 0x0502, 0x05BF, 0x04A1, 0x0C03, 0x0402, 0x079D, 0x05AE, + 0x075D, 0x057F, 0x041D, 0x048D, 0x042A, 0x0453, 0x05AF, 0x078D, + 0x0C0D, 0x073D, 0x0491, 0x0591, 0x05BD, 0x072D, 0x057E, 0x051F, + 0x0482, 0x0492, 0x041E, 0x0412, 0x0D9F, 0x0421, 0x0493, 0x0711, + 0x056E, 0x059E, 0x054E, 0x0611, 0x05ED, 0x074D, 0x070F, 0x056F, + 0x052F, 0x053F, 0x071F, 0x054F, 0x05CD, 0x0483, 0x055E, 0x072F, + 0x0E01, 0x0426, 0x058F, 0x0413, 0x078F, 0x071D, 0x055F, 0x058E, + 0x0411, 0x053E, 0x071E, 0x055D, 0x077E, 0x052E, 0x0692, 0x0417, + 0x070D, 0x078E, 0x070E, 0x072E, 0x041B, 0x060E, 0x0622, 0x0683, + 0x068D, 0x0702, 0x073E, 0x076F, 0x0781, 0x079E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_8x8 { @@ -518,67 +523,67 @@ static const packed_percentile_table block_pcd_8x8 { #if ASTCENC_BLOCK_MAX_TEXELS >= (10 * 5) static const uint16_t percentile_arr_10x5_0[274] { - 0x0165,0xF975,0xD866,0xC056,0xA946,0x90C6,0x90F5,0x8963, - 0x80D6,0x80E6,0x60F3,0x61C3,0x59F2,0xA927,0x5075,0x4847, - 0x5153,0x4955,0x49E2,0x48B6,0x41D2,0x4943,0x8305,0x8172, - 0x4046,0x4037,0x40A7,0x70B7,0x7AC1,0x31E3,0x7027,0x30E5, - 0x69D3,0x99B3,0x3315,0x6115,0x3136,0x3076,0x3173,0x30D5, - 0x3106,0x8962,0x2916,0x30C7,0x5126,0x30D3,0x2956,0x5117, - 0x2B41,0x2AE1,0x2A61,0x29F1,0x2306,0x2145,0x4A85,0x2057, - 0x40E3,0x4137,0x3B21,0x23C1,0x2065,0x1925,0x51C2,0x5225, - 0x4935,0x1AD1,0x23A1,0x19D1,0x1A71,0x4055,0x1873,0x1A86, - 0x1295,0x18F2,0x28A6,0x1952,0x4AA5,0x20B5,0x10C5,0x2AA2, - 0x11E1,0x1107,0x10D2,0x2171,0x1351,0x3036,0x1331,0x1BEE, - 0x2035,0x1045,0x1313,0x0A15,0x1087,0x1296,0x13EF,0x18E2, - 0x1151,0x1086,0x10F1,0x08A5,0x12C2,0x1BFF,0x1095,0x1A62, - 0x1322,0x0942,0x1026,0x1872,0x1062,0x0897,0x1123,0x08D1, - 0x1A06,0x0806,0x137F,0x13B1,0x13DF,0x1A51,0x09B1,0x0A83, - 0x1015,0x22F1,0x0961,0x0B81,0x12B3,0x0A35,0x0AA3,0x20B3, - 0x08C3,0x2342,0x0933,0x0A33,0x09A2,0x10C2,0x0896,0x2205, - 0x0825,0x20E1,0x0922,0x1242,0x0B16,0x0B32,0x09A3,0x0AC3, - 0x0BBF,0x0B93,0x0071,0x0931,0x0A41,0x2392,0x13FE,0x09C1, - 0x0B07,0x0016,0x1182,0x09B2,0x0A26,0x0132,0x0941,0x0A93, - 0x0992,0x1063,0x1217,0x01FF,0x11EE,0x1216,0x0B23,0x0B82, - 0x0042,0x1102,0x0213,0x0B6F,0x09FE,0x1207,0x0807,0x18B1, - 0x0253,0x0AB1,0x08A2,0x13FD,0x01FD,0x1983,0x0AB2,0x0A31, - 0x016F,0x0B11,0x00B2,0x0851,0x0AD2,0x0993,0x0BDD,0x12A1, - 0x017F,0x0A97,0x1022,0x0383,0x0843,0x0A52,0x03A2,0x097E, - 0x0817,0x03B2,0x0A43,0x09EF,0x0A63,0x0B33,0x0B03,0x0292, - 0x0272,0x09CE,0x0287,0x136D,0x0053,0x0B12,0x0083,0x0892, - 0x0112,0x1282,0x03ED,0x0852,0x0301,0x1391,0x0232,0x0B7E, - 0x0221,0x08A3,0x0BCD,0x0BCF,0x036E,0x09DE,0x0103,0x03DE, - 0x0832,0x0BAF,0x0302,0x13CE,0x035F,0x0093,0x0A23,0x01DF, - 0x0013,0x0A22,0x0023,0x0113,0x09AF,0x01BF,0x0033,0x095F, - 0x0203,0x0281,0x09CF,0x037D,0x0201,0x0B4D,0x03AE,0x03BE, - 0x0291,0x035E,0x038E,0x0B9F,0x03AD,0x0202,0x034F,0x0211, - 0x035D,0x0212,0x032E,0x039E,0x033F,0x034E,0x03BD,0x032F, - 0x033E,0x038F + 0x0165, 0xF975, 0xD866, 0xC056, 0xA946, 0x90C6, 0x90F5, 0x8963, + 0x80D6, 0x80E6, 0x60F3, 0x61C3, 0x59F2, 0xA927, 0x5075, 0x4847, + 0x5153, 0x4955, 0x49E2, 0x48B6, 0x41D2, 0x4943, 0x8305, 0x8172, + 0x4046, 0x4037, 0x40A7, 0x70B7, 0x7AC1, 0x31E3, 0x7027, 0x30E5, + 0x69D3, 0x99B3, 0x3315, 0x6115, 0x3136, 0x3076, 0x3173, 0x30D5, + 0x3106, 0x8962, 0x2916, 0x30C7, 0x5126, 0x30D3, 0x2956, 0x5117, + 0x2B41, 0x2AE1, 0x2A61, 0x29F1, 0x2306, 0x2145, 0x4A85, 0x2057, + 0x40E3, 0x4137, 0x3B21, 0x23C1, 0x2065, 0x1925, 0x51C2, 0x5225, + 0x4935, 0x1AD1, 0x23A1, 0x19D1, 0x1A71, 0x4055, 0x1873, 0x1A86, + 0x1295, 0x18F2, 0x28A6, 0x1952, 0x4AA5, 0x20B5, 0x10C5, 0x2AA2, + 0x11E1, 0x1107, 0x10D2, 0x2171, 0x1351, 0x3036, 0x1331, 0x1BEE, + 0x2035, 0x1045, 0x1313, 0x0A15, 0x1087, 0x1296, 0x13EF, 0x18E2, + 0x1151, 0x1086, 0x10F1, 0x08A5, 0x12C2, 0x1BFF, 0x1095, 0x1A62, + 0x1322, 0x0942, 0x1026, 0x1872, 0x1062, 0x0897, 0x1123, 0x08D1, + 0x1A06, 0x0806, 0x137F, 0x13B1, 0x13DF, 0x1A51, 0x09B1, 0x0A83, + 0x1015, 0x22F1, 0x0961, 0x0B81, 0x12B3, 0x0A35, 0x0AA3, 0x20B3, + 0x08C3, 0x2342, 0x0933, 0x0A33, 0x09A2, 0x10C2, 0x0896, 0x2205, + 0x0825, 0x20E1, 0x0922, 0x1242, 0x0B16, 0x0B32, 0x09A3, 0x0AC3, + 0x0BBF, 0x0B93, 0x0071, 0x0931, 0x0A41, 0x2392, 0x13FE, 0x09C1, + 0x0B07, 0x0016, 0x1182, 0x09B2, 0x0A26, 0x0132, 0x0941, 0x0A93, + 0x0992, 0x1063, 0x1217, 0x01FF, 0x11EE, 0x1216, 0x0B23, 0x0B82, + 0x0042, 0x1102, 0x0213, 0x0B6F, 0x09FE, 0x1207, 0x0807, 0x18B1, + 0x0253, 0x0AB1, 0x08A2, 0x13FD, 0x01FD, 0x1983, 0x0AB2, 0x0A31, + 0x016F, 0x0B11, 0x00B2, 0x0851, 0x0AD2, 0x0993, 0x0BDD, 0x12A1, + 0x017F, 0x0A97, 0x1022, 0x0383, 0x0843, 0x0A52, 0x03A2, 0x097E, + 0x0817, 0x03B2, 0x0A43, 0x09EF, 0x0A63, 0x0B33, 0x0B03, 0x0292, + 0x0272, 0x09CE, 0x0287, 0x136D, 0x0053, 0x0B12, 0x0083, 0x0892, + 0x0112, 0x1282, 0x03ED, 0x0852, 0x0301, 0x1391, 0x0232, 0x0B7E, + 0x0221, 0x08A3, 0x0BCD, 0x0BCF, 0x036E, 0x09DE, 0x0103, 0x03DE, + 0x0832, 0x0BAF, 0x0302, 0x13CE, 0x035F, 0x0093, 0x0A23, 0x01DF, + 0x0013, 0x0A22, 0x0023, 0x0113, 0x09AF, 0x01BF, 0x0033, 0x095F, + 0x0203, 0x0281, 0x09CF, 0x037D, 0x0201, 0x0B4D, 0x03AE, 0x03BE, + 0x0291, 0x035E, 0x038E, 0x0B9F, 0x03AD, 0x0202, 0x034F, 0x0211, + 0x035D, 0x0212, 0x032E, 0x039E, 0x033F, 0x034E, 0x03BD, 0x032F, + 0x033E, 0x038F }; static const uint16_t percentile_arr_10x5_1[180] { - 0x0532,0xFCA3,0x3621,0x6E82,0x2CC2,0x3D51,0x3F01,0x2691, - 0x17AE,0x35A2,0x74B3,0x1603,0x4433,0x3C43,0x6C35,0x25D1, - 0x1D13,0x15DF,0x37CD,0x0D93,0x1D22,0x0E81,0x1452,0x0CD2, - 0x37BE,0x0CB2,0x3407,0x1523,0x0C16,0x0CB5,0x0C96,0x1486, - 0x2631,0x1506,0x0F4F,0x1583,0x0CD1,0x2CA2,0x2612,0x1613, - 0x1602,0x1F11,0x179F,0x17BD,0x15B1,0x0406,0x1D41,0x0CF1, - 0x0D31,0x0442,0x1C62,0x0F6E,0x077D,0x0C51,0x0445,0x0D15, - 0x2592,0x0CB1,0x05EF,0x0542,0x17AF,0x1425,0x075E,0x0FAD, - 0x0CC1,0x0503,0x0512,0x15C1,0x0C95,0x0415,0x0505,0x0F4E, - 0x04A5,0x0493,0x0C32,0x0F5F,0x04E1,0x0521,0x0C85,0x07DD, - 0x0582,0x15FF,0x05CF,0x0405,0x0D91,0x05A1,0x05FE,0x0C23, - 0x0561,0x0472,0x0471,0x0C22,0x0DEE,0x076D,0x0502,0x0426, - 0x0C61,0x0D7D,0x0525,0x05DE,0x0DCE,0x079D,0x0692,0x0441, - 0x0C91,0x05DD,0x0511,0x057F,0x0611,0x0DFD,0x078D,0x056E, - 0x0492,0x04A1,0x073F,0x0C31,0x05BE,0x0483,0x0571,0x056F, - 0x0D9F,0x0581,0x0501,0x057E,0x05BF,0x078F,0x0516,0x05ED, - 0x0402,0x0F7E,0x0482,0x054E,0x075D,0x071F,0x05CD,0x0535, - 0x05AE,0x0C11,0x058F,0x05AF,0x0421,0x0413,0x0601,0x054F, - 0x073D,0x059E,0x0487,0x070F,0x078E,0x0781,0x053E,0x0403, - 0x072D,0x055D,0x05BD,0x079E,0x0D8E,0x0412,0x052E,0x074D, - 0x053F,0x051F,0x070E,0x055F,0x072F,0x052F,0x070D,0x055E, - 0x0417,0x0453,0x072E,0x0622,0x0683,0x0702,0x071D,0x071E, - 0x073E,0x076F,0x07BF,0x07CE + 0x0532, 0xFCA3, 0x3621, 0x6E82, 0x2CC2, 0x3D51, 0x3F01, 0x2691, + 0x17AE, 0x35A2, 0x74B3, 0x1603, 0x4433, 0x3C43, 0x6C35, 0x25D1, + 0x1D13, 0x15DF, 0x37CD, 0x0D93, 0x1D22, 0x0E81, 0x1452, 0x0CD2, + 0x37BE, 0x0CB2, 0x3407, 0x1523, 0x0C16, 0x0CB5, 0x0C96, 0x1486, + 0x2631, 0x1506, 0x0F4F, 0x1583, 0x0CD1, 0x2CA2, 0x2612, 0x1613, + 0x1602, 0x1F11, 0x179F, 0x17BD, 0x15B1, 0x0406, 0x1D41, 0x0CF1, + 0x0D31, 0x0442, 0x1C62, 0x0F6E, 0x077D, 0x0C51, 0x0445, 0x0D15, + 0x2592, 0x0CB1, 0x05EF, 0x0542, 0x17AF, 0x1425, 0x075E, 0x0FAD, + 0x0CC1, 0x0503, 0x0512, 0x15C1, 0x0C95, 0x0415, 0x0505, 0x0F4E, + 0x04A5, 0x0493, 0x0C32, 0x0F5F, 0x04E1, 0x0521, 0x0C85, 0x07DD, + 0x0582, 0x15FF, 0x05CF, 0x0405, 0x0D91, 0x05A1, 0x05FE, 0x0C23, + 0x0561, 0x0472, 0x0471, 0x0C22, 0x0DEE, 0x076D, 0x0502, 0x0426, + 0x0C61, 0x0D7D, 0x0525, 0x05DE, 0x0DCE, 0x079D, 0x0692, 0x0441, + 0x0C91, 0x05DD, 0x0511, 0x057F, 0x0611, 0x0DFD, 0x078D, 0x056E, + 0x0492, 0x04A1, 0x073F, 0x0C31, 0x05BE, 0x0483, 0x0571, 0x056F, + 0x0D9F, 0x0581, 0x0501, 0x057E, 0x05BF, 0x078F, 0x0516, 0x05ED, + 0x0402, 0x0F7E, 0x0482, 0x054E, 0x075D, 0x071F, 0x05CD, 0x0535, + 0x05AE, 0x0C11, 0x058F, 0x05AF, 0x0421, 0x0413, 0x0601, 0x054F, + 0x073D, 0x059E, 0x0487, 0x070F, 0x078E, 0x0781, 0x053E, 0x0403, + 0x072D, 0x055D, 0x05BD, 0x079E, 0x0D8E, 0x0412, 0x052E, 0x074D, + 0x053F, 0x051F, 0x070E, 0x055F, 0x072F, 0x052F, 0x070D, 0x055E, + 0x0417, 0x0453, 0x072E, 0x0622, 0x0683, 0x0702, 0x071D, 0x071E, + 0x073E, 0x076F, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_10x5 { @@ -592,75 +597,75 @@ static const packed_percentile_table block_pcd_10x5 { #if ASTCENC_BLOCK_MAX_TEXELS >= (10 * 6) static const uint16_t percentile_arr_10x6_0[325] { - 0x01A4,0xF954,0xA066,0x9975,0x80F5,0x7056,0x6918,0x6963, - 0x58C6,0x5946,0x5928,0x5174,0x586F,0xA0E6,0x5108,0x48D6, - 0x49E2,0x40F3,0x9172,0x41F2,0xB875,0x3927,0x39C3,0xA953, - 0x3934,0x3305,0x30B6,0x6943,0x31D2,0x3876,0x3037,0x2955, - 0x30A7,0x32C1,0x29B3,0x3027,0x287E,0x30B7,0x29E3,0x5846, - 0x2B15,0x2847,0x3162,0x5173,0x4936,0x285F,0x48D3,0x2164, - 0x4906,0x20E5,0x2915,0x2116,0x407F,0x20D5,0x2A61,0x4117, - 0x20E3,0x2126,0x4148,0x206E,0x39D3,0x2145,0x41B4,0x1B06, - 0x2114,0x2165,0x5321,0x5A85,0x1A4D,0x1A1F,0x19F1,0x3341, - 0x184F,0x1956,0x3125,0x30C7,0x28F2,0x1937,0x1AE1,0x1073, - 0x1BA1,0x1935,0x110C,0x1BC1,0x3A25,0x19C2,0x1295,0x122E, - 0x1944,0x11D1,0x1124,0x1857,0x22D1,0x2286,0x1A2D,0x12A2, - 0x2107,0x1055,0x2065,0x0A71,0x2152,0x10C5,0x10D2,0x1331, - 0x08B5,0x1171,0x2836,0x10A6,0x0904,0x123D,0x20F1,0x12A5, - 0x10E2,0x107D,0x1AF1,0x1313,0x0951,0x11E1,0x1B22,0x1B51, - 0x0835,0x101E,0x0A5D,0x0A15,0x3045,0x0A96,0x08A5,0x1142, - 0x12A3,0x1872,0x085D,0x09B1,0x100E,0x0887,0x0886,0x086D, - 0x0933,0x12B3,0x0897,0x08B3,0x0A33,0x0923,0x1095,0x0BEE, - 0x2BB1,0x085E,0x1283,0x0A51,0x1026,0x0A06,0x12C2,0x08D1, - 0x11A2,0x13BF,0x08C3,0x10C2,0x0A3E,0x0BDF,0x0B81,0x13EF, - 0x0A35,0x0B16,0x082F,0x2161,0x1B32,0x0806,0x084E,0x11A3, - 0x1015,0x1122,0x2931,0x0342,0x0825,0x0A0F,0x0896,0x0A05, - 0x0241,0x09C1,0x083F,0x0A42,0x0071,0x0B07,0x082E,0x0393, - 0x12B1,0x0A62,0x0226,0x0A2F,0x0B92,0x0063,0x0932,0x0862, - 0x09FF,0x0A31,0x00E1,0x12B2,0x09B2,0x0AC3,0x0941,0x0293, - 0x1323,0x104D,0x003E,0x083D,0x0992,0x1382,0x03FF,0x0A13, - 0x1016,0x0A53,0x0182,0x1007,0x0AA1,0x080F,0x0A16,0x0A1E, - 0x0042,0x0902,0x13DD,0x0BB2,0x0A63,0x00A2,0x08B1,0x03FE, - 0x1207,0x08B2,0x0B83,0x09EE,0x0311,0x0A87,0x0BAF,0x03A2, - 0x09FD,0x0051,0x0B33,0x020D,0x09CE,0x0217,0x021D,0x0817, - 0x020E,0x0A4E,0x001F,0x0BFD,0x0297,0x0983,0x0A92,0x0252, - 0x0243,0x0B03,0x0193,0x036F,0x0B12,0x0043,0x0822,0x0A21, - 0x01FE,0x0853,0x037F,0x023F,0x0BED,0x02D2,0x0B91,0x0232, - 0x0282,0x0912,0x08A3,0x0852,0x0223,0x0BCD,0x0083,0x0301, - 0x0832,0x01EF,0x0892,0x0302,0x0A72,0x03DE,0x0893,0x0BCF, - 0x09DE,0x03CE,0x035F,0x0833,0x0023,0x0103,0x017E,0x0813, - 0x01CF,0x01BF,0x016F,0x0A22,0x037E,0x0113,0x01AF,0x0B6E, - 0x03BE,0x0201,0x0A03,0x01DF,0x036D,0x03AE,0x015F,0x0281, - 0x033E,0x0A02,0x038E,0x017F,0x0291,0x034D,0x03BD,0x0B7D, - 0x03AD,0x0211,0x0212,0x034F,0x032E,0x039F,0x034E,0x035D, - 0x035E,0x033F,0x039E,0x032F,0x038F + 0x01A4, 0xF954, 0xA066, 0x9975, 0x80F5, 0x7056, 0x6918, 0x6963, + 0x58C6, 0x5946, 0x5928, 0x5174, 0x586F, 0xA0E6, 0x5108, 0x48D6, + 0x49E2, 0x40F3, 0x9172, 0x41F2, 0xB875, 0x3927, 0x39C3, 0xA953, + 0x3934, 0x3305, 0x30B6, 0x6943, 0x31D2, 0x3876, 0x3037, 0x2955, + 0x30A7, 0x32C1, 0x29B3, 0x3027, 0x287E, 0x30B7, 0x29E3, 0x5846, + 0x2B15, 0x2847, 0x3162, 0x5173, 0x4936, 0x285F, 0x48D3, 0x2164, + 0x4906, 0x20E5, 0x2915, 0x2116, 0x407F, 0x20D5, 0x2A61, 0x4117, + 0x20E3, 0x2126, 0x4148, 0x206E, 0x39D3, 0x2145, 0x41B4, 0x1B06, + 0x2114, 0x2165, 0x5321, 0x5A85, 0x1A4D, 0x1A1F, 0x19F1, 0x3341, + 0x184F, 0x1956, 0x3125, 0x30C7, 0x28F2, 0x1937, 0x1AE1, 0x1073, + 0x1BA1, 0x1935, 0x110C, 0x1BC1, 0x3A25, 0x19C2, 0x1295, 0x122E, + 0x1944, 0x11D1, 0x1124, 0x1857, 0x22D1, 0x2286, 0x1A2D, 0x12A2, + 0x2107, 0x1055, 0x2065, 0x0A71, 0x2152, 0x10C5, 0x10D2, 0x1331, + 0x08B5, 0x1171, 0x2836, 0x10A6, 0x0904, 0x123D, 0x20F1, 0x12A5, + 0x10E2, 0x107D, 0x1AF1, 0x1313, 0x0951, 0x11E1, 0x1B22, 0x1B51, + 0x0835, 0x101E, 0x0A5D, 0x0A15, 0x3045, 0x0A96, 0x08A5, 0x1142, + 0x12A3, 0x1872, 0x085D, 0x09B1, 0x100E, 0x0887, 0x0886, 0x086D, + 0x0933, 0x12B3, 0x0897, 0x08B3, 0x0A33, 0x0923, 0x1095, 0x0BEE, + 0x2BB1, 0x085E, 0x1283, 0x0A51, 0x1026, 0x0A06, 0x12C2, 0x08D1, + 0x11A2, 0x13BF, 0x08C3, 0x10C2, 0x0A3E, 0x0BDF, 0x0B81, 0x13EF, + 0x0A35, 0x0B16, 0x082F, 0x2161, 0x1B32, 0x0806, 0x084E, 0x11A3, + 0x1015, 0x1122, 0x2931, 0x0342, 0x0825, 0x0A0F, 0x0896, 0x0A05, + 0x0241, 0x09C1, 0x083F, 0x0A42, 0x0071, 0x0B07, 0x082E, 0x0393, + 0x12B1, 0x0A62, 0x0226, 0x0A2F, 0x0B92, 0x0063, 0x0932, 0x0862, + 0x09FF, 0x0A31, 0x00E1, 0x12B2, 0x09B2, 0x0AC3, 0x0941, 0x0293, + 0x1323, 0x104D, 0x003E, 0x083D, 0x0992, 0x1382, 0x03FF, 0x0A13, + 0x1016, 0x0A53, 0x0182, 0x1007, 0x0AA1, 0x080F, 0x0A16, 0x0A1E, + 0x0042, 0x0902, 0x13DD, 0x0BB2, 0x0A63, 0x00A2, 0x08B1, 0x03FE, + 0x1207, 0x08B2, 0x0B83, 0x09EE, 0x0311, 0x0A87, 0x0BAF, 0x03A2, + 0x09FD, 0x0051, 0x0B33, 0x020D, 0x09CE, 0x0217, 0x021D, 0x0817, + 0x020E, 0x0A4E, 0x001F, 0x0BFD, 0x0297, 0x0983, 0x0A92, 0x0252, + 0x0243, 0x0B03, 0x0193, 0x036F, 0x0B12, 0x0043, 0x0822, 0x0A21, + 0x01FE, 0x0853, 0x037F, 0x023F, 0x0BED, 0x02D2, 0x0B91, 0x0232, + 0x0282, 0x0912, 0x08A3, 0x0852, 0x0223, 0x0BCD, 0x0083, 0x0301, + 0x0832, 0x01EF, 0x0892, 0x0302, 0x0A72, 0x03DE, 0x0893, 0x0BCF, + 0x09DE, 0x03CE, 0x035F, 0x0833, 0x0023, 0x0103, 0x017E, 0x0813, + 0x01CF, 0x01BF, 0x016F, 0x0A22, 0x037E, 0x0113, 0x01AF, 0x0B6E, + 0x03BE, 0x0201, 0x0A03, 0x01DF, 0x036D, 0x03AE, 0x015F, 0x0281, + 0x033E, 0x0A02, 0x038E, 0x017F, 0x0291, 0x034D, 0x03BD, 0x0B7D, + 0x03AD, 0x0211, 0x0212, 0x034F, 0x032E, 0x039F, 0x034E, 0x035D, + 0x035E, 0x033F, 0x039E, 0x032F, 0x038F }; static const uint16_t percentile_arr_10x6_1[199] { - 0x0621,0xBD32,0x5CA3,0x1FAE,0x64C2,0x1D51,0x6C33,0xFC43, - 0x5CB3,0x25A2,0x2E82,0x35D1,0x4F01,0x3FBE,0x3691,0x2DDF, - 0x2E03,0x3FCD,0x14D2,0x1CF1,0x0C52,0x3C35,0x2D22,0x1513, - 0x1462,0x54B2,0x0E31,0x4E81,0x1593,0x1D23,0x1CD1,0x14B5, - 0x2FBD,0x0C07,0x1D06,0x0DEF,0x14A2,0x1612,0x1F4F,0x0C16, - 0x1F7D,0x0C96,0x0486,0x1F9F,0x0D42,0x4583,0x0E02,0x0472, - 0x0DB1,0x1613,0x0FAD,0x0D41,0x0F11,0x0E0D,0x1C42,0x143E, - 0x076E,0x04B1,0x0FAF,0x0D61,0x0531,0x0C71,0x0DFF,0x0DFE, - 0x0406,0x0C45,0x0451,0x0D15,0x05C1,0x2CC1,0x141F,0x0CE1, - 0x0FDD,0x0C22,0x0582,0x0D92,0x0571,0x0F6D,0x0C93,0x045D, - 0x0F5E,0x044D,0x0423,0x0D05,0x0425,0x0C95,0x04A5,0x0DCE, - 0x075F,0x0E1D,0x0503,0x042E,0x0D91,0x0512,0x0DDE,0x05A1, - 0x074E,0x0C32,0x0431,0x0415,0x0D21,0x05EE,0x040E,0x0DDD, - 0x0485,0x1525,0x0491,0x0C26,0x046D,0x0C05,0x05CF,0x05FD, - 0x0E92,0x073F,0x0C0D,0x043D,0x0502,0x0C1E,0x041D,0x0461, - 0x04A1,0x0511,0x0581,0x05BD,0x0C41,0x059F,0x05BF,0x040F, - 0x0C7D,0x0402,0x054E,0x057D,0x0403,0x078D,0x05AE,0x042D, - 0x0483,0x079D,0x0D7F,0x0482,0x0611,0x056E,0x0516,0x05BE, - 0x0535,0x044E,0x05AF,0x0DED,0x042F,0x0492,0x058E,0x078F, - 0x0412,0x057E,0x053E,0x0F1F,0x073D,0x0601,0x0501,0x075D, - 0x059E,0x05CD,0x053F,0x054F,0x055E,0x055D,0x0421,0x074D, - 0x051F,0x072F,0x0781,0x0411,0x0D6F,0x077E,0x0487,0x070E, - 0x070F,0x072D,0x058F,0x078E,0x079E,0x052E,0x0413,0x072E, - 0x071D,0x052F,0x055F,0x073E,0x0417,0x0453,0x060E,0x0622, - 0x0683,0x0702,0x070D,0x071E,0x076F,0x07BF,0x07CE + 0x0621, 0xBD32, 0x5CA3, 0x1FAE, 0x64C2, 0x1D51, 0x6C33, 0xFC43, + 0x5CB3, 0x25A2, 0x2E82, 0x35D1, 0x4F01, 0x3FBE, 0x3691, 0x2DDF, + 0x2E03, 0x3FCD, 0x14D2, 0x1CF1, 0x0C52, 0x3C35, 0x2D22, 0x1513, + 0x1462, 0x54B2, 0x0E31, 0x4E81, 0x1593, 0x1D23, 0x1CD1, 0x14B5, + 0x2FBD, 0x0C07, 0x1D06, 0x0DEF, 0x14A2, 0x1612, 0x1F4F, 0x0C16, + 0x1F7D, 0x0C96, 0x0486, 0x1F9F, 0x0D42, 0x4583, 0x0E02, 0x0472, + 0x0DB1, 0x1613, 0x0FAD, 0x0D41, 0x0F11, 0x0E0D, 0x1C42, 0x143E, + 0x076E, 0x04B1, 0x0FAF, 0x0D61, 0x0531, 0x0C71, 0x0DFF, 0x0DFE, + 0x0406, 0x0C45, 0x0451, 0x0D15, 0x05C1, 0x2CC1, 0x141F, 0x0CE1, + 0x0FDD, 0x0C22, 0x0582, 0x0D92, 0x0571, 0x0F6D, 0x0C93, 0x045D, + 0x0F5E, 0x044D, 0x0423, 0x0D05, 0x0425, 0x0C95, 0x04A5, 0x0DCE, + 0x075F, 0x0E1D, 0x0503, 0x042E, 0x0D91, 0x0512, 0x0DDE, 0x05A1, + 0x074E, 0x0C32, 0x0431, 0x0415, 0x0D21, 0x05EE, 0x040E, 0x0DDD, + 0x0485, 0x1525, 0x0491, 0x0C26, 0x046D, 0x0C05, 0x05CF, 0x05FD, + 0x0E92, 0x073F, 0x0C0D, 0x043D, 0x0502, 0x0C1E, 0x041D, 0x0461, + 0x04A1, 0x0511, 0x0581, 0x05BD, 0x0C41, 0x059F, 0x05BF, 0x040F, + 0x0C7D, 0x0402, 0x054E, 0x057D, 0x0403, 0x078D, 0x05AE, 0x042D, + 0x0483, 0x079D, 0x0D7F, 0x0482, 0x0611, 0x056E, 0x0516, 0x05BE, + 0x0535, 0x044E, 0x05AF, 0x0DED, 0x042F, 0x0492, 0x058E, 0x078F, + 0x0412, 0x057E, 0x053E, 0x0F1F, 0x073D, 0x0601, 0x0501, 0x075D, + 0x059E, 0x05CD, 0x053F, 0x054F, 0x055E, 0x055D, 0x0421, 0x074D, + 0x051F, 0x072F, 0x0781, 0x0411, 0x0D6F, 0x077E, 0x0487, 0x070E, + 0x070F, 0x072D, 0x058F, 0x078E, 0x079E, 0x052E, 0x0413, 0x072E, + 0x071D, 0x052F, 0x055F, 0x073E, 0x0417, 0x0453, 0x060E, 0x0622, + 0x0683, 0x0702, 0x070D, 0x071E, 0x076F, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_10x6 { @@ -674,87 +679,87 @@ static const packed_percentile_table block_pcd_10x6 { #if ASTCENC_BLOCK_MAX_TEXELS >= (10 * 8) static const uint16_t percentile_arr_10x8_0[400] { - 0x0154,0xAB34,0xAD44,0x8308,0x7866,0x7B64,0x79A4,0x7975, - 0x686A,0x6908,0xC514,0x6174,0x6128,0x6118,0x5B54,0x5163, - 0xF856,0x50F5,0x986F,0xDD34,0x48FE,0x4972,0x48E6,0x4146, - 0x48EE,0x40F3,0x4AC1,0x38C6,0x41E2,0xBB05,0x707E,0x38D6, - 0x3927,0x6B14,0x384B,0x3948,0x3153,0x385A,0x3134,0x6B15, - 0x39F2,0x30CF,0x3143,0x91D2,0x31C3,0x60EF,0x5973,0x3076, - 0x28D3,0x3261,0x2875,0x28DE,0x290C,0x51E3,0x28A7,0x20E3, - 0x2962,0x2B06,0x2917,0x483B,0x20B6,0x2D24,0x206E,0x285F, - 0x20B7,0x2936,0x4047,0x2037,0x20DF,0x28BF,0x21B4,0x21B3, - 0x1D08,0x2027,0x404F,0x3846,0x2116,0x187F,0x1879,0x2285, - 0x1A29,0x3915,0x4873,0x1955,0x3114,0x1B44,0x2165,0x107A, - 0x1956,0x6137,0x1106,0x3145,0x1B21,0x19D3,0x12AD,0x1B41, - 0x1AD1,0x1126,0x18F2,0x282B,0x40E5,0x20D5,0x2A0A,0x284A, - 0x1286,0x1295,0x121A,0x2A0B,0x321B,0x122D,0x10FD,0x13A1, - 0x32A2,0x12E1,0x1164,0x13C1,0x124D,0x1239,0x4504,0x10C7, - 0x22F1,0x11F1,0x0AC2,0x2125,0x1225,0x0B04,0x1107,0x1069, - 0x1A19,0x13BF,0x2A96,0x08D2,0x1271,0x0952,0x2BDF,0x0B31, - 0x1251,0x2124,0x0B13,0x12BD,0x1233,0x13EE,0x2144,0x0B16, - 0x0A15,0x18E2,0x08DD,0x1097,0x0857,0x0B24,0x0AA5,0x12A3, - 0x11C2,0x11D1,0x10CE,0x0865,0x123D,0x08B3,0x0B51,0x1971, - 0x0A41,0x0A06,0x1039,0x080A,0x0B22,0x0923,0x0836,0x08C3, - 0x0A1F,0x1072,0x080B,0x0935,0x0855,0x18A6,0x0A42,0x1133, - 0x0A83,0x0A09,0x0ACD,0x0A2E,0x0887,0x083A,0x10C5,0x085E, - 0x13B1,0x087D,0x0819,0x0A9F,0x0049,0x08F1,0x0BEF,0x1161, - 0x0B42,0x09E1,0x0A05,0x0904,0x12AE,0x029E,0x0A31,0x09FF, - 0x0951,0x0859,0x001A,0x082F,0x0B81,0x08B5,0x0A35,0x082A, - 0x08ED,0x1142,0x1262,0x0B32,0x08A5,0x12D2,0x03DD,0x0B07, - 0x18AE,0x083F,0x00AF,0x0AB3,0x086D,0x0287,0x0A93,0x025D, - 0x0816,0x13FF,0x0A8D,0x005D,0x08D1,0x0392,0x0845,0x0AC3, - 0x08C2,0x01A3,0x0AB1,0x09A2,0x005B,0x0B93,0x02B2,0x1086, - 0x001B,0x0863,0x0216,0x0AA1,0x0896,0x0A8F,0x084E,0x0A8E, - 0x0A53,0x0026,0x0A26,0x0382,0x0807,0x0862,0x0029,0x0871, - 0x00BD,0x0835,0x024E,0x0806,0x0941,0x0895,0x03AF,0x0A13, - 0x0932,0x03ED,0x0BFD,0x0207,0x0B83,0x0993,0x09B1,0x03CD, - 0x0A3E,0x03FE,0x0A21,0x0015,0x0B11,0x0A43,0x00E1,0x136F, - 0x00BE,0x00A2,0x0842,0x0043,0x0825,0x082E,0x0A2A,0x03DE, - 0x0BA2,0x0122,0x0BCF,0x004D,0x0323,0x09C1,0x0292,0x083E, - 0x0252,0x0017,0x0A72,0x00CD,0x0182,0x0A63,0x0131,0x09B2, - 0x0303,0x0902,0x0053,0x035F,0x0A32,0x003D,0x0992,0x0A2F, - 0x03B2,0x0ABE,0x009F,0x0183,0x0312,0x08B1,0x0B02,0x0A17, - 0x0B7F,0x0333,0x0297,0x0A23,0x020F,0x0282,0x0851,0x0822, - 0x03CE,0x01EE,0x000E,0x08B2,0x0083,0x0A1D,0x00A3,0x0222, - 0x088F,0x0112,0x029D,0x0092,0x0A3F,0x0391,0x089E,0x0301, - 0x01FD,0x09BF,0x01CE,0x0852,0x01FE,0x0013,0x0903,0x088E, - 0x037E,0x021E,0x01EF,0x095F,0x016F,0x09DE,0x03BE,0x020E, - 0x0113,0x01DF,0x080F,0x020D,0x0833,0x03AE,0x0032,0x03BD, - 0x0823,0x001E,0x01AF,0x0203,0x034F,0x0093,0x0A81,0x036E, - 0x0291,0x038E,0x0A01,0x001F,0x017F,0x01CF,0x017E,0x0202, - 0x0BAD,0x0211,0x035D,0x035E,0x039F,0x0212,0x032E,0x033F, - 0x034D,0x034E,0x036D,0x032F,0x033E,0x037D,0x038F,0x039E + 0x0154, 0xAB34, 0xAD44, 0x8308, 0x7866, 0x7B64, 0x79A4, 0x7975, + 0x686A, 0x6908, 0xC514, 0x6174, 0x6128, 0x6118, 0x5B54, 0x5163, + 0xF856, 0x50F5, 0x986F, 0xDD34, 0x48FE, 0x4972, 0x48E6, 0x4146, + 0x48EE, 0x40F3, 0x4AC1, 0x38C6, 0x41E2, 0xBB05, 0x707E, 0x38D6, + 0x3927, 0x6B14, 0x384B, 0x3948, 0x3153, 0x385A, 0x3134, 0x6B15, + 0x39F2, 0x30CF, 0x3143, 0x91D2, 0x31C3, 0x60EF, 0x5973, 0x3076, + 0x28D3, 0x3261, 0x2875, 0x28DE, 0x290C, 0x51E3, 0x28A7, 0x20E3, + 0x2962, 0x2B06, 0x2917, 0x483B, 0x20B6, 0x2D24, 0x206E, 0x285F, + 0x20B7, 0x2936, 0x4047, 0x2037, 0x20DF, 0x28BF, 0x21B4, 0x21B3, + 0x1D08, 0x2027, 0x404F, 0x3846, 0x2116, 0x187F, 0x1879, 0x2285, + 0x1A29, 0x3915, 0x4873, 0x1955, 0x3114, 0x1B44, 0x2165, 0x107A, + 0x1956, 0x6137, 0x1106, 0x3145, 0x1B21, 0x19D3, 0x12AD, 0x1B41, + 0x1AD1, 0x1126, 0x18F2, 0x282B, 0x40E5, 0x20D5, 0x2A0A, 0x284A, + 0x1286, 0x1295, 0x121A, 0x2A0B, 0x321B, 0x122D, 0x10FD, 0x13A1, + 0x32A2, 0x12E1, 0x1164, 0x13C1, 0x124D, 0x1239, 0x4504, 0x10C7, + 0x22F1, 0x11F1, 0x0AC2, 0x2125, 0x1225, 0x0B04, 0x1107, 0x1069, + 0x1A19, 0x13BF, 0x2A96, 0x08D2, 0x1271, 0x0952, 0x2BDF, 0x0B31, + 0x1251, 0x2124, 0x0B13, 0x12BD, 0x1233, 0x13EE, 0x2144, 0x0B16, + 0x0A15, 0x18E2, 0x08DD, 0x1097, 0x0857, 0x0B24, 0x0AA5, 0x12A3, + 0x11C2, 0x11D1, 0x10CE, 0x0865, 0x123D, 0x08B3, 0x0B51, 0x1971, + 0x0A41, 0x0A06, 0x1039, 0x080A, 0x0B22, 0x0923, 0x0836, 0x08C3, + 0x0A1F, 0x1072, 0x080B, 0x0935, 0x0855, 0x18A6, 0x0A42, 0x1133, + 0x0A83, 0x0A09, 0x0ACD, 0x0A2E, 0x0887, 0x083A, 0x10C5, 0x085E, + 0x13B1, 0x087D, 0x0819, 0x0A9F, 0x0049, 0x08F1, 0x0BEF, 0x1161, + 0x0B42, 0x09E1, 0x0A05, 0x0904, 0x12AE, 0x029E, 0x0A31, 0x09FF, + 0x0951, 0x0859, 0x001A, 0x082F, 0x0B81, 0x08B5, 0x0A35, 0x082A, + 0x08ED, 0x1142, 0x1262, 0x0B32, 0x08A5, 0x12D2, 0x03DD, 0x0B07, + 0x18AE, 0x083F, 0x00AF, 0x0AB3, 0x086D, 0x0287, 0x0A93, 0x025D, + 0x0816, 0x13FF, 0x0A8D, 0x005D, 0x08D1, 0x0392, 0x0845, 0x0AC3, + 0x08C2, 0x01A3, 0x0AB1, 0x09A2, 0x005B, 0x0B93, 0x02B2, 0x1086, + 0x001B, 0x0863, 0x0216, 0x0AA1, 0x0896, 0x0A8F, 0x084E, 0x0A8E, + 0x0A53, 0x0026, 0x0A26, 0x0382, 0x0807, 0x0862, 0x0029, 0x0871, + 0x00BD, 0x0835, 0x024E, 0x0806, 0x0941, 0x0895, 0x03AF, 0x0A13, + 0x0932, 0x03ED, 0x0BFD, 0x0207, 0x0B83, 0x0993, 0x09B1, 0x03CD, + 0x0A3E, 0x03FE, 0x0A21, 0x0015, 0x0B11, 0x0A43, 0x00E1, 0x136F, + 0x00BE, 0x00A2, 0x0842, 0x0043, 0x0825, 0x082E, 0x0A2A, 0x03DE, + 0x0BA2, 0x0122, 0x0BCF, 0x004D, 0x0323, 0x09C1, 0x0292, 0x083E, + 0x0252, 0x0017, 0x0A72, 0x00CD, 0x0182, 0x0A63, 0x0131, 0x09B2, + 0x0303, 0x0902, 0x0053, 0x035F, 0x0A32, 0x003D, 0x0992, 0x0A2F, + 0x03B2, 0x0ABE, 0x009F, 0x0183, 0x0312, 0x08B1, 0x0B02, 0x0A17, + 0x0B7F, 0x0333, 0x0297, 0x0A23, 0x020F, 0x0282, 0x0851, 0x0822, + 0x03CE, 0x01EE, 0x000E, 0x08B2, 0x0083, 0x0A1D, 0x00A3, 0x0222, + 0x088F, 0x0112, 0x029D, 0x0092, 0x0A3F, 0x0391, 0x089E, 0x0301, + 0x01FD, 0x09BF, 0x01CE, 0x0852, 0x01FE, 0x0013, 0x0903, 0x088E, + 0x037E, 0x021E, 0x01EF, 0x095F, 0x016F, 0x09DE, 0x03BE, 0x020E, + 0x0113, 0x01DF, 0x080F, 0x020D, 0x0833, 0x03AE, 0x0032, 0x03BD, + 0x0823, 0x001E, 0x01AF, 0x0203, 0x034F, 0x0093, 0x0A81, 0x036E, + 0x0291, 0x038E, 0x0A01, 0x001F, 0x017F, 0x01CF, 0x017E, 0x0202, + 0x0BAD, 0x0211, 0x035D, 0x035E, 0x039F, 0x0212, 0x032E, 0x033F, + 0x034D, 0x034E, 0x036D, 0x032F, 0x033E, 0x037D, 0x038F, 0x039E }; static const uint16_t percentile_arr_10x8_1[221] { - 0x0621,0xDFAE,0x2443,0x54C2,0x37CD,0x1CF1,0xFCA3,0x14D2, - 0x2D32,0x5551,0x7DDF,0x5C33,0x15D1,0x3462,0x24B3,0x7452, - 0x5FBE,0x6472,0x65A2,0x1D06,0x445D,0x15EF,0x0E31,0x1D71, - 0x343E,0x0D42,0x0CDD,0x1F01,0x4691,0x1435,0x0E82,0x0DFF, - 0x17DD,0x0D22,0x24B2,0x1603,0x04B5,0x24AE,0x060D,0x2D13, - 0x0C7D,0x0496,0x17BD,0x1F4F,0x1F7D,0x1486,0x0593,0x1C16, - 0x0C07,0x15FE,0x041F,0x14D1,0x0C9F,0x0E81,0x0D15,0x27AF, - 0x0C2E,0x0D23,0x176E,0x0FAD,0x1C06,0x1561,0x0DB1,0x040B, - 0x1C4E,0x0D83,0x1711,0x0C42,0x0C71,0x1C1A,0x0D25,0x04A2, - 0x0C45,0x076D,0x0F9F,0x075F,0x0E12,0x046D,0x048F,0x1D92, - 0x0602,0x0C39,0x174E,0x0C51,0x0CA1,0x075E,0x05C1,0x14BD, - 0x0D31,0x0423,0x0F3F,0x0495,0x0C93,0x049E,0x0D05,0x04E1, - 0x0DEE,0x0415,0x04B1,0x0503,0x0CCD,0x042F,0x0DCF,0x044D, - 0x0541,0x1582,0x05DE,0x0D01,0x0487,0x040A,0x0516,0x0CA5, - 0x05FD,0x05BF,0x057D,0x0DA1,0x0426,0x040F,0x071F,0x0613, - 0x0432,0x0D12,0x043D,0x0425,0x0461,0x061D,0x0D21,0x0591, - 0x079D,0x048D,0x0429,0x0C49,0x04C1,0x042A,0x040E,0x0485, - 0x0511,0x0405,0x0502,0x0441,0x0C19,0x0692,0x0535,0x058F, - 0x041D,0x059F,0x072D,0x04AD,0x049D,0x05CE,0x048E,0x0C31, - 0x057F,0x078D,0x0409,0x041E,0x05AE,0x0611,0x058E,0x05DD, - 0x05CD,0x056E,0x0483,0x073D,0x054E,0x0D9E,0x0402,0x0491, - 0x040D,0x056F,0x042D,0x0581,0x0421,0x057E,0x0781,0x053E, - 0x0482,0x078F,0x0413,0x052E,0x0601,0x0422,0x0492,0x055E, - 0x05BE,0x0F9E,0x072F,0x074D,0x0412,0x070F,0x075D,0x05BD, - 0x051F,0x071D,0x073E,0x077E,0x0403,0x0411,0x078E,0x055D, - 0x05AF,0x05ED,0x052F,0x053F,0x070D,0x070E,0x072E,0x054F, - 0x0417,0x041B,0x0453,0x055F,0x060E,0x0622,0x0683,0x068D, - 0x0702,0x071E,0x076F,0x07BF,0x07CE + 0x0621, 0xDFAE, 0x2443, 0x54C2, 0x37CD, 0x1CF1, 0xFCA3, 0x14D2, + 0x2D32, 0x5551, 0x7DDF, 0x5C33, 0x15D1, 0x3462, 0x24B3, 0x7452, + 0x5FBE, 0x6472, 0x65A2, 0x1D06, 0x445D, 0x15EF, 0x0E31, 0x1D71, + 0x343E, 0x0D42, 0x0CDD, 0x1F01, 0x4691, 0x1435, 0x0E82, 0x0DFF, + 0x17DD, 0x0D22, 0x24B2, 0x1603, 0x04B5, 0x24AE, 0x060D, 0x2D13, + 0x0C7D, 0x0496, 0x17BD, 0x1F4F, 0x1F7D, 0x1486, 0x0593, 0x1C16, + 0x0C07, 0x15FE, 0x041F, 0x14D1, 0x0C9F, 0x0E81, 0x0D15, 0x27AF, + 0x0C2E, 0x0D23, 0x176E, 0x0FAD, 0x1C06, 0x1561, 0x0DB1, 0x040B, + 0x1C4E, 0x0D83, 0x1711, 0x0C42, 0x0C71, 0x1C1A, 0x0D25, 0x04A2, + 0x0C45, 0x076D, 0x0F9F, 0x075F, 0x0E12, 0x046D, 0x048F, 0x1D92, + 0x0602, 0x0C39, 0x174E, 0x0C51, 0x0CA1, 0x075E, 0x05C1, 0x14BD, + 0x0D31, 0x0423, 0x0F3F, 0x0495, 0x0C93, 0x049E, 0x0D05, 0x04E1, + 0x0DEE, 0x0415, 0x04B1, 0x0503, 0x0CCD, 0x042F, 0x0DCF, 0x044D, + 0x0541, 0x1582, 0x05DE, 0x0D01, 0x0487, 0x040A, 0x0516, 0x0CA5, + 0x05FD, 0x05BF, 0x057D, 0x0DA1, 0x0426, 0x040F, 0x071F, 0x0613, + 0x0432, 0x0D12, 0x043D, 0x0425, 0x0461, 0x061D, 0x0D21, 0x0591, + 0x079D, 0x048D, 0x0429, 0x0C49, 0x04C1, 0x042A, 0x040E, 0x0485, + 0x0511, 0x0405, 0x0502, 0x0441, 0x0C19, 0x0692, 0x0535, 0x058F, + 0x041D, 0x059F, 0x072D, 0x04AD, 0x049D, 0x05CE, 0x048E, 0x0C31, + 0x057F, 0x078D, 0x0409, 0x041E, 0x05AE, 0x0611, 0x058E, 0x05DD, + 0x05CD, 0x056E, 0x0483, 0x073D, 0x054E, 0x0D9E, 0x0402, 0x0491, + 0x040D, 0x056F, 0x042D, 0x0581, 0x0421, 0x057E, 0x0781, 0x053E, + 0x0482, 0x078F, 0x0413, 0x052E, 0x0601, 0x0422, 0x0492, 0x055E, + 0x05BE, 0x0F9E, 0x072F, 0x074D, 0x0412, 0x070F, 0x075D, 0x05BD, + 0x051F, 0x071D, 0x073E, 0x077E, 0x0403, 0x0411, 0x078E, 0x055D, + 0x05AF, 0x05ED, 0x052F, 0x053F, 0x070D, 0x070E, 0x072E, 0x054F, + 0x0417, 0x041B, 0x0453, 0x055F, 0x060E, 0x0622, 0x0683, 0x068D, + 0x0702, 0x071E, 0x076F, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_10x8 = @@ -769,96 +774,96 @@ static const packed_percentile_table block_pcd_10x8 = #if ASTCENC_BLOCK_MAX_TEXELS >= (10 * 10) static const uint16_t percentile_arr_10x10_0[453] { - 0x0334,0x9514,0x8954,0x806A,0x6F14,0x6724,0x6108,0x6364, - 0x5175,0x5D44,0x5866,0x5118,0x5308,0xA179,0x5128,0xF534, - 0x49A4,0x5354,0x9174,0x486F,0x48EA,0x40F3,0x4963,0x414A, - 0xF8F9,0x3984,0x4172,0x387E,0x405A,0x38DA,0x38F5,0x9B05, - 0x30EE,0x32C1,0x3261,0x3D08,0x31E2,0x3056,0x292B,0x3146, - 0x3127,0x3315,0x58CA,0x58E6,0x290C,0x3314,0x8134,0x28E3, - 0x28FE,0x2948,0x28C6,0x78DE,0x28BB,0x68D6,0x286E,0x2173, - 0x2962,0x21D2,0x205F,0x49F2,0x2917,0x2306,0x207F,0x404F, - 0x2153,0x2943,0x20CF,0x21C3,0x2073,0x20D3,0x2136,0x183B, - 0x430A,0x40A7,0x18B6,0x2079,0x2309,0x2075,0x184B,0x20EF, - 0x187A,0x7837,0x1B19,0x20AB,0x18BA,0x20B7,0x1994,0x19E3, - 0x21B4,0x49B3,0x38BF,0x193B,0x1876,0x182B,0x30F2,0x193A, - 0x1827,0x1965,0x1914,0x184A,0x4047,0x1916,0x1285,0x1937, - 0x122D,0x1915,0x1321,0x1955,0x1046,0x191B,0x2106,0x2919, - 0x1344,0x1524,0x12E1,0x3926,0x10E5,0x2295,0x1159,0x1145, - 0x10DF,0x124D,0x1271,0x092A,0x2169,0x1704,0x22A2,0x1164, - 0x13EE,0x12F1,0x0AD1,0x128A,0x110A,0x11D3,0x1286,0x115A, - 0x2BA1,0x0BBF,0x3956,0x2A89,0x12AD,0x10E9,0x0B41,0x1A29, - 0x2225,0x08FD,0x1107,0x08D5,0x191A,0x1125,0x1A96,0x0B04, - 0x18D9,0x2B16,0x11F1,0x0A33,0x0924,0x131A,0x1149,0x1324, - 0x0BEF,0x0A99,0x08CB,0x123D,0x1331,0x0BDF,0x0872,0x22A3, - 0x0AC2,0x1144,0x0D04,0x08D2,0x08CE,0x0AA9,0x0A9A,0x0B13, - 0x1251,0x0865,0x1069,0x0897,0x1215,0x18B3,0x1A62,0x08C7, - 0x185E,0x10E2,0x0AA5,0x21FF,0x090B,0x0952,0x09E1,0x0A42, - 0x08F1,0x0A06,0x0B22,0x087D,0x1139,0x021F,0x122E,0x082F, - 0x09C2,0x0887,0x0A0A,0x03C1,0x0929,0x0A5D,0x0A83,0x0BFF, - 0x0935,0x085B,0x0104,0x08DD,0x0923,0x083F,0x0241,0x09D1, - 0x0A39,0x0863,0x0A8B,0x08A6,0x008B,0x1133,0x13B1,0x089B, - 0x0AB3,0x0036,0x0BDD,0x08ED,0x0857,0x0971,0x0219,0x1235, - 0x0AB1,0x0ACD,0x036F,0x0A31,0x08AA,0x003A,0x08C3,0x0A05, - 0x02BD,0x0B92,0x0B07,0x12B2,0x08C5,0x0B51,0x0381,0x0A8D, - 0x01A3,0x0896,0x0855,0x0BFD,0x005D,0x0BFE,0x023E,0x08AF, - 0x00B9,0x0A93,0x00B5,0x0862,0x0A0B,0x0A09,0x0A72,0x0332, - 0x0AA1,0x08C9,0x024E,0x1382,0x0951,0x00A5,0x0A2A,0x0059, - 0x0A9E,0x0B42,0x004E,0x0942,0x03ED,0x09B2,0x02D2,0x0849, - 0x0035,0x0216,0x0961,0x0BAF,0x00AE,0x0826,0x0287,0x0A1A, - 0x0393,0x0221,0x09A2,0x086D,0x0226,0x0871,0x0039,0x082A, - 0x08C2,0x08E1,0x0845,0x0207,0x0B23,0x0015,0x00D1,0x0B83, - 0x037F,0x0252,0x08A9,0x0099,0x0A13,0x0053,0x0807,0x03CD, - 0x0BDE,0x0016,0x089A,0x0232,0x035F,0x0A8E,0x0AC3,0x022F, - 0x0263,0x0829,0x004D,0x0132,0x0806,0x0311,0x01B1,0x0941, - 0x0086,0x000B,0x1122,0x0025,0x0842,0x00BD,0x0BCF,0x03A2, - 0x0043,0x0B03,0x0895,0x0A8F,0x008A,0x09EF,0x0253,0x0A1B, - 0x0182,0x0243,0x0A92,0x00CD,0x083E,0x030B,0x0223,0x081A, - 0x0A9F,0x0193,0x00BE,0x0017,0x0931,0x0391,0x037E,0x09C1, - 0x0312,0x0333,0x03B2,0x083D,0x08B1,0x00B2,0x002E,0x021D, - 0x0A9D,0x0192,0x02AE,0x0102,0x0022,0x081B,0x0222,0x009E, - 0x021E,0x000A,0x089F,0x0217,0x0BCE,0x0052,0x020F,0x0A97, - 0x0282,0x008E,0x0A3F,0x01FD,0x00A3,0x0019,0x08A2,0x0301, - 0x036E,0x01FE,0x03BE,0x0ABE,0x01CE,0x0302,0x029B,0x0051, - 0x0883,0x008F,0x0BAE,0x01DF,0x0183,0x0912,0x000E,0x020D, - 0x01EE,0x0B4F,0x0033,0x0103,0x020E,0x0832,0x01AF,0x0913, - 0x01DE,0x0203,0x001E,0x0092,0x0093,0x000F,0x015F,0x0291, - 0x0281,0x0813,0x001F,0x01CF,0x033F,0x0023,0x01BF,0x0202, - 0x016F,0x017E,0x03AD,0x0201,0x034E,0x0BBD,0x036D,0x017F, - 0x0211,0x038E,0x0212,0x032E,0x034D,0x035E,0x037D,0x039E, - 0x032F,0x033E,0x035D,0x038F,0x039F + 0x0334, 0x9514, 0x8954, 0x806A, 0x6F14, 0x6724, 0x6108, 0x6364, + 0x5175, 0x5D44, 0x5866, 0x5118, 0x5308, 0xA179, 0x5128, 0xF534, + 0x49A4, 0x5354, 0x9174, 0x486F, 0x48EA, 0x40F3, 0x4963, 0x414A, + 0xF8F9, 0x3984, 0x4172, 0x387E, 0x405A, 0x38DA, 0x38F5, 0x9B05, + 0x30EE, 0x32C1, 0x3261, 0x3D08, 0x31E2, 0x3056, 0x292B, 0x3146, + 0x3127, 0x3315, 0x58CA, 0x58E6, 0x290C, 0x3314, 0x8134, 0x28E3, + 0x28FE, 0x2948, 0x28C6, 0x78DE, 0x28BB, 0x68D6, 0x286E, 0x2173, + 0x2962, 0x21D2, 0x205F, 0x49F2, 0x2917, 0x2306, 0x207F, 0x404F, + 0x2153, 0x2943, 0x20CF, 0x21C3, 0x2073, 0x20D3, 0x2136, 0x183B, + 0x430A, 0x40A7, 0x18B6, 0x2079, 0x2309, 0x2075, 0x184B, 0x20EF, + 0x187A, 0x7837, 0x1B19, 0x20AB, 0x18BA, 0x20B7, 0x1994, 0x19E3, + 0x21B4, 0x49B3, 0x38BF, 0x193B, 0x1876, 0x182B, 0x30F2, 0x193A, + 0x1827, 0x1965, 0x1914, 0x184A, 0x4047, 0x1916, 0x1285, 0x1937, + 0x122D, 0x1915, 0x1321, 0x1955, 0x1046, 0x191B, 0x2106, 0x2919, + 0x1344, 0x1524, 0x12E1, 0x3926, 0x10E5, 0x2295, 0x1159, 0x1145, + 0x10DF, 0x124D, 0x1271, 0x092A, 0x2169, 0x1704, 0x22A2, 0x1164, + 0x13EE, 0x12F1, 0x0AD1, 0x128A, 0x110A, 0x11D3, 0x1286, 0x115A, + 0x2BA1, 0x0BBF, 0x3956, 0x2A89, 0x12AD, 0x10E9, 0x0B41, 0x1A29, + 0x2225, 0x08FD, 0x1107, 0x08D5, 0x191A, 0x1125, 0x1A96, 0x0B04, + 0x18D9, 0x2B16, 0x11F1, 0x0A33, 0x0924, 0x131A, 0x1149, 0x1324, + 0x0BEF, 0x0A99, 0x08CB, 0x123D, 0x1331, 0x0BDF, 0x0872, 0x22A3, + 0x0AC2, 0x1144, 0x0D04, 0x08D2, 0x08CE, 0x0AA9, 0x0A9A, 0x0B13, + 0x1251, 0x0865, 0x1069, 0x0897, 0x1215, 0x18B3, 0x1A62, 0x08C7, + 0x185E, 0x10E2, 0x0AA5, 0x21FF, 0x090B, 0x0952, 0x09E1, 0x0A42, + 0x08F1, 0x0A06, 0x0B22, 0x087D, 0x1139, 0x021F, 0x122E, 0x082F, + 0x09C2, 0x0887, 0x0A0A, 0x03C1, 0x0929, 0x0A5D, 0x0A83, 0x0BFF, + 0x0935, 0x085B, 0x0104, 0x08DD, 0x0923, 0x083F, 0x0241, 0x09D1, + 0x0A39, 0x0863, 0x0A8B, 0x08A6, 0x008B, 0x1133, 0x13B1, 0x089B, + 0x0AB3, 0x0036, 0x0BDD, 0x08ED, 0x0857, 0x0971, 0x0219, 0x1235, + 0x0AB1, 0x0ACD, 0x036F, 0x0A31, 0x08AA, 0x003A, 0x08C3, 0x0A05, + 0x02BD, 0x0B92, 0x0B07, 0x12B2, 0x08C5, 0x0B51, 0x0381, 0x0A8D, + 0x01A3, 0x0896, 0x0855, 0x0BFD, 0x005D, 0x0BFE, 0x023E, 0x08AF, + 0x00B9, 0x0A93, 0x00B5, 0x0862, 0x0A0B, 0x0A09, 0x0A72, 0x0332, + 0x0AA1, 0x08C9, 0x024E, 0x1382, 0x0951, 0x00A5, 0x0A2A, 0x0059, + 0x0A9E, 0x0B42, 0x004E, 0x0942, 0x03ED, 0x09B2, 0x02D2, 0x0849, + 0x0035, 0x0216, 0x0961, 0x0BAF, 0x00AE, 0x0826, 0x0287, 0x0A1A, + 0x0393, 0x0221, 0x09A2, 0x086D, 0x0226, 0x0871, 0x0039, 0x082A, + 0x08C2, 0x08E1, 0x0845, 0x0207, 0x0B23, 0x0015, 0x00D1, 0x0B83, + 0x037F, 0x0252, 0x08A9, 0x0099, 0x0A13, 0x0053, 0x0807, 0x03CD, + 0x0BDE, 0x0016, 0x089A, 0x0232, 0x035F, 0x0A8E, 0x0AC3, 0x022F, + 0x0263, 0x0829, 0x004D, 0x0132, 0x0806, 0x0311, 0x01B1, 0x0941, + 0x0086, 0x000B, 0x1122, 0x0025, 0x0842, 0x00BD, 0x0BCF, 0x03A2, + 0x0043, 0x0B03, 0x0895, 0x0A8F, 0x008A, 0x09EF, 0x0253, 0x0A1B, + 0x0182, 0x0243, 0x0A92, 0x00CD, 0x083E, 0x030B, 0x0223, 0x081A, + 0x0A9F, 0x0193, 0x00BE, 0x0017, 0x0931, 0x0391, 0x037E, 0x09C1, + 0x0312, 0x0333, 0x03B2, 0x083D, 0x08B1, 0x00B2, 0x002E, 0x021D, + 0x0A9D, 0x0192, 0x02AE, 0x0102, 0x0022, 0x081B, 0x0222, 0x009E, + 0x021E, 0x000A, 0x089F, 0x0217, 0x0BCE, 0x0052, 0x020F, 0x0A97, + 0x0282, 0x008E, 0x0A3F, 0x01FD, 0x00A3, 0x0019, 0x08A2, 0x0301, + 0x036E, 0x01FE, 0x03BE, 0x0ABE, 0x01CE, 0x0302, 0x029B, 0x0051, + 0x0883, 0x008F, 0x0BAE, 0x01DF, 0x0183, 0x0912, 0x000E, 0x020D, + 0x01EE, 0x0B4F, 0x0033, 0x0103, 0x020E, 0x0832, 0x01AF, 0x0913, + 0x01DE, 0x0203, 0x001E, 0x0092, 0x0093, 0x000F, 0x015F, 0x0291, + 0x0281, 0x0813, 0x001F, 0x01CF, 0x033F, 0x0023, 0x01BF, 0x0202, + 0x016F, 0x017E, 0x03AD, 0x0201, 0x034E, 0x0BBD, 0x036D, 0x017F, + 0x0211, 0x038E, 0x0212, 0x032E, 0x034D, 0x035E, 0x037D, 0x039E, + 0x032F, 0x033E, 0x035D, 0x038F, 0x039F }; static const uint16_t percentile_arr_10x10_1[234] { - 0x07CD,0x6E21,0x24F1,0x8443,0xD7AE,0x24C2,0x1C62,0xCCA3, - 0x1C33,0xFDEF,0x2532,0x55DF,0x1472,0x6C3E,0x14D2,0x34DD, - 0x1452,0x745D,0x4D51,0x8DD1,0x247D,0x75FF,0x0CB3,0x17BE, - 0x6CAE,0x17DD,0x1571,0x3D06,0x4E31,0x0DA2,0x67BD,0x160D, - 0x2C4E,0x0D22,0x176E,0x3CB2,0x142E,0x4DFE,0x0F4F,0x1435, - 0x0F01,0x0D42,0x0F7D,0x0CB5,0x1E03,0x149F,0x1C96,0x141F, - 0x14B9,0x0FAF,0x0439,0x0E91,0x2682,0x1D13,0x1FAD,0x0407, - 0x3471,0x0C86,0x0F6D,0x0D15,0x0D61,0x040B,0x0C6D,0x0C16, - 0x0C9A,0x0D0A,0x0593,0x0CD1,0x248F,0x0C2F,0x3C42,0x1523, - 0x0445,0x0E81,0x0CA2,0x1525,0x0406,0x1C8A,0x0C1A,0x04BD, - 0x0F5E,0x0F3F,0x1F4E,0x0E1D,0x0423,0x0DCF,0x044D,0x0D92, - 0x0583,0x0DB1,0x1449,0x15EE,0x0F5F,0x079F,0x0D19,0x0409, - 0x04CD,0x05FD,0x143D,0x0612,0x0D03,0x0D82,0x04B1,0x0C95, - 0x0C2A,0x049E,0x05AF,0x0D31,0x05BE,0x04E1,0x0D05,0x0516, - 0x0711,0x05C1,0x0509,0x0D41,0x0493,0x048E,0x0602,0x05BF, - 0x0CA5,0x0529,0x0535,0x0D12,0x0539,0x0451,0x0C29,0x071F, - 0x040A,0x0F3D,0x0432,0x059F,0x0425,0x0C99,0x05DE,0x05CE, - 0x0C0F,0x0489,0x051A,0x0501,0x0415,0x057F,0x0431,0x0E13, - 0x040D,0x041D,0x075D,0x0C53,0x0502,0x04C1,0x049D,0x0426, - 0x040E,0x05A1,0x055F,0x0781,0x0591,0x04A9,0x048B,0x0D8E, - 0x052E,0x0412,0x0521,0x0405,0x04AD,0x074D,0x0611,0x077E, - 0x078F,0x078D,0x048D,0x041E,0x0487,0x0461,0x0C85,0x05ED, - 0x0402,0x0483,0x0419,0x0511,0x0491,0x0482,0x059E,0x068D, - 0x055D,0x072E,0x05DD,0x054E,0x0441,0x0422,0x052F,0x057D, - 0x072D,0x079D,0x0CA1,0x072F,0x079E,0x0581,0x042D,0x055E, - 0x0601,0x0413,0x0692,0x0403,0x051F,0x053F,0x054F,0x05CD, - 0x070F,0x071D,0x05AE,0x05BD,0x0492,0x056E,0x0411,0x0417, - 0x041B,0x0421,0x053E,0x056F,0x057E,0x058F,0x060E,0x0622, - 0x0683,0x0702,0x070D,0x070E,0x071E,0x073E,0x076F,0x078E, - 0x07BF,0x07CE + 0x07CD, 0x6E21, 0x24F1, 0x8443, 0xD7AE, 0x24C2, 0x1C62, 0xCCA3, + 0x1C33, 0xFDEF, 0x2532, 0x55DF, 0x1472, 0x6C3E, 0x14D2, 0x34DD, + 0x1452, 0x745D, 0x4D51, 0x8DD1, 0x247D, 0x75FF, 0x0CB3, 0x17BE, + 0x6CAE, 0x17DD, 0x1571, 0x3D06, 0x4E31, 0x0DA2, 0x67BD, 0x160D, + 0x2C4E, 0x0D22, 0x176E, 0x3CB2, 0x142E, 0x4DFE, 0x0F4F, 0x1435, + 0x0F01, 0x0D42, 0x0F7D, 0x0CB5, 0x1E03, 0x149F, 0x1C96, 0x141F, + 0x14B9, 0x0FAF, 0x0439, 0x0E91, 0x2682, 0x1D13, 0x1FAD, 0x0407, + 0x3471, 0x0C86, 0x0F6D, 0x0D15, 0x0D61, 0x040B, 0x0C6D, 0x0C16, + 0x0C9A, 0x0D0A, 0x0593, 0x0CD1, 0x248F, 0x0C2F, 0x3C42, 0x1523, + 0x0445, 0x0E81, 0x0CA2, 0x1525, 0x0406, 0x1C8A, 0x0C1A, 0x04BD, + 0x0F5E, 0x0F3F, 0x1F4E, 0x0E1D, 0x0423, 0x0DCF, 0x044D, 0x0D92, + 0x0583, 0x0DB1, 0x1449, 0x15EE, 0x0F5F, 0x079F, 0x0D19, 0x0409, + 0x04CD, 0x05FD, 0x143D, 0x0612, 0x0D03, 0x0D82, 0x04B1, 0x0C95, + 0x0C2A, 0x049E, 0x05AF, 0x0D31, 0x05BE, 0x04E1, 0x0D05, 0x0516, + 0x0711, 0x05C1, 0x0509, 0x0D41, 0x0493, 0x048E, 0x0602, 0x05BF, + 0x0CA5, 0x0529, 0x0535, 0x0D12, 0x0539, 0x0451, 0x0C29, 0x071F, + 0x040A, 0x0F3D, 0x0432, 0x059F, 0x0425, 0x0C99, 0x05DE, 0x05CE, + 0x0C0F, 0x0489, 0x051A, 0x0501, 0x0415, 0x057F, 0x0431, 0x0E13, + 0x040D, 0x041D, 0x075D, 0x0C53, 0x0502, 0x04C1, 0x049D, 0x0426, + 0x040E, 0x05A1, 0x055F, 0x0781, 0x0591, 0x04A9, 0x048B, 0x0D8E, + 0x052E, 0x0412, 0x0521, 0x0405, 0x04AD, 0x074D, 0x0611, 0x077E, + 0x078F, 0x078D, 0x048D, 0x041E, 0x0487, 0x0461, 0x0C85, 0x05ED, + 0x0402, 0x0483, 0x0419, 0x0511, 0x0491, 0x0482, 0x059E, 0x068D, + 0x055D, 0x072E, 0x05DD, 0x054E, 0x0441, 0x0422, 0x052F, 0x057D, + 0x072D, 0x079D, 0x0CA1, 0x072F, 0x079E, 0x0581, 0x042D, 0x055E, + 0x0601, 0x0413, 0x0692, 0x0403, 0x051F, 0x053F, 0x054F, 0x05CD, + 0x070F, 0x071D, 0x05AE, 0x05BD, 0x0492, 0x056E, 0x0411, 0x0417, + 0x041B, 0x0421, 0x053E, 0x056F, 0x057E, 0x058F, 0x060E, 0x0622, + 0x0683, 0x0702, 0x070D, 0x070E, 0x071E, 0x073E, 0x076F, 0x078E, + 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_10x10 { @@ -872,101 +877,101 @@ static const packed_percentile_table block_pcd_10x10 { #if ASTCENC_BLOCK_MAX_TEXELS >= (12 * 10) static const uint16_t percentile_arr_12x10_0[491] { - 0x0334,0x9954,0x8514,0x7128,0x6364,0xC174,0x5D34,0x5866, - 0x5975,0x5354,0xAF14,0x506A,0x5108,0x5724,0x5308,0x4544, - 0x4918,0x4064,0x49E2,0x4179,0x8163,0x4054,0xF81C,0x394A, - 0x38F3,0x4172,0x38F5,0xA06F,0x68EA,0x69F2,0x3134,0x31A4, - 0x305A,0x68DA,0x3056,0x3146,0x31F5,0x3148,0x5A61,0x32C1, - 0x31D2,0x307E,0x29E3,0x30E6,0x59C3,0x2984,0x29B6,0x28F9, - 0x5204,0x28EE,0x50CA,0x2997,0x48C6,0x4838,0x2953,0x200C, - 0x2943,0x2173,0x2D08,0x4162,0x29B4,0x2314,0x21B3,0x212B, - 0x210C,0x48E3,0x60DE,0x205F,0x20FE,0x2028,0x21A6,0x404F, - 0x20D6,0x2214,0x2127,0x1873,0x40CF,0x206E,0x1B09,0x21C6, - 0x2075,0x19D5,0x2305,0x18D3,0x2076,0x1804,0x230A,0x304B, - 0x20BB,0x18B6,0x1936,0x1B19,0x3037,0x187F,0x18A7,0x1B85, - 0x30BA,0x183B,0x1027,0x18EF,0x1B21,0x1879,0x10AB,0x1917, - 0x1114,0x18BF,0x1074,0x1994,0x2847,0x111B,0x28F2,0x11E5, - 0x19A7,0x113A,0x1046,0x28B7,0x207A,0x182B,0x1155,0x104A, - 0x1344,0x293B,0x11D3,0x2014,0x1044,0x1018,0x13A1,0x1315, - 0x2524,0x20DF,0x10E5,0x1126,0x12A2,0x1824,0x2271,0x11F1, - 0x2964,0x12D1,0x115A,0x092A,0x2341,0x1A2D,0x12E1,0x090A, - 0x13BF,0x0A4D,0x2119,0x0BC1,0x1233,0x1A8A,0x2008,0x1159, - 0x1A89,0x08D5,0x1156,0x0834,0x13EE,0x1169,0x1187,0x1AA3, - 0x1229,0x1331,0x0A85,0x0937,0x1704,0x08FD,0x2124,0x0B13, - 0x1251,0x0AAD,0x082C,0x091A,0x18D9,0x0A99,0x1848,0x18E9, - 0x0B95,0x1144,0x0AF1,0x1A25,0x131A,0x09C5,0x0986,0x1BDF, - 0x0B24,0x0965,0x1262,0x0949,0x0872,0x09C2,0x12C2,0x0916, - 0x085E,0x0B06,0x08CB,0x08C7,0x1242,0x1BEF,0x0A9A,0x1152, - 0x08B3,0x0AA9,0x090B,0x08D2,0x1B22,0x0B04,0x0865,0x0A15, - 0x1286,0x0A83,0x0A95,0x09D1,0x0A06,0x0196,0x1139,0x0A3D, - 0x0933,0x13B1,0x0123,0x0D04,0x08E2,0x122E,0x08A6,0x00CE, - 0x0A31,0x1241,0x0B51,0x1057,0x1171,0x007D,0x1145,0x0A0A, - 0x0129,0x09FF,0x089B,0x085B,0x0063,0x0AB1,0x0A1F,0x0A5D, - 0x0AA5,0x0036,0x0904,0x0B86,0x0A8B,0x0897,0x11E1,0x0332, - 0x083F,0x0A19,0x02B3,0x0859,0x08C3,0x0855,0x11B5,0x01A5, - 0x0AB2,0x0392,0x10DD,0x09A3,0x00ED,0x0907,0x1161,0x002F, - 0x0887,0x0216,0x0ABD,0x0B81,0x0A93,0x0A21,0x003A,0x0ACD, - 0x0AA1,0x0A35,0x0272,0x0BDD,0x03FE,0x0BAF,0x0869,0x0213, - 0x088B,0x020B,0x00B5,0x1035,0x08F1,0x0151,0x0A4E,0x0239, - 0x0BA2,0x00AA,0x0896,0x0382,0x0A08,0x0A05,0x0A09,0x0142, - 0x086D,0x004E,0x0B23,0x0106,0x0807,0x036F,0x0995,0x03FD, - 0x08AF,0x08C5,0x0062,0x0053,0x0B42,0x0826,0x021A,0x01A2, - 0x09B1,0x00C9,0x09B2,0x0045,0x0207,0x08B9,0x00A5,0x0AD2, - 0x0095,0x003E,0x0A32,0x0383,0x0849,0x0135,0x029E,0x0A26, - 0x023E,0x0BFF,0x0A52,0x0311,0x001B,0x0915,0x0A8D,0x0223, - 0x022A,0x0BED,0x0086,0x0A96,0x0222,0x035F,0x0A43,0x085D, - 0x0303,0x0393,0x0A63,0x082A,0x037F,0x0932,0x0043,0x0292, - 0x03CD,0x0BDE,0x009F,0x0125,0x08A9,0x0253,0x0015,0x0192, - 0x0A17,0x08C2,0x0316,0x00D1,0x0282,0x0871,0x0312,0x0122, - 0x0A9F,0x02AE,0x0006,0x0A8E,0x08E1,0x0016,0x0B0B,0x00AE, - 0x0025,0x0193,0x0AC3,0x0017,0x0307,0x00BD,0x08BE,0x0039, - 0x0BB2,0x021B,0x01FD,0x084D,0x03CE,0x00A3,0x0302,0x0BCF, - 0x0033,0x0391,0x028F,0x0852,0x0287,0x008A,0x0333,0x080B, - 0x0131,0x01C1,0x037E,0x0A0F,0x00B1,0x002E,0x0099,0x0902, - 0x009A,0x003D,0x0982,0x0301,0x00CD,0x0941,0x0042,0x0183, - 0x029D,0x08A2,0x021D,0x001A,0x0A97,0x01EF,0x01CE,0x0051, - 0x0BAE,0x022F,0x03BE,0x021E,0x000A,0x09DF,0x0029,0x020D, - 0x02BE,0x029B,0x09EE,0x00B2,0x0912,0x036E,0x009E,0x0022, - 0x0019,0x0892,0x0032,0x01FE,0x0083,0x023F,0x0B96,0x000E, - 0x008F,0x0113,0x0103,0x001E,0x0A0E,0x0013,0x008E,0x0281, - 0x09AF,0x017E,0x0203,0x016F,0x0291,0x0023,0x0093,0x03BD, - 0x001F,0x01CF,0x01DE,0x0201,0x01BF,0x0B4F,0x000F,0x0202, - 0x037D,0x038E,0x0211,0x0212,0x034E,0x039F,0x03AD,0x015F, - 0x017F,0x032E,0x033F,0x034D,0x035E,0x036D,0x032F,0x033E, - 0x035D,0x038F,0x039E + 0x0334, 0x9954, 0x8514, 0x7128, 0x6364, 0xC174, 0x5D34, 0x5866, + 0x5975, 0x5354, 0xAF14, 0x506A, 0x5108, 0x5724, 0x5308, 0x4544, + 0x4918, 0x4064, 0x49E2, 0x4179, 0x8163, 0x4054, 0xF81C, 0x394A, + 0x38F3, 0x4172, 0x38F5, 0xA06F, 0x68EA, 0x69F2, 0x3134, 0x31A4, + 0x305A, 0x68DA, 0x3056, 0x3146, 0x31F5, 0x3148, 0x5A61, 0x32C1, + 0x31D2, 0x307E, 0x29E3, 0x30E6, 0x59C3, 0x2984, 0x29B6, 0x28F9, + 0x5204, 0x28EE, 0x50CA, 0x2997, 0x48C6, 0x4838, 0x2953, 0x200C, + 0x2943, 0x2173, 0x2D08, 0x4162, 0x29B4, 0x2314, 0x21B3, 0x212B, + 0x210C, 0x48E3, 0x60DE, 0x205F, 0x20FE, 0x2028, 0x21A6, 0x404F, + 0x20D6, 0x2214, 0x2127, 0x1873, 0x40CF, 0x206E, 0x1B09, 0x21C6, + 0x2075, 0x19D5, 0x2305, 0x18D3, 0x2076, 0x1804, 0x230A, 0x304B, + 0x20BB, 0x18B6, 0x1936, 0x1B19, 0x3037, 0x187F, 0x18A7, 0x1B85, + 0x30BA, 0x183B, 0x1027, 0x18EF, 0x1B21, 0x1879, 0x10AB, 0x1917, + 0x1114, 0x18BF, 0x1074, 0x1994, 0x2847, 0x111B, 0x28F2, 0x11E5, + 0x19A7, 0x113A, 0x1046, 0x28B7, 0x207A, 0x182B, 0x1155, 0x104A, + 0x1344, 0x293B, 0x11D3, 0x2014, 0x1044, 0x1018, 0x13A1, 0x1315, + 0x2524, 0x20DF, 0x10E5, 0x1126, 0x12A2, 0x1824, 0x2271, 0x11F1, + 0x2964, 0x12D1, 0x115A, 0x092A, 0x2341, 0x1A2D, 0x12E1, 0x090A, + 0x13BF, 0x0A4D, 0x2119, 0x0BC1, 0x1233, 0x1A8A, 0x2008, 0x1159, + 0x1A89, 0x08D5, 0x1156, 0x0834, 0x13EE, 0x1169, 0x1187, 0x1AA3, + 0x1229, 0x1331, 0x0A85, 0x0937, 0x1704, 0x08FD, 0x2124, 0x0B13, + 0x1251, 0x0AAD, 0x082C, 0x091A, 0x18D9, 0x0A99, 0x1848, 0x18E9, + 0x0B95, 0x1144, 0x0AF1, 0x1A25, 0x131A, 0x09C5, 0x0986, 0x1BDF, + 0x0B24, 0x0965, 0x1262, 0x0949, 0x0872, 0x09C2, 0x12C2, 0x0916, + 0x085E, 0x0B06, 0x08CB, 0x08C7, 0x1242, 0x1BEF, 0x0A9A, 0x1152, + 0x08B3, 0x0AA9, 0x090B, 0x08D2, 0x1B22, 0x0B04, 0x0865, 0x0A15, + 0x1286, 0x0A83, 0x0A95, 0x09D1, 0x0A06, 0x0196, 0x1139, 0x0A3D, + 0x0933, 0x13B1, 0x0123, 0x0D04, 0x08E2, 0x122E, 0x08A6, 0x00CE, + 0x0A31, 0x1241, 0x0B51, 0x1057, 0x1171, 0x007D, 0x1145, 0x0A0A, + 0x0129, 0x09FF, 0x089B, 0x085B, 0x0063, 0x0AB1, 0x0A1F, 0x0A5D, + 0x0AA5, 0x0036, 0x0904, 0x0B86, 0x0A8B, 0x0897, 0x11E1, 0x0332, + 0x083F, 0x0A19, 0x02B3, 0x0859, 0x08C3, 0x0855, 0x11B5, 0x01A5, + 0x0AB2, 0x0392, 0x10DD, 0x09A3, 0x00ED, 0x0907, 0x1161, 0x002F, + 0x0887, 0x0216, 0x0ABD, 0x0B81, 0x0A93, 0x0A21, 0x003A, 0x0ACD, + 0x0AA1, 0x0A35, 0x0272, 0x0BDD, 0x03FE, 0x0BAF, 0x0869, 0x0213, + 0x088B, 0x020B, 0x00B5, 0x1035, 0x08F1, 0x0151, 0x0A4E, 0x0239, + 0x0BA2, 0x00AA, 0x0896, 0x0382, 0x0A08, 0x0A05, 0x0A09, 0x0142, + 0x086D, 0x004E, 0x0B23, 0x0106, 0x0807, 0x036F, 0x0995, 0x03FD, + 0x08AF, 0x08C5, 0x0062, 0x0053, 0x0B42, 0x0826, 0x021A, 0x01A2, + 0x09B1, 0x00C9, 0x09B2, 0x0045, 0x0207, 0x08B9, 0x00A5, 0x0AD2, + 0x0095, 0x003E, 0x0A32, 0x0383, 0x0849, 0x0135, 0x029E, 0x0A26, + 0x023E, 0x0BFF, 0x0A52, 0x0311, 0x001B, 0x0915, 0x0A8D, 0x0223, + 0x022A, 0x0BED, 0x0086, 0x0A96, 0x0222, 0x035F, 0x0A43, 0x085D, + 0x0303, 0x0393, 0x0A63, 0x082A, 0x037F, 0x0932, 0x0043, 0x0292, + 0x03CD, 0x0BDE, 0x009F, 0x0125, 0x08A9, 0x0253, 0x0015, 0x0192, + 0x0A17, 0x08C2, 0x0316, 0x00D1, 0x0282, 0x0871, 0x0312, 0x0122, + 0x0A9F, 0x02AE, 0x0006, 0x0A8E, 0x08E1, 0x0016, 0x0B0B, 0x00AE, + 0x0025, 0x0193, 0x0AC3, 0x0017, 0x0307, 0x00BD, 0x08BE, 0x0039, + 0x0BB2, 0x021B, 0x01FD, 0x084D, 0x03CE, 0x00A3, 0x0302, 0x0BCF, + 0x0033, 0x0391, 0x028F, 0x0852, 0x0287, 0x008A, 0x0333, 0x080B, + 0x0131, 0x01C1, 0x037E, 0x0A0F, 0x00B1, 0x002E, 0x0099, 0x0902, + 0x009A, 0x003D, 0x0982, 0x0301, 0x00CD, 0x0941, 0x0042, 0x0183, + 0x029D, 0x08A2, 0x021D, 0x001A, 0x0A97, 0x01EF, 0x01CE, 0x0051, + 0x0BAE, 0x022F, 0x03BE, 0x021E, 0x000A, 0x09DF, 0x0029, 0x020D, + 0x02BE, 0x029B, 0x09EE, 0x00B2, 0x0912, 0x036E, 0x009E, 0x0022, + 0x0019, 0x0892, 0x0032, 0x01FE, 0x0083, 0x023F, 0x0B96, 0x000E, + 0x008F, 0x0113, 0x0103, 0x001E, 0x0A0E, 0x0013, 0x008E, 0x0281, + 0x09AF, 0x017E, 0x0203, 0x016F, 0x0291, 0x0023, 0x0093, 0x03BD, + 0x001F, 0x01CF, 0x01DE, 0x0201, 0x01BF, 0x0B4F, 0x000F, 0x0202, + 0x037D, 0x038E, 0x0211, 0x0212, 0x034E, 0x039F, 0x03AD, 0x015F, + 0x017F, 0x032E, 0x033F, 0x034D, 0x035E, 0x036D, 0x032F, 0x033E, + 0x035D, 0x038F, 0x039E }; static const uint16_t percentile_arr_12x10_1[240] { - 0x0621,0xA443,0xFCC2,0x3CA3,0x1D32,0x14F1,0x7462,0x1433, - 0x27CD,0x2571,0x57AE,0x5DD1,0x64B3,0x44D2,0x2C72,0x25A2, - 0x1E31,0x55DF,0x4C52,0x1DEF,0x0D51,0x3C5D,0x3C3E,0x74DD, - 0x347D,0x27BE,0x5CB5,0x17DD,0x2C14,0x0CAE,0x24B2,0x15FF, - 0x2701,0x0D42,0x1FBD,0x0C35,0x1603,0x060D,0x1D93,0x0C96, - 0x1C07,0x1522,0x0D06,0x0F4F,0x0C9F,0x1F6E,0x0D86,0x0C2E, - 0x1DFE,0x0682,0x1E91,0x0F7D,0x0C86,0x040B,0x1513,0x044E, - 0x14D1,0x0C39,0x14B9,0x1C71,0x05B1,0x0C1F,0x0681,0x1445, - 0x0C16,0x0D95,0x1583,0x0D61,0x0FAD,0x1442,0x048F,0x0D0A, - 0x049A,0x0F6D,0x146D,0x0C2F,0x0D25,0x0406,0x0C1A,0x0D23, - 0x0612,0x0FAF,0x0F11,0x0592,0x0515,0x14E1,0x0602,0x048A, - 0x0E1D,0x0CBD,0x0F9F,0x0423,0x075E,0x174E,0x0426,0x0404, - 0x0C22,0x0CA2,0x0DEE,0x0CA5,0x0F3F,0x05C1,0x0CCD,0x0503, - 0x044D,0x0D16,0x0449,0x0D82,0x0613,0x0585,0x0519,0x0C95, - 0x075F,0x0D35,0x04B1,0x0509,0x0531,0x0DA1,0x049E,0x040A, - 0x05CF,0x0D41,0x0415,0x0692,0x05FD,0x0C25,0x04A1,0x0529, - 0x0591,0x0C93,0x057F,0x04C1,0x0512,0x051A,0x078D,0x0451, - 0x0C0F,0x0487,0x0611,0x0432,0x042A,0x05AF,0x0461,0x072D, - 0x0409,0x0405,0x0D39,0x05DE,0x048E,0x0499,0x0483,0x04A9, - 0x0491,0x042D,0x049D,0x0429,0x040E,0x05AE,0x0521,0x043D, - 0x0581,0x05DD,0x0492,0x0CAD,0x041E,0x058F,0x071F,0x072F, - 0x0419,0x073D,0x057D,0x0511,0x05CE,0x041D,0x0485,0x056E, - 0x0412,0x0431,0x05BF,0x0441,0x054E,0x0489,0x0421,0x0502, - 0x0408,0x040D,0x051F,0x059F,0x073E,0x078F,0x0482,0x079D, - 0x0C02,0x05BE,0x048B,0x0411,0x0505,0x057E,0x052E,0x074D, - 0x077E,0x054F,0x0601,0x055F,0x068D,0x070D,0x070F,0x071E, - 0x072E,0x05CD,0x0403,0x0501,0x055D,0x059E,0x0781,0x0413, - 0x0417,0x041B,0x0453,0x048D,0x052F,0x053E,0x053F,0x055E, - 0x056F,0x058E,0x05BD,0x05ED,0x060E,0x0622,0x0683,0x0702, - 0x070E,0x071D,0x075D,0x076F,0x078E,0x079E,0x07BF,0x07CE + 0x0621, 0xA443, 0xFCC2, 0x3CA3, 0x1D32, 0x14F1, 0x7462, 0x1433, + 0x27CD, 0x2571, 0x57AE, 0x5DD1, 0x64B3, 0x44D2, 0x2C72, 0x25A2, + 0x1E31, 0x55DF, 0x4C52, 0x1DEF, 0x0D51, 0x3C5D, 0x3C3E, 0x74DD, + 0x347D, 0x27BE, 0x5CB5, 0x17DD, 0x2C14, 0x0CAE, 0x24B2, 0x15FF, + 0x2701, 0x0D42, 0x1FBD, 0x0C35, 0x1603, 0x060D, 0x1D93, 0x0C96, + 0x1C07, 0x1522, 0x0D06, 0x0F4F, 0x0C9F, 0x1F6E, 0x0D86, 0x0C2E, + 0x1DFE, 0x0682, 0x1E91, 0x0F7D, 0x0C86, 0x040B, 0x1513, 0x044E, + 0x14D1, 0x0C39, 0x14B9, 0x1C71, 0x05B1, 0x0C1F, 0x0681, 0x1445, + 0x0C16, 0x0D95, 0x1583, 0x0D61, 0x0FAD, 0x1442, 0x048F, 0x0D0A, + 0x049A, 0x0F6D, 0x146D, 0x0C2F, 0x0D25, 0x0406, 0x0C1A, 0x0D23, + 0x0612, 0x0FAF, 0x0F11, 0x0592, 0x0515, 0x14E1, 0x0602, 0x048A, + 0x0E1D, 0x0CBD, 0x0F9F, 0x0423, 0x075E, 0x174E, 0x0426, 0x0404, + 0x0C22, 0x0CA2, 0x0DEE, 0x0CA5, 0x0F3F, 0x05C1, 0x0CCD, 0x0503, + 0x044D, 0x0D16, 0x0449, 0x0D82, 0x0613, 0x0585, 0x0519, 0x0C95, + 0x075F, 0x0D35, 0x04B1, 0x0509, 0x0531, 0x0DA1, 0x049E, 0x040A, + 0x05CF, 0x0D41, 0x0415, 0x0692, 0x05FD, 0x0C25, 0x04A1, 0x0529, + 0x0591, 0x0C93, 0x057F, 0x04C1, 0x0512, 0x051A, 0x078D, 0x0451, + 0x0C0F, 0x0487, 0x0611, 0x0432, 0x042A, 0x05AF, 0x0461, 0x072D, + 0x0409, 0x0405, 0x0D39, 0x05DE, 0x048E, 0x0499, 0x0483, 0x04A9, + 0x0491, 0x042D, 0x049D, 0x0429, 0x040E, 0x05AE, 0x0521, 0x043D, + 0x0581, 0x05DD, 0x0492, 0x0CAD, 0x041E, 0x058F, 0x071F, 0x072F, + 0x0419, 0x073D, 0x057D, 0x0511, 0x05CE, 0x041D, 0x0485, 0x056E, + 0x0412, 0x0431, 0x05BF, 0x0441, 0x054E, 0x0489, 0x0421, 0x0502, + 0x0408, 0x040D, 0x051F, 0x059F, 0x073E, 0x078F, 0x0482, 0x079D, + 0x0C02, 0x05BE, 0x048B, 0x0411, 0x0505, 0x057E, 0x052E, 0x074D, + 0x077E, 0x054F, 0x0601, 0x055F, 0x068D, 0x070D, 0x070F, 0x071E, + 0x072E, 0x05CD, 0x0403, 0x0501, 0x055D, 0x059E, 0x0781, 0x0413, + 0x0417, 0x041B, 0x0453, 0x048D, 0x052F, 0x053E, 0x053F, 0x055E, + 0x056F, 0x058E, 0x05BD, 0x05ED, 0x060E, 0x0622, 0x0683, 0x0702, + 0x070E, 0x071D, 0x075D, 0x076F, 0x078E, 0x079E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_12x10 = @@ -981,107 +986,107 @@ static const packed_percentile_table block_pcd_12x10 = #if ASTCENC_BLOCK_MAX_TEXELS >= (12 * 12) static const uint16_t percentile_arr_12x12_0[529] { - 0x0334,0xF534,0x8514,0x8954,0x7F14,0xFB54,0x7B08,0x7128, - 0x7974,0x6179,0x6B64,0x6908,0x606A,0x6724,0xB544,0xB066, - 0xA14A,0x5118,0x9975,0x51F9,0x981C,0x49CA,0x4854,0x886F, - 0x88D4,0x48EE,0x41E2,0x4163,0x40F3,0x4261,0x4064,0x407E, - 0x385A,0x42C1,0x4172,0x38EA,0x3946,0x78CF,0xA056,0x38DE, - 0x3D08,0x38F9,0x3B14,0x38FE,0xA134,0x38B8,0x31A4,0x71D2, - 0x60DA,0x39C3,0x99BA,0x60CA,0x39F2,0x30F5,0x304F,0x31B6, - 0x31F5,0x3204,0x3148,0x305F,0x2953,0x3194,0x3184,0x310C, - 0x889C,0x300C,0x2943,0x30EF,0x28C6,0x2997,0x2838,0x58E6, - 0x20E4,0x28E3,0x2873,0x29E3,0x2A84,0x28D3,0x492B,0x2962, - 0x286E,0x20BF,0x21AA,0x29A6,0x6A14,0x2828,0x89C6,0x21B3, - 0x2305,0x29B4,0x2173,0x2127,0x20D6,0x407F,0x2294,0x21D9, - 0x21D5,0x2004,0x404B,0x18DF,0x2079,0x219B,0x18A8,0x2385, - 0x1936,0x21AB,0x188C,0x1B09,0x18BA,0x203B,0x187A,0x1875, - 0x2344,0x18BB,0x18B6,0x193A,0x1837,0x1914,0x1846,0x1876, - 0x1884,0x1D24,0x182B,0x284A,0x18A7,0x18AB,0x1917,0x322D, - 0x1047,0x1874,0x1818,0x18F2,0x1164,0x1B89,0x2959,0x1B21, - 0x39E5,0x1827,0x10F4,0x18B7,0x11D3,0x1A4D,0x1315,0x12AD, - 0x1AD1,0x3A71,0x1319,0x11A7,0x2044,0x2F04,0x2341,0x10E5, - 0x1155,0x195A,0x1024,0x111B,0x1251,0x1233,0x12E1,0x13A1, - 0x13BF,0x212A,0x22A2,0x113B,0x23DF,0x10D5,0x2399,0x0814, - 0x1126,0x13EE,0x1285,0x10C4,0x18FD,0x20D9,0x0987,0x1242, - 0x29C5,0x2313,0x0898,0x13C1,0x08C8,0x11F1,0x1034,0x1B24, - 0x0B0A,0x11E9,0x0808,0x125D,0x18E9,0x0848,0x1395,0x0965, - 0x123D,0x2186,0x1295,0x18CE,0x098B,0x0BEF,0x1504,0x082C, - 0x0A41,0x1144,0x0A89,0x0956,0x1331,0x085E,0x0B04,0x128A, - 0x12A3,0x1937,0x19C2,0x0952,0x0872,0x08B4,0x1262,0x1124, - 0x1969,0x1063,0x0AF1,0x1225,0x0894,0x11C9,0x18D2,0x0ACD, - 0x0A29,0x0B06,0x09B5,0x18C7,0x0916,0x1088,0x09FF,0x2206, - 0x0A15,0x08B3,0x0B51,0x0A1F,0x18CB,0x0AC2,0x0A2E,0x1865, - 0x08AC,0x0A31,0x08A4,0x138A,0x0A99,0x09D1,0x0A86,0x189B, - 0x0283,0x0BDD,0x0ABD,0x1933,0x083F,0x1386,0x0923,0x0322, - 0x0869,0x10DD,0x13B1,0x082F,0x087D,0x11B9,0x085B,0x08ED, - 0x00C3,0x08E2,0x084E,0x0887,0x0855,0x0A0A,0x0857,0x0B92, - 0x1036,0x12A5,0x0293,0x0945,0x08A6,0x0196,0x19A3,0x036F, - 0x0904,0x1205,0x09E1,0x0381,0x0971,0x1219,0x0BAF,0x0949, - 0x00AF,0x0AA9,0x018A,0x0907,0x0BFD,0x003A,0x0BCD,0x0AB2, - 0x088B,0x0252,0x0A4E,0x03FF,0x0845,0x0897,0x0059,0x090B, - 0x0B42,0x0807,0x0A16,0x0853,0x0A8D,0x01B2,0x0AB1,0x091A, - 0x0195,0x0A35,0x00B5,0x10AA,0x0115,0x0A21,0x0096,0x0A08, - 0x03FE,0x0B7F,0x08B9,0x12B3,0x023E,0x0A23,0x029E,0x08F1, - 0x01A9,0x0BDE,0x0843,0x02D2,0x0A1A,0x08C5,0x0151,0x0A43, - 0x0332,0x0383,0x0826,0x0BED,0x10C2,0x00AE,0x0B82,0x0213, - 0x0232,0x085D,0x02A1,0x101B,0x035F,0x0303,0x0A39,0x0207, - 0x0A53,0x0142,0x01A5,0x082A,0x0099,0x0A17,0x03CF,0x0906, - 0x0125,0x0A96,0x0A9A,0x0209,0x0393,0x0961,0x0131,0x0A88, - 0x0139,0x099A,0x0292,0x0272,0x0862,0x08BE,0x0141,0x02C3, - 0x0886,0x0039,0x08A9,0x01A2,0x01B1,0x0851,0x020B,0x086D, - 0x0312,0x08CD,0x020F,0x0311,0x0BCE,0x0135,0x0006,0x0849, - 0x0132,0x0A8F,0x022F,0x022A,0x0AAE,0x0A8E,0x0263,0x03A2, - 0x083E,0x009A,0x021B,0x0835,0x0323,0x0871,0x0993,0x0226, - 0x0302,0x0922,0x0119,0x0222,0x021D,0x0B07,0x08C9,0x037E, - 0x08BD,0x0042,0x00D1,0x0B33,0x01C1,0x0B9A,0x0282,0x088A, - 0x0182,0x083D,0x004D,0x010A,0x0A1E,0x0019,0x00B2,0x0999, - 0x00A5,0x0095,0x0817,0x0022,0x031A,0x0902,0x00A3,0x01BF, - 0x029F,0x0816,0x03B2,0x0015,0x0391,0x0BBE,0x01FE,0x1129, - 0x002E,0x01DF,0x0301,0x0033,0x0B6E,0x00E1,0x0297,0x00B1, - 0x009F,0x0B16,0x000A,0x001A,0x0052,0x080B,0x030B,0x029D, - 0x0BAE,0x01FD,0x020E,0x00A2,0x0A3F,0x0192,0x0ABE,0x020D, - 0x008F,0x028B,0x0083,0x0025,0x09EE,0x01EF,0x0029,0x0291, - 0x0B4F,0x0396,0x0287,0x008E,0x0092,0x0B4E,0x017E,0x001E, - 0x009E,0x0103,0x080F,0x000E,0x0113,0x0203,0x01CF,0x0183, - 0x01CE,0x001F,0x0112,0x01DE,0x038E,0x0832,0x033E,0x0212, - 0x029B,0x0023,0x016F,0x0201,0x09AF,0x0202,0x0281,0x035E, - 0x034D,0x037D,0x03AD,0x0013,0x0093,0x015F,0x0211,0x033F, - 0x036D,0x039F,0x03BD,0x017F,0x032E,0x032F,0x035D,0x038F, + 0x0334, 0xF534, 0x8514, 0x8954, 0x7F14, 0xFB54, 0x7B08, 0x7128, + 0x7974, 0x6179, 0x6B64, 0x6908, 0x606A, 0x6724, 0xB544, 0xB066, + 0xA14A, 0x5118, 0x9975, 0x51F9, 0x981C, 0x49CA, 0x4854, 0x886F, + 0x88D4, 0x48EE, 0x41E2, 0x4163, 0x40F3, 0x4261, 0x4064, 0x407E, + 0x385A, 0x42C1, 0x4172, 0x38EA, 0x3946, 0x78CF, 0xA056, 0x38DE, + 0x3D08, 0x38F9, 0x3B14, 0x38FE, 0xA134, 0x38B8, 0x31A4, 0x71D2, + 0x60DA, 0x39C3, 0x99BA, 0x60CA, 0x39F2, 0x30F5, 0x304F, 0x31B6, + 0x31F5, 0x3204, 0x3148, 0x305F, 0x2953, 0x3194, 0x3184, 0x310C, + 0x889C, 0x300C, 0x2943, 0x30EF, 0x28C6, 0x2997, 0x2838, 0x58E6, + 0x20E4, 0x28E3, 0x2873, 0x29E3, 0x2A84, 0x28D3, 0x492B, 0x2962, + 0x286E, 0x20BF, 0x21AA, 0x29A6, 0x6A14, 0x2828, 0x89C6, 0x21B3, + 0x2305, 0x29B4, 0x2173, 0x2127, 0x20D6, 0x407F, 0x2294, 0x21D9, + 0x21D5, 0x2004, 0x404B, 0x18DF, 0x2079, 0x219B, 0x18A8, 0x2385, + 0x1936, 0x21AB, 0x188C, 0x1B09, 0x18BA, 0x203B, 0x187A, 0x1875, + 0x2344, 0x18BB, 0x18B6, 0x193A, 0x1837, 0x1914, 0x1846, 0x1876, + 0x1884, 0x1D24, 0x182B, 0x284A, 0x18A7, 0x18AB, 0x1917, 0x322D, + 0x1047, 0x1874, 0x1818, 0x18F2, 0x1164, 0x1B89, 0x2959, 0x1B21, + 0x39E5, 0x1827, 0x10F4, 0x18B7, 0x11D3, 0x1A4D, 0x1315, 0x12AD, + 0x1AD1, 0x3A71, 0x1319, 0x11A7, 0x2044, 0x2F04, 0x2341, 0x10E5, + 0x1155, 0x195A, 0x1024, 0x111B, 0x1251, 0x1233, 0x12E1, 0x13A1, + 0x13BF, 0x212A, 0x22A2, 0x113B, 0x23DF, 0x10D5, 0x2399, 0x0814, + 0x1126, 0x13EE, 0x1285, 0x10C4, 0x18FD, 0x20D9, 0x0987, 0x1242, + 0x29C5, 0x2313, 0x0898, 0x13C1, 0x08C8, 0x11F1, 0x1034, 0x1B24, + 0x0B0A, 0x11E9, 0x0808, 0x125D, 0x18E9, 0x0848, 0x1395, 0x0965, + 0x123D, 0x2186, 0x1295, 0x18CE, 0x098B, 0x0BEF, 0x1504, 0x082C, + 0x0A41, 0x1144, 0x0A89, 0x0956, 0x1331, 0x085E, 0x0B04, 0x128A, + 0x12A3, 0x1937, 0x19C2, 0x0952, 0x0872, 0x08B4, 0x1262, 0x1124, + 0x1969, 0x1063, 0x0AF1, 0x1225, 0x0894, 0x11C9, 0x18D2, 0x0ACD, + 0x0A29, 0x0B06, 0x09B5, 0x18C7, 0x0916, 0x1088, 0x09FF, 0x2206, + 0x0A15, 0x08B3, 0x0B51, 0x0A1F, 0x18CB, 0x0AC2, 0x0A2E, 0x1865, + 0x08AC, 0x0A31, 0x08A4, 0x138A, 0x0A99, 0x09D1, 0x0A86, 0x189B, + 0x0283, 0x0BDD, 0x0ABD, 0x1933, 0x083F, 0x1386, 0x0923, 0x0322, + 0x0869, 0x10DD, 0x13B1, 0x082F, 0x087D, 0x11B9, 0x085B, 0x08ED, + 0x00C3, 0x08E2, 0x084E, 0x0887, 0x0855, 0x0A0A, 0x0857, 0x0B92, + 0x1036, 0x12A5, 0x0293, 0x0945, 0x08A6, 0x0196, 0x19A3, 0x036F, + 0x0904, 0x1205, 0x09E1, 0x0381, 0x0971, 0x1219, 0x0BAF, 0x0949, + 0x00AF, 0x0AA9, 0x018A, 0x0907, 0x0BFD, 0x003A, 0x0BCD, 0x0AB2, + 0x088B, 0x0252, 0x0A4E, 0x03FF, 0x0845, 0x0897, 0x0059, 0x090B, + 0x0B42, 0x0807, 0x0A16, 0x0853, 0x0A8D, 0x01B2, 0x0AB1, 0x091A, + 0x0195, 0x0A35, 0x00B5, 0x10AA, 0x0115, 0x0A21, 0x0096, 0x0A08, + 0x03FE, 0x0B7F, 0x08B9, 0x12B3, 0x023E, 0x0A23, 0x029E, 0x08F1, + 0x01A9, 0x0BDE, 0x0843, 0x02D2, 0x0A1A, 0x08C5, 0x0151, 0x0A43, + 0x0332, 0x0383, 0x0826, 0x0BED, 0x10C2, 0x00AE, 0x0B82, 0x0213, + 0x0232, 0x085D, 0x02A1, 0x101B, 0x035F, 0x0303, 0x0A39, 0x0207, + 0x0A53, 0x0142, 0x01A5, 0x082A, 0x0099, 0x0A17, 0x03CF, 0x0906, + 0x0125, 0x0A96, 0x0A9A, 0x0209, 0x0393, 0x0961, 0x0131, 0x0A88, + 0x0139, 0x099A, 0x0292, 0x0272, 0x0862, 0x08BE, 0x0141, 0x02C3, + 0x0886, 0x0039, 0x08A9, 0x01A2, 0x01B1, 0x0851, 0x020B, 0x086D, + 0x0312, 0x08CD, 0x020F, 0x0311, 0x0BCE, 0x0135, 0x0006, 0x0849, + 0x0132, 0x0A8F, 0x022F, 0x022A, 0x0AAE, 0x0A8E, 0x0263, 0x03A2, + 0x083E, 0x009A, 0x021B, 0x0835, 0x0323, 0x0871, 0x0993, 0x0226, + 0x0302, 0x0922, 0x0119, 0x0222, 0x021D, 0x0B07, 0x08C9, 0x037E, + 0x08BD, 0x0042, 0x00D1, 0x0B33, 0x01C1, 0x0B9A, 0x0282, 0x088A, + 0x0182, 0x083D, 0x004D, 0x010A, 0x0A1E, 0x0019, 0x00B2, 0x0999, + 0x00A5, 0x0095, 0x0817, 0x0022, 0x031A, 0x0902, 0x00A3, 0x01BF, + 0x029F, 0x0816, 0x03B2, 0x0015, 0x0391, 0x0BBE, 0x01FE, 0x1129, + 0x002E, 0x01DF, 0x0301, 0x0033, 0x0B6E, 0x00E1, 0x0297, 0x00B1, + 0x009F, 0x0B16, 0x000A, 0x001A, 0x0052, 0x080B, 0x030B, 0x029D, + 0x0BAE, 0x01FD, 0x020E, 0x00A2, 0x0A3F, 0x0192, 0x0ABE, 0x020D, + 0x008F, 0x028B, 0x0083, 0x0025, 0x09EE, 0x01EF, 0x0029, 0x0291, + 0x0B4F, 0x0396, 0x0287, 0x008E, 0x0092, 0x0B4E, 0x017E, 0x001E, + 0x009E, 0x0103, 0x080F, 0x000E, 0x0113, 0x0203, 0x01CF, 0x0183, + 0x01CE, 0x001F, 0x0112, 0x01DE, 0x038E, 0x0832, 0x033E, 0x0212, + 0x029B, 0x0023, 0x016F, 0x0201, 0x09AF, 0x0202, 0x0281, 0x035E, + 0x034D, 0x037D, 0x03AD, 0x0013, 0x0093, 0x015F, 0x0211, 0x033F, + 0x036D, 0x039F, 0x03BD, 0x017F, 0x032E, 0x032F, 0x035D, 0x038F, 0x039E }; static const uint16_t percentile_arr_12x12_1[246] { - 0x0443,0xFFCD,0x2C62,0x2E21,0x3CF1,0x34C2,0x4CDD,0x2452, - 0xD5DF,0x1DD1,0x0FAE,0x64A3,0x0C7D,0x3433,0x1CD2,0x2DEF, - 0x0C3E,0x1D71,0xA472,0x0D32,0x54B3,0x4D51,0x445D,0x0E31, - 0x1FDD,0x0DFF,0x0CAE,0x45A2,0x2FBE,0xA4B9,0x1C4E,0x2C9F, - 0x160D,0x0D42,0x342E,0x074F,0x1414,0x0F6E,0x0CB2,0x34B5, - 0x0DFE,0x0D86,0x1496,0x1D22,0x0691,0x140B,0x041F,0x0C35, - 0x1D93,0x1506,0x1439,0x0C9A,0x0F01,0x2442,0x0C8F,0x04D1, - 0x1486,0x0C6D,0x0513,0x0C71,0x0E82,0x177D,0x0E03,0x07BD, - 0x0C2F,0x0D83,0x07AF,0x0D61,0x1407,0x0DB1,0x050A,0x0C94, - 0x07AD,0x0D8A,0x0C04,0x0416,0x0C49,0x0445,0x15C1,0x0C1A, - 0x0525,0x0595,0x0C8A,0x075E,0x0CBD,0x0681,0x0F4E,0x075F, - 0x061D,0x1541,0x0CB1,0x0F3F,0x0406,0x076D,0x0DCF,0x05EE, - 0x0D23,0x0599,0x0CCD,0x0711,0x0C23,0x079F,0x0D15,0x0585, - 0x04A2,0x042A,0x0D31,0x05BF,0x0D92,0x0C26,0x043D,0x0C93, - 0x0502,0x0C15,0x048B,0x0D03,0x0613,0x0516,0x0495,0x0C29, - 0x04A5,0x040F,0x0425,0x0539,0x0D19,0x04E1,0x05BE,0x0422, - 0x0432,0x0C0A,0x0431,0x041E,0x0492,0x04A9,0x0582,0x0529, - 0x0487,0x0C4D,0x0512,0x049E,0x0505,0x0451,0x0D7F,0x0489, - 0x0602,0x05DE,0x0591,0x0535,0x074D,0x055E,0x04C1,0x0612, - 0x05DD,0x05FD,0x0C61,0x0521,0x0484,0x05CE,0x0581,0x0491, - 0x051A,0x04A1,0x048E,0x040D,0x0499,0x071F,0x072E,0x075D, - 0x0441,0x0589,0x057E,0x0CAD,0x0501,0x054F,0x0692,0x0511, - 0x049D,0x0509,0x056E,0x040E,0x0409,0x0601,0x048D,0x0413, - 0x053E,0x0419,0x072D,0x0408,0x0485,0x042D,0x041D,0x05A1, - 0x0781,0x0402,0x05ED,0x0C82,0x0403,0x057D,0x05CD,0x0611, - 0x0488,0x0411,0x054E,0x051F,0x053F,0x056F,0x059F,0x070F, - 0x071D,0x073D,0x073E,0x077E,0x078F,0x0405,0x079D,0x079E, - 0x058E,0x0412,0x055D,0x05AE,0x041B,0x0421,0x0453,0x0417, - 0x0483,0x052E,0x052F,0x055F,0x058F,0x059E,0x05AF,0x05BD, - 0x060E,0x0622,0x0683,0x068D,0x0702,0x070D,0x070E,0x071E, - 0x072F,0x076F,0x078D,0x078E,0x07BF,0x07CE + 0x0443, 0xFFCD, 0x2C62, 0x2E21, 0x3CF1, 0x34C2, 0x4CDD, 0x2452, + 0xD5DF, 0x1DD1, 0x0FAE, 0x64A3, 0x0C7D, 0x3433, 0x1CD2, 0x2DEF, + 0x0C3E, 0x1D71, 0xA472, 0x0D32, 0x54B3, 0x4D51, 0x445D, 0x0E31, + 0x1FDD, 0x0DFF, 0x0CAE, 0x45A2, 0x2FBE, 0xA4B9, 0x1C4E, 0x2C9F, + 0x160D, 0x0D42, 0x342E, 0x074F, 0x1414, 0x0F6E, 0x0CB2, 0x34B5, + 0x0DFE, 0x0D86, 0x1496, 0x1D22, 0x0691, 0x140B, 0x041F, 0x0C35, + 0x1D93, 0x1506, 0x1439, 0x0C9A, 0x0F01, 0x2442, 0x0C8F, 0x04D1, + 0x1486, 0x0C6D, 0x0513, 0x0C71, 0x0E82, 0x177D, 0x0E03, 0x07BD, + 0x0C2F, 0x0D83, 0x07AF, 0x0D61, 0x1407, 0x0DB1, 0x050A, 0x0C94, + 0x07AD, 0x0D8A, 0x0C04, 0x0416, 0x0C49, 0x0445, 0x15C1, 0x0C1A, + 0x0525, 0x0595, 0x0C8A, 0x075E, 0x0CBD, 0x0681, 0x0F4E, 0x075F, + 0x061D, 0x1541, 0x0CB1, 0x0F3F, 0x0406, 0x076D, 0x0DCF, 0x05EE, + 0x0D23, 0x0599, 0x0CCD, 0x0711, 0x0C23, 0x079F, 0x0D15, 0x0585, + 0x04A2, 0x042A, 0x0D31, 0x05BF, 0x0D92, 0x0C26, 0x043D, 0x0C93, + 0x0502, 0x0C15, 0x048B, 0x0D03, 0x0613, 0x0516, 0x0495, 0x0C29, + 0x04A5, 0x040F, 0x0425, 0x0539, 0x0D19, 0x04E1, 0x05BE, 0x0422, + 0x0432, 0x0C0A, 0x0431, 0x041E, 0x0492, 0x04A9, 0x0582, 0x0529, + 0x0487, 0x0C4D, 0x0512, 0x049E, 0x0505, 0x0451, 0x0D7F, 0x0489, + 0x0602, 0x05DE, 0x0591, 0x0535, 0x074D, 0x055E, 0x04C1, 0x0612, + 0x05DD, 0x05FD, 0x0C61, 0x0521, 0x0484, 0x05CE, 0x0581, 0x0491, + 0x051A, 0x04A1, 0x048E, 0x040D, 0x0499, 0x071F, 0x072E, 0x075D, + 0x0441, 0x0589, 0x057E, 0x0CAD, 0x0501, 0x054F, 0x0692, 0x0511, + 0x049D, 0x0509, 0x056E, 0x040E, 0x0409, 0x0601, 0x048D, 0x0413, + 0x053E, 0x0419, 0x072D, 0x0408, 0x0485, 0x042D, 0x041D, 0x05A1, + 0x0781, 0x0402, 0x05ED, 0x0C82, 0x0403, 0x057D, 0x05CD, 0x0611, + 0x0488, 0x0411, 0x054E, 0x051F, 0x053F, 0x056F, 0x059F, 0x070F, + 0x071D, 0x073D, 0x073E, 0x077E, 0x078F, 0x0405, 0x079D, 0x079E, + 0x058E, 0x0412, 0x055D, 0x05AE, 0x041B, 0x0421, 0x0453, 0x0417, + 0x0483, 0x052E, 0x052F, 0x055F, 0x058F, 0x059E, 0x05AF, 0x05BD, + 0x060E, 0x0622, 0x0683, 0x068D, 0x0702, 0x070D, 0x070E, 0x071E, + 0x072F, 0x076F, 0x078D, 0x078E, 0x07BF, 0x07CE }; static const packed_percentile_table block_pcd_12x12 { @@ -1161,11 +1166,11 @@ const float *get_2d_percentile_table( unsigned int xdim, unsigned int ydim ) { - float* unpacked_table = new float[2048]; + float* unpacked_table = new float[WEIGHTS_MAX_BLOCK_MODES]; const packed_percentile_table *apt = get_packed_table(xdim, ydim); // Set the default percentile - for (unsigned int i = 0; i < 2048; i++) + for (unsigned int i = 0; i < WEIGHTS_MAX_BLOCK_MODES; i++) { unpacked_table[i] = 1.0f; } @@ -1173,7 +1178,7 @@ const float *get_2d_percentile_table( // Populate the unpacked percentile values for (int i = 0; i < 2; i++) { - unsigned int itemcount = apt->itemcounts[i]; + unsigned int itemcount = apt->item_count[i]; unsigned int difscale = apt->difscales[i]; unsigned int accum = apt->initial_percs[i]; const uint16_t *item_ptr = apt->items[i]; diff --git a/Source/astcenc_pick_best_endpoint_format.cpp b/Source/astcenc_pick_best_endpoint_format.cpp index 48768ed400b0eb66aab244eed203405506b4148d..4d8b4f77d45e77e578b518abe60c24afda96a345 100644 --- a/Source/astcenc_pick_best_endpoint_format.cpp +++ b/Source/astcenc_pick_best_endpoint_format.cpp @@ -289,25 +289,13 @@ static void compute_encoding_choice_errors( vmask4 endpt_can_offset = endpt_diff < vfloat4(0.12f * 65535.0f); bool can_offset_encode = (mask(endpt_can_offset) & 0x7) == 0x7; - // Determine if we can blue contract encode RGB lanes - vfloat4 endpt_diff_bc( - endpt0.lane<0>() + (endpt0.lane<0>() - endpt0.lane<2>()), - endpt1.lane<0>() + (endpt1.lane<0>() - endpt1.lane<2>()), - endpt0.lane<1>() + (endpt0.lane<1>() - endpt0.lane<2>()), - endpt1.lane<1>() + (endpt1.lane<1>() - endpt1.lane<2>()) - ); - - vmask4 endpt_can_bc_lo = endpt_diff_bc > vfloat4(0.01f * 65535.0f); - vmask4 endpt_can_bc_hi = endpt_diff_bc < vfloat4(0.99f * 65535.0f); - bool can_blue_contract = (mask(endpt_can_bc_lo & endpt_can_bc_hi) & 0x7) == 0x7; - // Store out the settings eci[i].rgb_scale_error = (samechroma_rgb_error - uncorr_rgb_error) * 0.7f; // empirical eci[i].rgb_luma_error = (rgb_luma_error - uncorr_rgb_error) * 1.5f; // wild guess eci[i].luminance_error = (luminance_rgb_error - uncorr_rgb_error) * 3.0f; // empirical eci[i].alpha_drop_error = alpha_drop_error * 3.0f; eci[i].can_offset_encode = can_offset_encode; - eci[i].can_blue_contract = can_blue_contract; + eci[i].can_blue_contract = !blk.is_luminance(); } } @@ -333,15 +321,11 @@ static void compute_color_error_for_every_integer_count_and_quant_level( const endpoints& ep, vfloat4 error_weight, float best_error[21][4], - int format_of_choice[21][4] + uint8_t format_of_choice[21][4] ) { int partition_size = pi.partition_texel_count[partition_index]; - static const float baseline_quant_error[21] { - (65536.0f * 65536.0f / 18.0f), // 2 values, 1 step - (65536.0f * 65536.0f / 18.0f) / (2 * 2), // 3 values, 2 steps - (65536.0f * 65536.0f / 18.0f) / (3 * 3), // 4 values, 3 steps - (65536.0f * 65536.0f / 18.0f) / (4 * 4), // 5 values + static const float baseline_quant_error[21 - QUANT_6] { (65536.0f * 65536.0f / 18.0f) / (5 * 5), (65536.0f * 65536.0f / 18.0f) / (7 * 7), (65536.0f * 65536.0f / 18.0f) / (9 * 9), @@ -529,7 +513,7 @@ static void compute_color_error_for_every_integer_count_and_quant_level( best_error[i][1] = ERROR_CALC_DEFAULT; best_error[i][0] = ERROR_CALC_DEFAULT; - format_of_choice[i][3] = encode_hdr_alpha ? FMT_HDR_RGBA : FMT_HDR_RGB_LDR_ALPHA; + format_of_choice[i][3] = static_cast(encode_hdr_alpha ? FMT_HDR_RGBA : FMT_HDR_RGB_LDR_ALPHA); format_of_choice[i][2] = FMT_HDR_RGB; format_of_choice[i][1] = FMT_HDR_RGB_SCALE; format_of_choice[i][0] = FMT_HDR_LUMINANCE_LARGE_RANGE; @@ -540,7 +524,7 @@ static void compute_color_error_for_every_integer_count_and_quant_level( // The base_quant_error should depend on the scale-factor that would be used during // actual encode of the color value - float base_quant_error = baseline_quant_error[i] * static_cast(partition_size); + float base_quant_error = baseline_quant_error[i - QUANT_6] * static_cast(partition_size); float rgb_quantization_error = error_weight_rgbsum * base_quant_error * 2.0f; float alpha_quantization_error = error_weight.lane<3>() * base_quant_error * 2.0f; float rgba_quantization_error = rgb_quantization_error + alpha_quantization_error; @@ -549,7 +533,7 @@ static void compute_color_error_for_every_integer_count_and_quant_level( float full_hdr_rgba_error = rgba_quantization_error + rgb_range_error + alpha_range_error; best_error[i][3] = full_hdr_rgba_error; - format_of_choice[i][3] = encode_hdr_alpha ? FMT_HDR_RGBA : FMT_HDR_RGB_LDR_ALPHA; + format_of_choice[i][3] = static_cast(encode_hdr_alpha ? FMT_HDR_RGBA : FMT_HDR_RGB_LDR_ALPHA); // For 6 integers, we have one HDR-RGB encoding float full_hdr_rgb_error = (rgb_quantization_error * mode11mult) + rgb_range_error + eci.alpha_drop_error; @@ -603,7 +587,7 @@ static void compute_color_error_for_every_integer_count_and_quant_level( error_scale_oe_rgb = 1.0f; } - float base_quant_error = baseline_quant_error[i]; + float base_quant_error = baseline_quant_error[i - QUANT_6]; float quant_error_rgb = base_quant_error_rgb * base_quant_error; float quant_error_rgba = base_quant_error_rgba * base_quant_error; @@ -688,10 +672,10 @@ static void compute_color_error_for_every_integer_count_and_quant_level( static float one_partition_find_best_combination_for_bitcount( QualityProfile privateProfile, const float best_combined_error[21][4], - const int best_combined_format[21][4], + const uint8_t best_combined_format[21][4], int bits_available, - quant_method& best_quant_level, - int& best_format + uint8_t& best_quant_level, + uint8_t& best_format ) { int best_integer_count = 0; float best_integer_count_error = ERROR_CALC_DEFAULT; @@ -721,7 +705,7 @@ static float one_partition_find_best_combination_for_bitcount( int ql = quant_mode_table[best_integer_count + 1][bits_available]; - best_quant_level = static_cast(ql); + best_quant_level = static_cast(ql); if (privateProfile == HIGH_SPEED_PROFILE) // keep openSource code style { best_format = FMT_RGBA; @@ -749,9 +733,9 @@ static float one_partition_find_best_combination_for_bitcount( */ static void two_partitions_find_best_combination_for_every_quantization_and_integer_count( const float best_error[2][21][4], // indexed by (partition, quant-level, integer-pair-count-minus-1) - const int best_format[2][21][4], + const uint8_t best_format[2][21][4], float best_combined_error[21][7], // indexed by (quant-level, integer-pair-count-minus-2) - int best_combined_format[21][7][2] + uint8_t best_combined_format[21][7][2] ) { for (int i = QUANT_2; i <= QUANT_256; i++) { @@ -801,11 +785,11 @@ static void two_partitions_find_best_combination_for_every_quantization_and_inte */ static float two_partitions_find_best_combination_for_bitcount( float best_combined_error[21][7], - int best_combined_format[21][7][2], + uint8_t best_combined_format[21][7][2], int bits_available, - quant_method& best_quant_level, - quant_method& best_quant_level_mod, - int* best_formats + uint8_t& best_quant_level, + uint8_t& best_quant_level_mod, + uint8_t* best_formats ) { int best_integer_count = 0; float best_integer_count_error = ERROR_CALC_DEFAULT; @@ -832,8 +816,8 @@ static float two_partitions_find_best_combination_for_bitcount( int ql = quant_mode_table[best_integer_count][bits_available]; int ql_mod = quant_mode_table[best_integer_count][bits_available + 2]; - best_quant_level = static_cast(ql); - best_quant_level_mod = static_cast(ql_mod); + best_quant_level = static_cast(ql); + best_quant_level_mod = static_cast(ql_mod); if (ql >= QUANT_6) { @@ -863,9 +847,9 @@ static float two_partitions_find_best_combination_for_bitcount( */ static void three_partitions_find_best_combination_for_every_quantization_and_integer_count( const float best_error[3][21][4], // indexed by (partition, quant-level, integer-count) - const int best_format[3][21][4], + const uint8_t best_format[3][21][4], float best_combined_error[21][10], - int best_combined_format[21][10][3] + uint8_t best_combined_format[21][10][3] ) { for (int i = QUANT_2; i <= QUANT_256; i++) { @@ -926,11 +910,11 @@ static void three_partitions_find_best_combination_for_every_quantization_and_in */ static float three_partitions_find_best_combination_for_bitcount( const float best_combined_error[21][10], - const int best_combined_format[21][10][3], + const uint8_t best_combined_format[21][10][3], int bits_available, - quant_method& best_quant_level, - quant_method& best_quant_level_mod, - int* best_formats + uint8_t& best_quant_level, + uint8_t& best_quant_level_mod, + uint8_t* best_formats ) { int best_integer_count = 0; float best_integer_count_error = ERROR_CALC_DEFAULT; @@ -957,8 +941,8 @@ static float three_partitions_find_best_combination_for_bitcount( int ql = quant_mode_table[best_integer_count][bits_available]; int ql_mod = quant_mode_table[best_integer_count][bits_available + 5]; - best_quant_level = static_cast(ql); - best_quant_level_mod = static_cast(ql_mod); + best_quant_level = static_cast(ql); + best_quant_level_mod = static_cast(ql_mod); if (ql >= QUANT_6) { @@ -988,9 +972,9 @@ static float three_partitions_find_best_combination_for_bitcount( */ static void four_partitions_find_best_combination_for_every_quantization_and_integer_count( const float best_error[4][21][4], // indexed by (partition, quant-level, integer-count) - const int best_format[4][21][4], + const uint8_t best_format[4][21][4], float best_combined_error[21][13], - int best_combined_format[21][13][4] + uint8_t best_combined_format[21][13][4] ) { for (int i = QUANT_2; i <= QUANT_256; i++) { @@ -1062,11 +1046,11 @@ static void four_partitions_find_best_combination_for_every_quantization_and_int */ static float four_partitions_find_best_combination_for_bitcount( const float best_combined_error[21][13], - const int best_combined_format[21][13][4], + const uint8_t best_combined_format[21][13][4], int bits_available, - quant_method& best_quant_level, - quant_method& best_quant_level_mod, - int* best_formats + uint8_t& best_quant_level, + uint8_t& best_quant_level_mod, + uint8_t* best_formats ) { int best_integer_count = 0; float best_integer_count_error = ERROR_CALC_DEFAULT; @@ -1093,8 +1077,8 @@ static float four_partitions_find_best_combination_for_bitcount( int ql = quant_mode_table[best_integer_count][bits_available]; int ql_mod = quant_mode_table[best_integer_count][bits_available + 8]; - best_quant_level = static_cast(ql); - best_quant_level_mod = static_cast(ql_mod); + best_quant_level = static_cast(ql); + best_quant_level_mod = static_cast(ql_mod); if (ql >= QUANT_6) { @@ -1121,13 +1105,13 @@ unsigned int compute_ideal_endpoint_formats( const image_block& blk, const endpoints& ep, // bitcounts and errors computed for the various quantization methods - const int* qwt_bitcounts, + const int8_t* qwt_bitcounts, const float* qwt_errors, unsigned int tune_candidate_limit, unsigned int start_block_mode, unsigned int end_block_mode, // output data - int partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS], + uint8_t partition_format_specifiers[TUNE_MAX_TRIAL_CANDIDATES][BLOCK_MAX_PARTITIONS], int block_mode[TUNE_MAX_TRIAL_CANDIDATES], quant_method quant_level[TUNE_MAX_TRIAL_CANDIDATES], quant_method quant_level_mod[TUNE_MAX_TRIAL_CANDIDATES], @@ -1137,8 +1121,8 @@ unsigned int compute_ideal_endpoint_formats( promise(partition_count > 0); - int encode_hdr_rgb = blk.rgb_lns[0]; - int encode_hdr_alpha = blk.alpha_lns[0]; + bool encode_hdr_rgb = static_cast(blk.rgb_lns[0]); + bool encode_hdr_alpha = static_cast(blk.alpha_lns[0]); // Compute the errors that result from various encoding choices (such as using luminance instead // of RGB, discarding Alpha, using RGB-scale in place of two separate RGB endpoints and so on) @@ -1146,7 +1130,7 @@ unsigned int compute_ideal_endpoint_formats( compute_encoding_choice_errors(blk, pi, ep, eci); float best_error[BLOCK_MAX_PARTITIONS][21][4]; - int format_of_choice[BLOCK_MAX_PARTITIONS][21][4]; + uint8_t format_of_choice[BLOCK_MAX_PARTITIONS][21][4]; for (int i = 0; i < partition_count; i++) { compute_color_error_for_every_integer_count_and_quant_level( @@ -1156,28 +1140,24 @@ unsigned int compute_ideal_endpoint_formats( } float* errors_of_best_combination = tmpbuf.errors_of_best_combination; - quant_method* best_quant_levels = tmpbuf.best_quant_levels; - quant_method* best_quant_levels_mod = tmpbuf.best_quant_levels_mod; - int (&best_ep_formats)[WEIGHTS_MAX_BLOCK_MODES][BLOCK_MAX_PARTITIONS] = tmpbuf.best_ep_formats; + uint8_t* best_quant_levels = tmpbuf.best_quant_levels; + uint8_t* best_quant_levels_mod = tmpbuf.best_quant_levels_mod; + uint8_t (&best_ep_formats)[WEIGHTS_MAX_BLOCK_MODES][BLOCK_MAX_PARTITIONS] = tmpbuf.best_ep_formats; - // Ensure that the "overstep" of the last iteration in the vectorized loop will contain data - // that will never be picked as best candidate - const unsigned int packed_end_block_mode = round_up_to_simd_multiple_vla(end_block_mode); + // Ensure that the first iteration understep contains data that will never be picked + vfloat clear_error(ERROR_CALC_DEFAULT); + vint clear_quant(0); - // TODO: Can we avoid this? - for (unsigned int i = 0; i < start_block_mode; i++) - { - errors_of_best_combination[i] = ERROR_CALC_DEFAULT; - best_quant_levels[i] = QUANT_2; - best_quant_levels_mod[i] = QUANT_2; - } + unsigned int packed_start_block_mode = round_down_to_simd_multiple_vla(start_block_mode); + storea(clear_error, errors_of_best_combination + packed_start_block_mode); + store_nbytes(clear_quant, best_quant_levels + packed_start_block_mode); + store_nbytes(clear_quant, best_quant_levels_mod + packed_start_block_mode); - for (unsigned int i = end_block_mode; i < packed_end_block_mode; i++) - { - errors_of_best_combination[i] = ERROR_CALC_DEFAULT; - best_quant_levels[i] = QUANT_2; - best_quant_levels_mod[i] = QUANT_2; - } + // Ensure that last iteration overstep contains data that will never be picked + unsigned int packed_end_block_mode = round_down_to_simd_multiple_vla(end_block_mode - 1); + storea(clear_error, errors_of_best_combination + packed_end_block_mode); + store_nbytes(clear_quant, best_quant_levels + packed_end_block_mode); + store_nbytes(clear_quant, best_quant_levels_mod + packed_end_block_mode); // Track a scalar best to avoid expensive search at least once ... float error_of_best_combination = ERROR_CALC_DEFAULT; @@ -1186,7 +1166,7 @@ unsigned int compute_ideal_endpoint_formats( // The block contains 1 partition if (partition_count == 1) { - for (unsigned int i = start_block_mode; i < end_block_mode; ++i) + for (unsigned int i = start_block_mode; i < end_block_mode; i++) { if (qwt_errors[i] >= ERROR_CALC_DEFAULT) { @@ -1214,13 +1194,13 @@ unsigned int compute_ideal_endpoint_formats( else if (partition_count == 2) { float combined_best_error[21][7]; - int formats_of_choice[21][7][2]; + uint8_t formats_of_choice[21][7][2]; two_partitions_find_best_combination_for_every_quantization_and_integer_count( best_error, format_of_choice, combined_best_error, formats_of_choice); assert(start_block_mode == 0); - for (unsigned int i = 0; i < end_block_mode; ++i) + for (unsigned int i = 0; i < end_block_mode; i++) { if (qwt_errors[i] >= ERROR_CALC_DEFAULT) { @@ -1247,13 +1227,13 @@ unsigned int compute_ideal_endpoint_formats( else if (partition_count == 3) { float combined_best_error[21][10]; - int formats_of_choice[21][10][3]; + uint8_t formats_of_choice[21][10][3]; three_partitions_find_best_combination_for_every_quantization_and_integer_count( best_error, format_of_choice, combined_best_error, formats_of_choice); assert(start_block_mode == 0); - for (unsigned int i = 0; i < end_block_mode; ++i) + for (unsigned int i = 0; i < end_block_mode; i++) { if (qwt_errors[i] >= ERROR_CALC_DEFAULT) { @@ -1281,13 +1261,13 @@ unsigned int compute_ideal_endpoint_formats( { assert(partition_count == 4); float combined_best_error[21][13]; - int formats_of_choice[21][13][4]; + uint8_t formats_of_choice[21][13][4]; four_partitions_find_best_combination_for_every_quantization_and_integer_count( best_error, format_of_choice, combined_best_error, formats_of_choice); assert(start_block_mode == 0); - for (unsigned int i = 0; i < end_block_mode; ++i) + for (unsigned int i = 0; i < end_block_mode; i++) { if (qwt_errors[i] >= ERROR_CALC_DEFAULT) { @@ -1330,10 +1310,8 @@ unsigned int compute_ideal_endpoint_formats( vint lane_ids = vint::lane_id() + vint(start_block_mode); for (unsigned int j = start_block_mode; j < end_block_mode; j += ASTCENC_SIMD_WIDTH) { - vfloat err = vfloat(&errors_of_best_combination[j]); - vmask mask1 = err < vbest_ep_error; - vmask mask2 = vint(reinterpret_cast(best_quant_levels + j)) > vint(4); - vmask mask = mask1 & mask2; + vfloat err = vfloat(errors_of_best_combination + j); + vmask mask = err < vbest_ep_error; vbest_ep_error = select(vbest_ep_error, err, mask); vbest_error_index = select(vbest_error_index, lane_ids, mask); lane_ids += vint(ASTCENC_SIMD_WIDTH); @@ -1368,8 +1346,8 @@ unsigned int compute_ideal_endpoint_formats( block_mode[i] = best_error_weights[i]; - quant_level[i] = best_quant_levels[best_error_weights[i]]; - quant_level_mod[i] = best_quant_levels_mod[best_error_weights[i]]; + quant_level[i] = static_cast(best_quant_levels[best_error_weights[i]]); + quant_level_mod[i] = static_cast(best_quant_levels_mod[best_error_weights[i]]); assert(quant_level[i] >= QUANT_6 && quant_level[i] <= QUANT_256); assert(quant_level_mod[i] >= QUANT_6 && quant_level_mod[i] <= QUANT_256); diff --git a/Source/astcenc_quantization.cpp b/Source/astcenc_quantization.cpp index 233a9338c3f5304af0107f5971dc377237ddb6f2..84d758dbfa495f0251742f702864400aecc90931 100644 --- a/Source/astcenc_quantization.cpp +++ b/Source/astcenc_quantization.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -23,305 +23,615 @@ #if !defined(ASTCENC_DECOMPRESS_ONLY) +// Not scrambled, starts from QUANT_6 +const uint8_t color_unquant_to_uquant_tables[17][512] { + { // QUANT_6 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, + 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, + 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, + 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, + 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_8 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 109, 109, 109, 109, 109, 109, 109, 109, 109, + 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, + 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_10 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_12 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 23, 23, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, + 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, + 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 232, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_16 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, + 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_20 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 148, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 201, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_24 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 178, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, + 189, 189, 189, 189, 189, 189, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, 244, 244, + 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_32 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, + 173, 173, 173, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, + 189, 189, 189, 189, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 255, 255, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_40 + 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 110, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 177, 177, 177, + 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, 255, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_48 + 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 142, 142, 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 174, 174, 174, 174, 174, 174, 174, 174, + 174, 174, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 207, 207, 207, 207, 207, 207, 207, + 207, 207, 207, 207, 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 255, 255, 255, 255, 255, 255 + }, + { // QUANT_64 + 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 16, 16, 16, + 16, 16, 16, 16, 16, 20, 20, 20, 20, 20, 20, 20, 20, 24, 24, 24, 24, 24, 24, 24, 24, 28, 28, 28, 28, 28, 28, 28, 28, 32, 32, 32, + 32, 32, 32, 32, 32, 36, 36, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40, 40, 44, 44, 44, 44, 44, 44, 44, 44, 48, 48, 48, + 48, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, 56, 56, 56, 56, 56, 56, 56, 56, 60, 60, 60, 60, 60, 60, 60, 60, 60, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 69, 69, 69, 69, 69, 69, 69, 69, 73, 73, 73, 73, 73, 73, 73, 73, 77, 77, 77, 77, 77, 77, 77, 77, 81, + 81, 81, 81, 81, 81, 81, 81, 85, 85, 85, 85, 85, 85, 85, 85, 89, 89, 89, 89, 89, 89, 89, 89, 93, 93, 93, 93, 93, 93, 93, 93, 97, + 97, 97, 97, 97, 97, 97, 97, 101, 101, 101, 101, 101, 101, 101, 101, 105, 105, 105, 105, 105, 105, 105, 105, 109, 109, 109, 109, 109, 109, 109, 109, 113, + 113, 113, 113, 113, 113, 113, 113, 117, 117, 117, 117, 117, 117, 117, 117, 121, 121, 121, 121, 121, 121, 121, 121, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 134, 134, 134, 134, 134, 134, 134, 134, 138, 138, 138, 138, 138, 138, 138, 138, 142, 142, 142, 142, 142, 142, 142, + 142, 146, 146, 146, 146, 146, 146, 146, 146, 150, 150, 150, 150, 150, 150, 150, 150, 154, 154, 154, 154, 154, 154, 154, 154, 158, 158, 158, 158, 158, 158, 158, + 158, 162, 162, 162, 162, 162, 162, 162, 162, 166, 166, 166, 166, 166, 166, 166, 166, 170, 170, 170, 170, 170, 170, 170, 170, 174, 174, 174, 174, 174, 174, 174, + 174, 178, 178, 178, 178, 178, 178, 178, 178, 182, 182, 182, 182, 182, 182, 182, 182, 186, 186, 186, 186, 186, 186, 186, 186, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 195, 195, 195, 195, 195, 195, 195, 195, 195, 199, 199, 199, 199, 199, 199, 199, 199, 203, 203, 203, 203, 203, 203, 203, 203, 207, 207, 207, 207, 207, + 207, 207, 207, 211, 211, 211, 211, 211, 211, 211, 211, 215, 215, 215, 215, 215, 215, 215, 215, 219, 219, 219, 219, 219, 219, 219, 219, 223, 223, 223, 223, 223, + 223, 223, 223, 227, 227, 227, 227, 227, 227, 227, 227, 231, 231, 231, 231, 231, 231, 231, 231, 235, 235, 235, 235, 235, 235, 235, 235, 239, 239, 239, 239, 239, + 239, 239, 239, 243, 243, 243, 243, 243, 243, 243, 243, 247, 247, 247, 247, 247, 247, 247, 247, 251, 251, 251, 251, 251, 251, 251, 251, 255, 255, 255, 255, 255 + }, + { // QUANT_80 + 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 9, 9, 9, 9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 16, 16, + 16, 16, 16, 16, 19, 19, 19, 19, 19, 19, 22, 22, 22, 22, 22, 22, 25, 25, 25, 25, 25, 25, 25, 29, 29, 29, 29, 29, 29, 29, 32, 32, + 32, 32, 32, 32, 35, 35, 35, 35, 35, 35, 38, 38, 38, 38, 38, 38, 38, 42, 42, 42, 42, 42, 42, 42, 45, 45, 45, 45, 45, 45, 48, 48, + 48, 48, 48, 48, 51, 51, 51, 51, 51, 51, 54, 54, 54, 54, 54, 54, 54, 58, 58, 58, 58, 58, 58, 58, 61, 61, 61, 61, 61, 61, 64, 64, + 64, 64, 64, 64, 67, 67, 67, 67, 67, 67, 67, 71, 71, 71, 71, 71, 71, 71, 74, 74, 74, 74, 74, 74, 77, 77, 77, 77, 77, 77, 80, 80, + 80, 80, 80, 80, 83, 83, 83, 83, 83, 83, 83, 87, 87, 87, 87, 87, 87, 87, 90, 90, 90, 90, 90, 90, 93, 93, 93, 93, 93, 93, 96, 96, + 96, 96, 96, 96, 96, 100, 100, 100, 100, 100, 100, 100, 103, 103, 103, 103, 103, 103, 106, 106, 106, 106, 106, 106, 109, 109, 109, 109, 109, 109, 112, 112, + 112, 112, 112, 112, 112, 116, 116, 116, 116, 116, 116, 116, 119, 119, 119, 119, 119, 119, 122, 122, 122, 122, 122, 122, 125, 125, 125, 125, 125, 125, 125, 125, + 130, 130, 130, 130, 130, 130, 130, 130, 133, 133, 133, 133, 133, 133, 136, 136, 136, 136, 136, 136, 139, 139, 139, 139, 139, 139, 139, 143, 143, 143, 143, 143, + 143, 143, 146, 146, 146, 146, 146, 146, 149, 149, 149, 149, 149, 149, 152, 152, 152, 152, 152, 152, 155, 155, 155, 155, 155, 155, 155, 159, 159, 159, 159, 159, + 159, 159, 162, 162, 162, 162, 162, 162, 165, 165, 165, 165, 165, 165, 168, 168, 168, 168, 168, 168, 168, 172, 172, 172, 172, 172, 172, 172, 175, 175, 175, 175, + 175, 175, 178, 178, 178, 178, 178, 178, 181, 181, 181, 181, 181, 181, 184, 184, 184, 184, 184, 184, 184, 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, + 191, 191, 194, 194, 194, 194, 194, 194, 197, 197, 197, 197, 197, 197, 197, 201, 201, 201, 201, 201, 201, 201, 204, 204, 204, 204, 204, 204, 207, 207, 207, 207, + 207, 207, 210, 210, 210, 210, 210, 210, 213, 213, 213, 213, 213, 213, 213, 217, 217, 217, 217, 217, 217, 217, 220, 220, 220, 220, 220, 220, 223, 223, 223, 223, + 223, 223, 226, 226, 226, 226, 226, 226, 226, 230, 230, 230, 230, 230, 230, 230, 233, 233, 233, 233, 233, 233, 236, 236, 236, 236, 236, 236, 239, 239, 239, 239, + 239, 239, 242, 242, 242, 242, 242, 242, 242, 246, 246, 246, 246, 246, 246, 246, 249, 249, 249, 249, 249, 249, 252, 252, 252, 252, 252, 252, 255, 255, 255, 255 + }, + { // QUANT_96 + 0, 0, 0, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 16, 16, + 16, 16, 16, 18, 18, 18, 18, 18, 21, 21, 21, 21, 21, 21, 24, 24, 24, 24, 24, 26, 26, 26, 26, 26, 29, 29, 29, 29, 29, 29, 32, 32, + 32, 32, 32, 32, 35, 35, 35, 35, 35, 37, 37, 37, 37, 37, 40, 40, 40, 40, 40, 40, 43, 43, 43, 43, 43, 45, 45, 45, 45, 45, 48, 48, + 48, 48, 48, 48, 51, 51, 51, 51, 51, 53, 53, 53, 53, 53, 56, 56, 56, 56, 56, 56, 59, 59, 59, 59, 59, 61, 61, 61, 61, 61, 64, 64, + 64, 64, 64, 64, 67, 67, 67, 67, 67, 67, 70, 70, 70, 70, 70, 72, 72, 72, 72, 72, 75, 75, 75, 75, 75, 75, 78, 78, 78, 78, 78, 80, + 80, 80, 80, 80, 83, 83, 83, 83, 83, 83, 86, 86, 86, 86, 86, 88, 88, 88, 88, 88, 91, 91, 91, 91, 91, 91, 94, 94, 94, 94, 94, 96, + 96, 96, 96, 96, 99, 99, 99, 99, 99, 99, 102, 102, 102, 102, 102, 104, 104, 104, 104, 104, 107, 107, 107, 107, 107, 107, 110, 110, 110, 110, 110, 112, + 112, 112, 112, 112, 115, 115, 115, 115, 115, 115, 118, 118, 118, 118, 118, 120, 120, 120, 120, 120, 123, 123, 123, 123, 123, 123, 126, 126, 126, 126, 126, 126, + 129, 129, 129, 129, 129, 129, 132, 132, 132, 132, 132, 132, 135, 135, 135, 135, 135, 137, 137, 137, 137, 137, 140, 140, 140, 140, 140, 140, 143, 143, 143, 143, + 143, 145, 145, 145, 145, 145, 148, 148, 148, 148, 148, 148, 151, 151, 151, 151, 151, 153, 153, 153, 153, 153, 156, 156, 156, 156, 156, 156, 159, 159, 159, 159, + 159, 161, 161, 161, 161, 161, 164, 164, 164, 164, 164, 164, 167, 167, 167, 167, 167, 169, 169, 169, 169, 169, 172, 172, 172, 172, 172, 172, 175, 175, 175, 175, + 175, 177, 177, 177, 177, 177, 180, 180, 180, 180, 180, 180, 183, 183, 183, 183, 183, 185, 185, 185, 185, 185, 188, 188, 188, 188, 188, 188, 191, 191, 191, 191, + 191, 191, 194, 194, 194, 194, 194, 196, 196, 196, 196, 196, 199, 199, 199, 199, 199, 199, 202, 202, 202, 202, 202, 204, 204, 204, 204, 204, 207, 207, 207, 207, + 207, 207, 210, 210, 210, 210, 210, 212, 212, 212, 212, 212, 215, 215, 215, 215, 215, 215, 218, 218, 218, 218, 218, 220, 220, 220, 220, 220, 223, 223, 223, 223, + 223, 223, 226, 226, 226, 226, 226, 226, 229, 229, 229, 229, 229, 231, 231, 231, 231, 231, 234, 234, 234, 234, 234, 234, 237, 237, 237, 237, 237, 239, 239, 239, + 239, 239, 242, 242, 242, 242, 242, 242, 245, 245, 245, 245, 245, 247, 247, 247, 247, 247, 250, 250, 250, 250, 250, 250, 253, 253, 253, 253, 253, 255, 255, 255 + }, + { // QUANT_128 + 0, 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12, 14, 14, 14, 14, 16, + 16, 16, 16, 18, 18, 18, 18, 20, 20, 20, 20, 22, 22, 22, 22, 24, 24, 24, 24, 26, 26, 26, 26, 28, 28, 28, 28, 30, 30, 30, 30, 32, + 32, 32, 32, 34, 34, 34, 34, 36, 36, 36, 36, 38, 38, 38, 38, 40, 40, 40, 40, 42, 42, 42, 42, 44, 44, 44, 44, 46, 46, 46, 46, 48, + 48, 48, 48, 50, 50, 50, 50, 52, 52, 52, 52, 54, 54, 54, 54, 56, 56, 56, 56, 58, 58, 58, 58, 60, 60, 60, 60, 62, 62, 62, 62, 64, + 64, 64, 64, 66, 66, 66, 66, 68, 68, 68, 68, 70, 70, 70, 70, 72, 72, 72, 72, 74, 74, 74, 74, 76, 76, 76, 76, 78, 78, 78, 78, 80, + 80, 80, 80, 82, 82, 82, 82, 84, 84, 84, 84, 86, 86, 86, 86, 88, 88, 88, 88, 90, 90, 90, 90, 92, 92, 92, 92, 94, 94, 94, 94, 96, + 96, 96, 96, 98, 98, 98, 98, 100, 100, 100, 100, 102, 102, 102, 102, 104, 104, 104, 104, 106, 106, 106, 106, 108, 108, 108, 108, 110, 110, 110, 110, 112, + 112, 112, 112, 114, 114, 114, 114, 116, 116, 116, 116, 118, 118, 118, 118, 120, 120, 120, 120, 122, 122, 122, 122, 124, 124, 124, 124, 126, 126, 126, 126, 126, + 129, 129, 129, 129, 129, 131, 131, 131, 131, 133, 133, 133, 133, 135, 135, 135, 135, 137, 137, 137, 137, 139, 139, 139, 139, 141, 141, 141, 141, 143, 143, 143, + 143, 145, 145, 145, 145, 147, 147, 147, 147, 149, 149, 149, 149, 151, 151, 151, 151, 153, 153, 153, 153, 155, 155, 155, 155, 157, 157, 157, 157, 159, 159, 159, + 159, 161, 161, 161, 161, 163, 163, 163, 163, 165, 165, 165, 165, 167, 167, 167, 167, 169, 169, 169, 169, 171, 171, 171, 171, 173, 173, 173, 173, 175, 175, 175, + 175, 177, 177, 177, 177, 179, 179, 179, 179, 181, 181, 181, 181, 183, 183, 183, 183, 185, 185, 185, 185, 187, 187, 187, 187, 189, 189, 189, 189, 191, 191, 191, + 191, 193, 193, 193, 193, 195, 195, 195, 195, 197, 197, 197, 197, 199, 199, 199, 199, 201, 201, 201, 201, 203, 203, 203, 203, 205, 205, 205, 205, 207, 207, 207, + 207, 209, 209, 209, 209, 211, 211, 211, 211, 213, 213, 213, 213, 215, 215, 215, 215, 217, 217, 217, 217, 219, 219, 219, 219, 221, 221, 221, 221, 223, 223, 223, + 223, 225, 225, 225, 225, 227, 227, 227, 227, 229, 229, 229, 229, 231, 231, 231, 231, 233, 233, 233, 233, 235, 235, 235, 235, 237, 237, 237, 237, 239, 239, 239, + 239, 241, 241, 241, 241, 243, 243, 243, 243, 245, 245, 245, 245, 247, 247, 247, 247, 249, 249, 249, 249, 251, 251, 251, 251, 253, 253, 253, 253, 255, 255, 255 + }, + { // QUANT_160 + 0, 0, 1, 1, 1, 3, 3, 3, 4, 4, 4, 6, 6, 6, 6, 8, 8, 8, 9, 9, 9, 11, 11, 11, 12, 12, 12, 14, 14, 14, 14, 16, + 16, 16, 17, 17, 17, 19, 19, 19, 20, 20, 20, 22, 22, 22, 22, 24, 24, 24, 25, 25, 25, 27, 27, 27, 28, 28, 28, 30, 30, 30, 30, 32, + 32, 32, 33, 33, 33, 35, 35, 35, 36, 36, 36, 38, 38, 38, 38, 40, 40, 40, 41, 41, 41, 43, 43, 43, 44, 44, 44, 46, 46, 46, 46, 48, + 48, 48, 49, 49, 49, 51, 51, 51, 52, 52, 52, 54, 54, 54, 54, 56, 56, 56, 57, 57, 57, 59, 59, 59, 60, 60, 60, 62, 62, 62, 62, 64, + 64, 64, 65, 65, 65, 67, 67, 67, 68, 68, 68, 70, 70, 70, 70, 72, 72, 72, 73, 73, 73, 75, 75, 75, 76, 76, 76, 78, 78, 78, 78, 80, + 80, 80, 81, 81, 81, 83, 83, 83, 84, 84, 84, 86, 86, 86, 86, 88, 88, 88, 89, 89, 89, 91, 91, 91, 92, 92, 92, 94, 94, 94, 94, 96, + 96, 96, 97, 97, 97, 99, 99, 99, 100, 100, 100, 102, 102, 102, 102, 104, 104, 104, 105, 105, 105, 107, 107, 107, 108, 108, 108, 110, 110, 110, 110, 112, + 112, 112, 113, 113, 113, 115, 115, 115, 116, 116, 116, 118, 118, 118, 118, 120, 120, 120, 121, 121, 121, 123, 123, 123, 124, 124, 124, 126, 126, 126, 126, 126, + 129, 129, 129, 129, 129, 131, 131, 131, 132, 132, 132, 134, 134, 134, 135, 135, 135, 137, 137, 137, 137, 139, 139, 139, 140, 140, 140, 142, 142, 142, 143, 143, + 143, 145, 145, 145, 145, 147, 147, 147, 148, 148, 148, 150, 150, 150, 151, 151, 151, 153, 153, 153, 153, 155, 155, 155, 156, 156, 156, 158, 158, 158, 159, 159, + 159, 161, 161, 161, 161, 163, 163, 163, 164, 164, 164, 166, 166, 166, 167, 167, 167, 169, 169, 169, 169, 171, 171, 171, 172, 172, 172, 174, 174, 174, 175, 175, + 175, 177, 177, 177, 177, 179, 179, 179, 180, 180, 180, 182, 182, 182, 183, 183, 183, 185, 185, 185, 185, 187, 187, 187, 188, 188, 188, 190, 190, 190, 191, 191, + 191, 193, 193, 193, 193, 195, 195, 195, 196, 196, 196, 198, 198, 198, 199, 199, 199, 201, 201, 201, 201, 203, 203, 203, 204, 204, 204, 206, 206, 206, 207, 207, + 207, 209, 209, 209, 209, 211, 211, 211, 212, 212, 212, 214, 214, 214, 215, 215, 215, 217, 217, 217, 217, 219, 219, 219, 220, 220, 220, 222, 222, 222, 223, 223, + 223, 225, 225, 225, 225, 227, 227, 227, 228, 228, 228, 230, 230, 230, 231, 231, 231, 233, 233, 233, 233, 235, 235, 235, 236, 236, 236, 238, 238, 238, 239, 239, + 239, 241, 241, 241, 241, 243, 243, 243, 244, 244, 244, 246, 246, 246, 247, 247, 247, 249, 249, 249, 249, 251, 251, 251, 252, 252, 252, 254, 254, 254, 255, 255 + }, + { // QUANT_192 + 0, 0, 1, 1, 2, 2, 2, 4, 4, 4, 5, 5, 6, 6, 6, 8, 8, 8, 9, 9, 10, 10, 10, 12, 12, 12, 13, 13, 14, 14, 14, 16, + 16, 16, 17, 17, 18, 18, 18, 20, 20, 20, 21, 21, 22, 22, 22, 24, 24, 24, 25, 25, 26, 26, 26, 28, 28, 28, 29, 29, 30, 30, 30, 32, + 32, 32, 33, 33, 34, 34, 34, 36, 36, 36, 37, 37, 38, 38, 38, 40, 40, 40, 41, 41, 42, 42, 42, 44, 44, 44, 45, 45, 46, 46, 46, 48, + 48, 48, 49, 49, 50, 50, 50, 52, 52, 52, 53, 53, 54, 54, 54, 56, 56, 56, 57, 57, 58, 58, 58, 60, 60, 60, 61, 61, 62, 62, 62, 64, + 64, 64, 65, 65, 66, 66, 66, 68, 68, 68, 69, 69, 70, 70, 70, 72, 72, 72, 73, 73, 74, 74, 74, 76, 76, 76, 77, 77, 78, 78, 78, 80, + 80, 80, 81, 81, 82, 82, 82, 84, 84, 84, 85, 85, 86, 86, 86, 88, 88, 88, 89, 89, 90, 90, 90, 92, 92, 92, 93, 93, 94, 94, 94, 96, + 96, 96, 97, 97, 98, 98, 98, 100, 100, 100, 101, 101, 102, 102, 102, 104, 104, 104, 105, 105, 106, 106, 106, 108, 108, 108, 109, 109, 110, 110, 110, 112, + 112, 112, 113, 113, 114, 114, 114, 116, 116, 116, 117, 117, 118, 118, 118, 120, 120, 120, 121, 121, 122, 122, 122, 124, 124, 124, 125, 125, 126, 126, 126, 126, + 129, 129, 129, 129, 130, 130, 131, 131, 131, 133, 133, 133, 134, 134, 135, 135, 135, 137, 137, 137, 138, 138, 139, 139, 139, 141, 141, 141, 142, 142, 143, 143, + 143, 145, 145, 145, 146, 146, 147, 147, 147, 149, 149, 149, 150, 150, 151, 151, 151, 153, 153, 153, 154, 154, 155, 155, 155, 157, 157, 157, 158, 158, 159, 159, + 159, 161, 161, 161, 162, 162, 163, 163, 163, 165, 165, 165, 166, 166, 167, 167, 167, 169, 169, 169, 170, 170, 171, 171, 171, 173, 173, 173, 174, 174, 175, 175, + 175, 177, 177, 177, 178, 178, 179, 179, 179, 181, 181, 181, 182, 182, 183, 183, 183, 185, 185, 185, 186, 186, 187, 187, 187, 189, 189, 189, 190, 190, 191, 191, + 191, 193, 193, 193, 194, 194, 195, 195, 195, 197, 197, 197, 198, 198, 199, 199, 199, 201, 201, 201, 202, 202, 203, 203, 203, 205, 205, 205, 206, 206, 207, 207, + 207, 209, 209, 209, 210, 210, 211, 211, 211, 213, 213, 213, 214, 214, 215, 215, 215, 217, 217, 217, 218, 218, 219, 219, 219, 221, 221, 221, 222, 222, 223, 223, + 223, 225, 225, 225, 226, 226, 227, 227, 227, 229, 229, 229, 230, 230, 231, 231, 231, 233, 233, 233, 234, 234, 235, 235, 235, 237, 237, 237, 238, 238, 239, 239, + 239, 241, 241, 241, 242, 242, 243, 243, 243, 245, 245, 245, 246, 246, 247, 247, 247, 249, 249, 249, 250, 250, 251, 251, 251, 253, 253, 253, 254, 254, 255, 255 + }, + { // QUANT_256 + 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, + 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, + 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, + 48, 48, 49, 49, 50, 50, 51, 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, + 64, 64, 65, 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, 78, 78, 79, 79, + 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87, 88, 88, 89, 89, 90, 90, 91, 91, 92, 92, 93, 93, 94, 94, 95, 95, + 96, 96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102, 102, 103, 103, 104, 104, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, + 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, 126, 126, 127, 127, + 128, 128, 129, 129, 130, 130, 131, 131, 132, 132, 133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, 142, 142, 143, 143, + 144, 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, 149, 150, 150, 151, 151, 152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 159, 159, + 160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, 167, 168, 168, 169, 169, 170, 170, 171, 171, 172, 172, 173, 173, 174, 174, 175, 175, + 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183, 183, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191, + 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199, 199, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207, + 208, 208, 209, 209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215, 215, 216, 216, 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, 222, 223, 223, + 224, 224, 225, 225, 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239, 239, + 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255, 255 + }, +}; + // Starts from QUANT_6 // Scrambled -const uint8_t color_quant_tables[17][256] { - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - }, - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 - }, - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - }, - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - }, - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 - }, - { - 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1 - }, - { - 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 1, 1, 1, 1, 1, 1 - }, - { - 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, - 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, - 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, - 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, - 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, - 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, - 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, - 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31 - }, - { - 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, - 16, 24, 24, 24, 24, 24, 24, 32, 32, 32, 32, 32, 32, 32, 2, 2, - 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 10, 18, 18, 18, 18, 18, - 18, 26, 26, 26, 26, 26, 26, 26, 34, 34, 34, 34, 34, 34, 4, 4, - 4, 4, 4, 4, 4, 12, 12, 12, 12, 12, 12, 20, 20, 20, 20, 20, - 20, 20, 28, 28, 28, 28, 28, 28, 36, 36, 36, 36, 36, 36, 36, 6, - 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 14, 22, 22, 22, 22, - 22, 22, 30, 30, 30, 30, 30, 30, 30, 38, 38, 38, 38, 38, 38, 38, - 39, 39, 39, 39, 39, 39, 39, 31, 31, 31, 31, 31, 31, 31, 23, 23, - 23, 23, 23, 23, 15, 15, 15, 15, 15, 15, 15, 7, 7, 7, 7, 7, - 7, 37, 37, 37, 37, 37, 37, 37, 29, 29, 29, 29, 29, 29, 21, 21, - 21, 21, 21, 21, 21, 13, 13, 13, 13, 13, 13, 5, 5, 5, 5, 5, - 5, 5, 35, 35, 35, 35, 35, 35, 27, 27, 27, 27, 27, 27, 27, 19, - 19, 19, 19, 19, 19, 11, 11, 11, 11, 11, 11, 11, 3, 3, 3, 3, - 3, 3, 33, 33, 33, 33, 33, 33, 33, 25, 25, 25, 25, 25, 25, 17, - 17, 17, 17, 17, 17, 17, 9, 9, 9, 9, 9, 9, 1, 1, 1, 1 - }, - { - 0, 0, 0, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 2, 2, - 2, 2, 2, 18, 18, 18, 18, 18, 18, 34, 34, 34, 34, 34, 4, 4, - 4, 4, 4, 4, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, 6, 6, - 6, 6, 6, 6, 22, 22, 22, 22, 22, 38, 38, 38, 38, 38, 38, 8, - 8, 8, 8, 8, 24, 24, 24, 24, 24, 24, 40, 40, 40, 40, 40, 10, - 10, 10, 10, 10, 26, 26, 26, 26, 26, 26, 42, 42, 42, 42, 42, 12, - 12, 12, 12, 12, 12, 28, 28, 28, 28, 28, 44, 44, 44, 44, 44, 14, - 14, 14, 14, 14, 14, 30, 30, 30, 30, 30, 46, 46, 46, 46, 46, 46, - 47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 15, 15, 15, 15, 15, - 15, 45, 45, 45, 45, 45, 29, 29, 29, 29, 29, 13, 13, 13, 13, 13, - 13, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 27, 11, 11, 11, 11, - 11, 41, 41, 41, 41, 41, 25, 25, 25, 25, 25, 25, 9, 9, 9, 9, - 9, 39, 39, 39, 39, 39, 39, 23, 23, 23, 23, 23, 7, 7, 7, 7, - 7, 7, 37, 37, 37, 37, 37, 21, 21, 21, 21, 21, 5, 5, 5, 5, - 5, 5, 35, 35, 35, 35, 35, 19, 19, 19, 19, 19, 19, 3, 3, 3, - 3, 3, 33, 33, 33, 33, 33, 17, 17, 17, 17, 17, 17, 1, 1, 1 - }, - { - 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, - 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, - 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, - 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, - 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, - 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, - 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, - 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, - 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, - 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39, - 40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, - 44, 44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, - 47, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, 51, - 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 55, - 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, 58, 58, 58, 59, 59, 59, - 59, 60, 60, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 63, 63, 63 - }, - { - 0, 0, 16, 16, 16, 32, 32, 32, 48, 48, 48, 48, 64, 64, 64, 2, - 2, 2, 18, 18, 18, 34, 34, 34, 50, 50, 50, 50, 66, 66, 66, 4, - 4, 4, 20, 20, 20, 36, 36, 36, 36, 52, 52, 52, 68, 68, 68, 6, - 6, 6, 22, 22, 22, 38, 38, 38, 38, 54, 54, 54, 70, 70, 70, 8, - 8, 8, 24, 24, 24, 24, 40, 40, 40, 56, 56, 56, 72, 72, 72, 10, - 10, 10, 26, 26, 26, 26, 42, 42, 42, 58, 58, 58, 74, 74, 74, 12, - 12, 12, 12, 28, 28, 28, 44, 44, 44, 60, 60, 60, 76, 76, 76, 14, - 14, 14, 14, 30, 30, 30, 46, 46, 46, 62, 62, 62, 78, 78, 78, 78, - 79, 79, 79, 79, 63, 63, 63, 47, 47, 47, 31, 31, 31, 15, 15, 15, - 15, 77, 77, 77, 61, 61, 61, 45, 45, 45, 29, 29, 29, 13, 13, 13, - 13, 75, 75, 75, 59, 59, 59, 43, 43, 43, 27, 27, 27, 27, 11, 11, - 11, 73, 73, 73, 57, 57, 57, 41, 41, 41, 25, 25, 25, 25, 9, 9, - 9, 71, 71, 71, 55, 55, 55, 39, 39, 39, 39, 23, 23, 23, 7, 7, - 7, 69, 69, 69, 53, 53, 53, 37, 37, 37, 37, 21, 21, 21, 5, 5, - 5, 67, 67, 67, 51, 51, 51, 51, 35, 35, 35, 19, 19, 19, 3, 3, - 3, 65, 65, 65, 49, 49, 49, 49, 33, 33, 33, 17, 17, 17, 1, 1 - }, - { - 0, 0, 32, 32, 64, 64, 64, 2, 2, 2, 34, 34, 66, 66, 66, 4, - 4, 4, 36, 36, 68, 68, 68, 6, 6, 6, 38, 38, 70, 70, 70, 8, - 8, 8, 40, 40, 40, 72, 72, 10, 10, 10, 42, 42, 42, 74, 74, 12, - 12, 12, 44, 44, 44, 76, 76, 14, 14, 14, 46, 46, 46, 78, 78, 16, - 16, 16, 48, 48, 48, 80, 80, 80, 18, 18, 50, 50, 50, 82, 82, 82, - 20, 20, 52, 52, 52, 84, 84, 84, 22, 22, 54, 54, 54, 86, 86, 86, - 24, 24, 56, 56, 56, 88, 88, 88, 26, 26, 58, 58, 58, 90, 90, 90, - 28, 28, 60, 60, 60, 92, 92, 92, 30, 30, 62, 62, 62, 94, 94, 94, - 95, 95, 95, 63, 63, 63, 31, 31, 93, 93, 93, 61, 61, 61, 29, 29, - 91, 91, 91, 59, 59, 59, 27, 27, 89, 89, 89, 57, 57, 57, 25, 25, - 87, 87, 87, 55, 55, 55, 23, 23, 85, 85, 85, 53, 53, 53, 21, 21, - 83, 83, 83, 51, 51, 51, 19, 19, 81, 81, 81, 49, 49, 49, 17, 17, - 17, 79, 79, 47, 47, 47, 15, 15, 15, 77, 77, 45, 45, 45, 13, 13, - 13, 75, 75, 43, 43, 43, 11, 11, 11, 73, 73, 41, 41, 41, 9, 9, - 9, 71, 71, 71, 39, 39, 7, 7, 7, 69, 69, 69, 37, 37, 5, 5, - 5, 67, 67, 67, 35, 35, 3, 3, 3, 65, 65, 65, 33, 33, 1, 1 - }, - { - 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, - 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, - 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, - 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, - 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, - 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, - 48, 48, 49, 49, 50, 50, 51, 51, 52, 52, 53, 53, 54, 54, 55, 55, - 56, 56, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, - 64, 64, 65, 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, 70, 71, 71, - 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, 78, 78, 79, 79, - 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87, - 88, 88, 89, 89, 90, 90, 91, 91, 92, 92, 93, 93, 94, 94, 95, 95, - 96, 96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102, 102, 103, 103, +const uint8_t color_uquant_to_scrambled_pquant_tables[17][256] { + { // QUANT_6 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + }, + { // QUANT_8 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 + }, + { // QUANT_10 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + }, + { // QUANT_12 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + }, + { // QUANT_16 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 + }, + { // QUANT_20 + 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1 + }, + { // QUANT_24 + 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 1, 1, 1, 1, 1, 1 + }, + { // QUANT_32 + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, + 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, + 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, + 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, + 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, + 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 14, + 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, + 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, + 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, + 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, + 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31 + }, + { // QUANT_40 + 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, + 24, 24, 24, 24, 24, 24, 24, 32, 32, 32, 32, 32, 32, 32, 2, 2, + 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 18, 18, 18, 18, 18, 18, + 18, 26, 26, 26, 26, 26, 26, 34, 34, 34, 34, 34, 34, 34, 4, 4, + 4, 4, 4, 4, 12, 12, 12, 12, 12, 12, 12, 20, 20, 20, 20, 20, + 20, 28, 28, 28, 28, 28, 28, 28, 36, 36, 36, 36, 36, 36, 36, 6, + 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 22, 22, 22, 22, 22, + 22, 22, 30, 30, 30, 30, 30, 30, 38, 38, 38, 38, 38, 38, 38, 38, + 39, 39, 39, 39, 39, 39, 39, 39, 31, 31, 31, 31, 31, 31, 23, 23, + 23, 23, 23, 23, 23, 15, 15, 15, 15, 15, 15, 7, 7, 7, 7, 7, + 7, 37, 37, 37, 37, 37, 37, 37, 29, 29, 29, 29, 29, 29, 29, 21, + 21, 21, 21, 21, 21, 13, 13, 13, 13, 13, 13, 13, 5, 5, 5, 5, + 5, 5, 35, 35, 35, 35, 35, 35, 35, 27, 27, 27, 27, 27, 27, 19, + 19, 19, 19, 19, 19, 19, 11, 11, 11, 11, 11, 11, 3, 3, 3, 3, + 3, 3, 33, 33, 33, 33, 33, 33, 33, 25, 25, 25, 25, 25, 25, 25, + 17, 17, 17, 17, 17, 17, 9, 9, 9, 9, 9, 9, 9, 1, 1, 1 + }, + { // QUANT_48 + 0, 0, 0, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 2, 2, + 2, 2, 2, 18, 18, 18, 18, 18, 34, 34, 34, 34, 34, 34, 4, 4, + 4, 4, 4, 20, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, 6, 6, + 6, 6, 6, 22, 22, 22, 22, 22, 22, 38, 38, 38, 38, 38, 38, 8, + 8, 8, 8, 8, 24, 24, 24, 24, 24, 40, 40, 40, 40, 40, 40, 10, + 10, 10, 10, 10, 26, 26, 26, 26, 26, 42, 42, 42, 42, 42, 42, 12, + 12, 12, 12, 12, 28, 28, 28, 28, 28, 28, 44, 44, 44, 44, 44, 14, + 14, 14, 14, 14, 30, 30, 30, 30, 30, 30, 46, 46, 46, 46, 46, 46, + 47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 31, 15, 15, 15, 15, + 15, 45, 45, 45, 45, 45, 29, 29, 29, 29, 29, 29, 13, 13, 13, 13, + 13, 43, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 11, 11, 11, 11, + 11, 41, 41, 41, 41, 41, 41, 25, 25, 25, 25, 25, 9, 9, 9, 9, + 9, 39, 39, 39, 39, 39, 39, 23, 23, 23, 23, 23, 23, 7, 7, 7, + 7, 7, 37, 37, 37, 37, 37, 21, 21, 21, 21, 21, 21, 5, 5, 5, + 5, 5, 35, 35, 35, 35, 35, 35, 19, 19, 19, 19, 19, 3, 3, 3, + 3, 3, 33, 33, 33, 33, 33, 33, 17, 17, 17, 17, 17, 1, 1, 1 + }, + { // QUANT_64 + 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, + 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, + 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, + 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16, + 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, + 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, + 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, + 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 31, + 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, + 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39, + 40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, + 44, 44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, + 47, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, 51, + 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 55, + 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, 58, 58, 58, 59, 59, 59, + 59, 60, 60, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 63, 63, 63 + }, + { // QUANT_80 + 0, 0, 16, 16, 16, 32, 32, 32, 48, 48, 48, 64, 64, 64, 64, 2, + 2, 2, 18, 18, 18, 34, 34, 34, 50, 50, 50, 66, 66, 66, 66, 4, + 4, 4, 20, 20, 20, 36, 36, 36, 52, 52, 52, 52, 68, 68, 68, 6, + 6, 6, 22, 22, 22, 38, 38, 38, 54, 54, 54, 54, 70, 70, 70, 8, + 8, 8, 24, 24, 24, 40, 40, 40, 40, 56, 56, 56, 72, 72, 72, 10, + 10, 10, 26, 26, 26, 42, 42, 42, 42, 58, 58, 58, 74, 74, 74, 12, + 12, 12, 28, 28, 28, 28, 44, 44, 44, 60, 60, 60, 76, 76, 76, 14, + 14, 14, 30, 30, 30, 30, 46, 46, 46, 62, 62, 62, 78, 78, 78, 78, + 79, 79, 79, 79, 63, 63, 63, 47, 47, 47, 31, 31, 31, 31, 15, 15, + 15, 77, 77, 77, 61, 61, 61, 45, 45, 45, 29, 29, 29, 29, 13, 13, + 13, 75, 75, 75, 59, 59, 59, 43, 43, 43, 43, 27, 27, 27, 11, 11, + 11, 73, 73, 73, 57, 57, 57, 41, 41, 41, 41, 25, 25, 25, 9, 9, + 9, 71, 71, 71, 55, 55, 55, 55, 39, 39, 39, 23, 23, 23, 7, 7, + 7, 69, 69, 69, 53, 53, 53, 53, 37, 37, 37, 21, 21, 21, 5, 5, + 5, 67, 67, 67, 67, 51, 51, 51, 35, 35, 35, 19, 19, 19, 3, 3, + 3, 65, 65, 65, 65, 49, 49, 49, 33, 33, 33, 17, 17, 17, 1, 1 + }, + { // QUANT_96 + 0, 32, 32, 32, 64, 64, 64, 2, 2, 34, 34, 34, 66, 66, 66, 4, + 4, 36, 36, 36, 68, 68, 68, 6, 6, 38, 38, 38, 70, 70, 70, 8, + 8, 8, 40, 40, 72, 72, 72, 10, 10, 10, 42, 42, 74, 74, 74, 12, + 12, 12, 44, 44, 76, 76, 76, 14, 14, 14, 46, 46, 78, 78, 78, 16, + 16, 16, 48, 48, 48, 80, 80, 80, 18, 18, 50, 50, 50, 82, 82, 82, + 20, 20, 52, 52, 52, 84, 84, 84, 22, 22, 54, 54, 54, 86, 86, 86, + 24, 24, 56, 56, 56, 88, 88, 88, 26, 26, 58, 58, 58, 90, 90, 90, + 28, 28, 60, 60, 60, 92, 92, 92, 30, 30, 62, 62, 62, 94, 94, 94, + 95, 95, 95, 63, 63, 63, 31, 31, 93, 93, 93, 61, 61, 61, 29, 29, + 91, 91, 91, 59, 59, 59, 27, 27, 89, 89, 89, 57, 57, 57, 25, 25, + 87, 87, 87, 55, 55, 55, 23, 23, 85, 85, 85, 53, 53, 53, 21, 21, + 83, 83, 83, 51, 51, 51, 19, 19, 81, 81, 81, 49, 49, 49, 17, 17, + 17, 79, 79, 79, 47, 47, 15, 15, 15, 77, 77, 77, 45, 45, 13, 13, + 13, 75, 75, 75, 43, 43, 11, 11, 11, 73, 73, 73, 41, 41, 9, 9, + 9, 71, 71, 71, 39, 39, 39, 7, 7, 69, 69, 69, 37, 37, 37, 5, + 5, 67, 67, 67, 35, 35, 35, 3, 3, 65, 65, 65, 33, 33, 33, 1 + }, + { // QUANT_128 + 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, + 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, + 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, + 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, + 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, + 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, + 48, 49, 49, 50, 50, 51, 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, + 56, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, 63, + 64, 64, 65, 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, 70, 71, 71, + 72, 72, 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, 78, 78, 79, 79, + 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87, + 88, 88, 89, 89, 90, 90, 91, 91, 92, 92, 93, 93, 94, 94, 95, 95, + 96, 96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102, 102, 103, 103, 104, 104, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, 126, 126, 127, 127 }, - { - 0, 32, 32, 64, 96, 96, 128, 128, 2, 34, 34, 66, 98, 98, 130, 130, - 4, 36, 36, 68, 100, 100, 132, 132, 6, 38, 38, 70, 102, 102, 134, 134, - 8, 40, 40, 72, 104, 104, 136, 136, 10, 42, 42, 74, 106, 106, 138, 138, - 12, 44, 44, 76, 108, 108, 140, 140, 14, 46, 46, 78, 110, 110, 142, 142, - 16, 48, 48, 80, 112, 112, 144, 144, 18, 50, 50, 82, 114, 114, 146, 146, - 20, 52, 52, 84, 116, 116, 148, 148, 22, 54, 54, 86, 118, 118, 150, 150, - 24, 56, 56, 88, 120, 120, 152, 152, 26, 58, 58, 90, 122, 122, 154, 154, - 28, 60, 60, 92, 124, 124, 156, 156, 30, 62, 62, 94, 126, 126, 158, 158, - 159, 159, 127, 127, 95, 63, 63, 31, 157, 157, 125, 125, 93, 61, 61, 29, - 155, 155, 123, 123, 91, 59, 59, 27, 153, 153, 121, 121, 89, 57, 57, 25, - 151, 151, 119, 119, 87, 55, 55, 23, 149, 149, 117, 117, 85, 53, 53, 21, - 147, 147, 115, 115, 83, 51, 51, 19, 145, 145, 113, 113, 81, 49, 49, 17, - 143, 143, 111, 111, 79, 47, 47, 15, 141, 141, 109, 109, 77, 45, 45, 13, - 139, 139, 107, 107, 75, 43, 43, 11, 137, 137, 105, 105, 73, 41, 41, 9, - 135, 135, 103, 103, 71, 39, 39, 7, 133, 133, 101, 101, 69, 37, 37, 5, - 131, 131, 99, 99, 67, 35, 35, 3, 129, 129, 97, 97, 65, 33, 33, 1 - }, - { - 0, 64, 128, 128, 2, 66, 130, 130, 4, 68, 132, 132, 6, 70, 134, 134, - 8, 72, 136, 136, 10, 74, 138, 138, 12, 76, 140, 140, 14, 78, 142, 142, - 16, 80, 144, 144, 18, 82, 146, 146, 20, 84, 148, 148, 22, 86, 150, 150, - 24, 88, 152, 152, 26, 90, 154, 154, 28, 92, 156, 156, 30, 94, 158, 158, - 32, 96, 160, 160, 34, 98, 162, 162, 36, 100, 164, 164, 38, 102, 166, 166, - 40, 104, 168, 168, 42, 106, 170, 170, 44, 108, 172, 172, 46, 110, 174, 174, - 48, 112, 176, 176, 50, 114, 178, 178, 52, 116, 180, 180, 54, 118, 182, 182, - 56, 120, 184, 184, 58, 122, 186, 186, 60, 124, 188, 188, 62, 126, 190, 190, - 191, 191, 127, 63, 189, 189, 125, 61, 187, 187, 123, 59, 185, 185, 121, 57, - 183, 183, 119, 55, 181, 181, 117, 53, 179, 179, 115, 51, 177, 177, 113, 49, - 175, 175, 111, 47, 173, 173, 109, 45, 171, 171, 107, 43, 169, 169, 105, 41, - 167, 167, 103, 39, 165, 165, 101, 37, 163, 163, 99, 35, 161, 161, 97, 33, - 159, 159, 95, 31, 157, 157, 93, 29, 155, 155, 91, 27, 153, 153, 89, 25, - 151, 151, 87, 23, 149, 149, 85, 21, 147, 147, 83, 19, 145, 145, 81, 17, - 143, 143, 79, 15, 141, 141, 77, 13, 139, 139, 75, 11, 137, 137, 73, 9, - 135, 135, 71, 7, 133, 133, 69, 5, 131, 131, 67, 3, 129, 129, 65, 1 - }, - { - 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, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + { // QUANT_160 + 0, 32, 64, 64, 96, 128, 128, 128, 2, 34, 66, 66, 98, 130, 130, 130, + 4, 36, 68, 68, 100, 132, 132, 132, 6, 38, 70, 70, 102, 134, 134, 134, + 8, 40, 72, 72, 104, 136, 136, 136, 10, 42, 74, 74, 106, 138, 138, 138, + 12, 44, 76, 76, 108, 140, 140, 140, 14, 46, 78, 78, 110, 142, 142, 142, + 16, 48, 80, 80, 112, 144, 144, 144, 18, 50, 82, 82, 114, 146, 146, 146, + 20, 52, 84, 84, 116, 148, 148, 148, 22, 54, 86, 86, 118, 150, 150, 150, + 24, 56, 88, 88, 120, 152, 152, 152, 26, 58, 90, 90, 122, 154, 154, 154, + 28, 60, 92, 92, 124, 156, 156, 156, 30, 62, 94, 94, 126, 158, 158, 158, + 159, 159, 159, 127, 95, 95, 63, 31, 157, 157, 157, 125, 93, 93, 61, 29, + 155, 155, 155, 123, 91, 91, 59, 27, 153, 153, 153, 121, 89, 89, 57, 25, + 151, 151, 151, 119, 87, 87, 55, 23, 149, 149, 149, 117, 85, 85, 53, 21, + 147, 147, 147, 115, 83, 83, 51, 19, 145, 145, 145, 113, 81, 81, 49, 17, + 143, 143, 143, 111, 79, 79, 47, 15, 141, 141, 141, 109, 77, 77, 45, 13, + 139, 139, 139, 107, 75, 75, 43, 11, 137, 137, 137, 105, 73, 73, 41, 9, + 135, 135, 135, 103, 71, 71, 39, 7, 133, 133, 133, 101, 69, 69, 37, 5, + 131, 131, 131, 99, 67, 67, 35, 3, 129, 129, 129, 97, 65, 65, 33, 1 + }, + { // QUANT_192 + 0, 64, 128, 128, 2, 66, 130, 130, 4, 68, 132, 132, 6, 70, 134, 134, + 8, 72, 136, 136, 10, 74, 138, 138, 12, 76, 140, 140, 14, 78, 142, 142, + 16, 80, 144, 144, 18, 82, 146, 146, 20, 84, 148, 148, 22, 86, 150, 150, + 24, 88, 152, 152, 26, 90, 154, 154, 28, 92, 156, 156, 30, 94, 158, 158, + 32, 96, 160, 160, 34, 98, 162, 162, 36, 100, 164, 164, 38, 102, 166, 166, + 40, 104, 168, 168, 42, 106, 170, 170, 44, 108, 172, 172, 46, 110, 174, 174, + 48, 112, 176, 176, 50, 114, 178, 178, 52, 116, 180, 180, 54, 118, 182, 182, + 56, 120, 184, 184, 58, 122, 186, 186, 60, 124, 188, 188, 62, 126, 190, 190, + 191, 191, 127, 63, 189, 189, 125, 61, 187, 187, 123, 59, 185, 185, 121, 57, + 183, 183, 119, 55, 181, 181, 117, 53, 179, 179, 115, 51, 177, 177, 113, 49, + 175, 175, 111, 47, 173, 173, 109, 45, 171, 171, 107, 43, 169, 169, 105, 41, + 167, 167, 103, 39, 165, 165, 101, 37, 163, 163, 99, 35, 161, 161, 97, 33, + 159, 159, 95, 31, 157, 157, 93, 29, 155, 155, 91, 27, 153, 153, 89, 25, + 151, 151, 87, 23, 149, 149, 85, 21, 147, 147, 83, 19, 145, 145, 81, 17, + 143, 143, 79, 15, 141, 141, 77, 13, 139, 139, 75, 11, 137, 137, 73, 9, + 135, 135, 71, 7, 133, 133, 69, 5, 131, 131, 67, 3, 129, 129, 65, 1 + }, + { // QUANT_256 + 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, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, @@ -338,122 +648,156 @@ const uint8_t color_quant_tables[17][256] { // Starts from QUANT_6 // Scrambled -const uint8_t color_unquant_tables[17][256] { - { - 0, 255, 51, 204, 102, 153 - }, - { - 0, 36, 73, 109, 146, 182, 219, 255 - }, - { - 0, 255, 28, 227, 56, 199, 84, 171, 113, 142 - }, - { - 0, 255, 69, 186, 23, 232, 92, 163, 46, 209, 116, 139 - }, - { - 0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255 - }, - { - 0, 255, 67, 188, 13, 242, 80, 175, 27, 228, 94, 161, 40, 215, 107, 148, - 54, 201, 121, 134 - }, - { - 0, 255, 33, 222, 66, 189, 99, 156, 11, 244, 44, 211, 77, 178, 110, 145, - 22, 233, 55, 200, 88, 167, 121, 134 - }, - { - 0, 8, 16, 24, 33, 41, 49, 57, 66, 74, 82, 90, 99, 107, 115, 123, - 132, 140, 148, 156, 165, 173, 181, 189, 198, 206, 214, 222, 231, 239, 247, 255 - }, - { - 0, 255, 32, 223, 65, 190, 97, 158, 6, 249, 39, 216, 71, 184, 104, 151, - 13, 242, 45, 210, 78, 177, 110, 145, 19, 236, 52, 203, 84, 171, 117, 138, - 26, 229, 58, 197, 91, 164, 123, 132 - }, - { - 0, 255, 16, 239, 32, 223, 48, 207, 65, 190, 81, 174, 97, 158, 113, 142, - 5, 250, 21, 234, 38, 217, 54, 201, 70, 185, 86, 169, 103, 152, 119, 136, - 11, 244, 27, 228, 43, 212, 59, 196, 76, 179, 92, 163, 108, 147, 124, 131 - }, - { - 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, - 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, - 130, 134, 138, 142, 146, 150, 154, 158, 162, 166, 170, 174, 178, 182, 186, 190, - 195, 199, 203, 207, 211, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255 - }, - { - 0, 255, 16, 239, 32, 223, 48, 207, 64, 191, 80, 175, 96, 159, 112, 143, - 3, 252, 19, 236, 35, 220, 51, 204, 67, 188, 83, 172, 100, 155, 116, 139, - 6, 249, 22, 233, 38, 217, 54, 201, 71, 184, 87, 168, 103, 152, 119, 136, - 9, 246, 25, 230, 42, 213, 58, 197, 74, 181, 90, 165, 106, 149, 122, 133, - 13, 242, 29, 226, 45, 210, 61, 194, 77, 178, 93, 162, 109, 146, 125, 130 - }, - { - 0, 255, 8, 247, 16, 239, 24, 231, 32, 223, 40, 215, 48, 207, 56, 199, - 64, 191, 72, 183, 80, 175, 88, 167, 96, 159, 104, 151, 112, 143, 120, 135, - 2, 253, 10, 245, 18, 237, 26, 229, 35, 220, 43, 212, 51, 204, 59, 196, - 67, 188, 75, 180, 83, 172, 91, 164, 99, 156, 107, 148, 115, 140, 123, 132, - 5, 250, 13, 242, 21, 234, 29, 226, 37, 218, 45, 210, 53, 202, 61, 194, - 70, 185, 78, 177, 86, 169, 94, 161, 102, 153, 110, 145, 118, 137, 126, 129 - }, - { - 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, - 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, - 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, - 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, - 129, 131, 133, 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, 159, - 161, 163, 165, 167, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189, 191, - 193, 195, 197, 199, 201, 203, 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, - 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255 - }, - { - 0, 255, 8, 247, 16, 239, 24, 231, 32, 223, 40, 215, 48, 207, 56, 199, - 64, 191, 72, 183, 80, 175, 88, 167, 96, 159, 104, 151, 112, 143, 120, 135, - 1, 254, 9, 246, 17, 238, 25, 230, 33, 222, 41, 214, 49, 206, 57, 198, - 65, 190, 73, 182, 81, 174, 89, 166, 97, 158, 105, 150, 113, 142, 121, 134, - 3, 252, 11, 244, 19, 236, 27, 228, 35, 220, 43, 212, 51, 204, 59, 196, - 67, 188, 75, 180, 83, 172, 91, 164, 99, 156, 107, 148, 115, 140, 123, 132, - 4, 251, 12, 243, 20, 235, 28, 227, 36, 219, 44, 211, 52, 203, 60, 195, - 68, 187, 76, 179, 84, 171, 92, 163, 100, 155, 108, 147, 116, 139, 124, 131, - 6, 249, 14, 241, 22, 233, 30, 225, 38, 217, 46, 209, 54, 201, 62, 193, - 70, 185, 78, 177, 86, 169, 94, 161, 102, 153, 110, 145, 118, 137, 126, 129 - }, - { - 0, 255, 4, 251, 8, 247, 12, 243, 16, 239, 20, 235, 24, 231, 28, 227, - 32, 223, 36, 219, 40, 215, 44, 211, 48, 207, 52, 203, 56, 199, 60, 195, - 64, 191, 68, 187, 72, 183, 76, 179, 80, 175, 84, 171, 88, 167, 92, 163, - 96, 159, 100, 155, 104, 151, 108, 147, 112, 143, 116, 139, 120, 135, 124, 131, - 1, 254, 5, 250, 9, 246, 13, 242, 17, 238, 21, 234, 25, 230, 29, 226, - 33, 222, 37, 218, 41, 214, 45, 210, 49, 206, 53, 202, 57, 198, 61, 194, - 65, 190, 69, 186, 73, 182, 77, 178, 81, 174, 85, 170, 89, 166, 93, 162, - 97, 158, 101, 154, 105, 150, 109, 146, 113, 142, 117, 138, 121, 134, 125, 130, - 2, 253, 6, 249, 10, 245, 14, 241, 18, 237, 22, 233, 26, 229, 30, 225, - 34, 221, 38, 217, 42, 213, 46, 209, 50, 205, 54, 201, 58, 197, 62, 193, - 66, 189, 70, 185, 74, 181, 78, 177, 82, 173, 86, 169, 90, 165, 94, 161, - 98, 157, 102, 153, 106, 149, 110, 145, 114, 141, 118, 137, 122, 133, 126, 129 - }, - { - 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, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 - } +static const uint8_t color_scrambled_pquant_to_uquant_q6[6] { + 0, 255, 51, 204, 102, 153 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q8[8] { + 0, 36, 73, 109, 146, 182, 219, 255 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q10[10] { + 0, 255, 28, 227, 56, 199, 84, 171, 113, 142 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q12[12] { + 0, 255, 69, 186, 23, 232, 92, 163, 46, 209, 116, 139 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q16[16] { + 0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q20[20] { + 0, 255, 67, 188, 13, 242, 80, 175, 27, 228, 94, 161, 40, 215, 107, 148, + 54, 201, 121, 134 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q24[24] { + 0, 255, 33, 222, 66, 189, 99, 156, 11, 244, 44, 211, 77, 178, 110, 145, + 22, 233, 55, 200, 88, 167, 121, 134 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q32[32] { + 0, 8, 16, 24, 33, 41, 49, 57, 66, 74, 82, 90, 99, 107, 115, 123, + 132, 140, 148, 156, 165, 173, 181, 189, 198, 206, 214, 222, 231, 239, 247, 255 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q40[40] { + 0, 255, 32, 223, 65, 190, 97, 158, 6, 249, 39, 216, 71, 184, 104, 151, + 13, 242, 45, 210, 78, 177, 110, 145, 19, 236, 52, 203, 84, 171, 117, 138, + 26, 229, 58, 197, 91, 164, 123, 132 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q48[48] { + 0, 255, 16, 239, 32, 223, 48, 207, 65, 190, 81, 174, 97, 158, 113, 142, + 5, 250, 21, 234, 38, 217, 54, 201, 70, 185, 86, 169, 103, 152, 119, 136, + 11, 244, 27, 228, 43, 212, 59, 196, 76, 179, 92, 163, 108, 147, 124, 131 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q64[64] { + 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, + 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, + 130, 134, 138, 142, 146, 150, 154, 158, 162, 166, 170, 174, 178, 182, 186, 190, + 195, 199, 203, 207, 211, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255, +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q80[80] { + 0, 255, 16, 239, 32, 223, 48, 207, 64, 191, 80, 175, 96, 159, 112, 143, + 3, 252, 19, 236, 35, 220, 51, 204, 67, 188, 83, 172, 100, 155, 116, 139, + 6, 249, 22, 233, 38, 217, 54, 201, 71, 184, 87, 168, 103, 152, 119, 136, + 9, 246, 25, 230, 42, 213, 58, 197, 74, 181, 90, 165, 106, 149, 122, 133, + 13, 242, 29, 226, 45, 210, 61, 194, 77, 178, 93, 162, 109, 146, 125, 130 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q96[96] { + 0, 255, 8, 247, 16, 239, 24, 231, 32, 223, 40, 215, 48, 207, 56, 199, + 64, 191, 72, 183, 80, 175, 88, 167, 96, 159, 104, 151, 112, 143, 120, 135, + 2, 253, 10, 245, 18, 237, 26, 229, 35, 220, 43, 212, 51, 204, 59, 196, + 67, 188, 75, 180, 83, 172, 91, 164, 99, 156, 107, 148, 115, 140, 123, 132, + 5, 250, 13, 242, 21, 234, 29, 226, 37, 218, 45, 210, 53, 202, 61, 194, + 70, 185, 78, 177, 86, 169, 94, 161, 102, 153, 110, 145, 118, 137, 126, 129 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q128[128] { + 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, + 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, + 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, + 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, + 129, 131, 133, 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, 159, + 161, 163, 165, 167, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189, 191, + 193, 195, 197, 199, 201, 203, 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, + 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q160[160] { + 0, 255, 8, 247, 16, 239, 24, 231, 32, 223, 40, 215, 48, 207, 56, 199, + 64, 191, 72, 183, 80, 175, 88, 167, 96, 159, 104, 151, 112, 143, 120, 135, + 1, 254, 9, 246, 17, 238, 25, 230, 33, 222, 41, 214, 49, 206, 57, 198, + 65, 190, 73, 182, 81, 174, 89, 166, 97, 158, 105, 150, 113, 142, 121, 134, + 3, 252, 11, 244, 19, 236, 27, 228, 35, 220, 43, 212, 51, 204, 59, 196, + 67, 188, 75, 180, 83, 172, 91, 164, 99, 156, 107, 148, 115, 140, 123, 132, + 4, 251, 12, 243, 20, 235, 28, 227, 36, 219, 44, 211, 52, 203, 60, 195, + 68, 187, 76, 179, 84, 171, 92, 163, 100, 155, 108, 147, 116, 139, 124, 131, + 6, 249, 14, 241, 22, 233, 30, 225, 38, 217, 46, 209, 54, 201, 62, 193, + 70, 185, 78, 177, 86, 169, 94, 161, 102, 153, 110, 145, 118, 137, 126, 129 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q192[192] { + 0, 255, 4, 251, 8, 247, 12, 243, 16, 239, 20, 235, 24, 231, 28, 227, + 32, 223, 36, 219, 40, 215, 44, 211, 48, 207, 52, 203, 56, 199, 60, 195, + 64, 191, 68, 187, 72, 183, 76, 179, 80, 175, 84, 171, 88, 167, 92, 163, + 96, 159, 100, 155, 104, 151, 108, 147, 112, 143, 116, 139, 120, 135, 124, 131, + 1, 254, 5, 250, 9, 246, 13, 242, 17, 238, 21, 234, 25, 230, 29, 226, + 33, 222, 37, 218, 41, 214, 45, 210, 49, 206, 53, 202, 57, 198, 61, 194, + 65, 190, 69, 186, 73, 182, 77, 178, 81, 174, 85, 170, 89, 166, 93, 162, + 97, 158, 101, 154, 105, 150, 109, 146, 113, 142, 117, 138, 121, 134, 125, 130, + 2, 253, 6, 249, 10, 245, 14, 241, 18, 237, 22, 233, 26, 229, 30, 225, + 34, 221, 38, 217, 42, 213, 46, 209, 50, 205, 54, 201, 58, 197, 62, 193, + 66, 189, 70, 185, 74, 181, 78, 177, 82, 173, 86, 169, 90, 165, 94, 161, + 98, 157, 102, 153, 106, 149, 110, 145, 114, 141, 118, 137, 122, 133, 126, 129 +}; + +static const uint8_t color_scrambled_pquant_to_uquant_q256[256] { + 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, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 +}; + +const uint8_t* color_scrambled_pquant_to_uquant_tables[17] { + color_scrambled_pquant_to_uquant_q6, + color_scrambled_pquant_to_uquant_q8, + color_scrambled_pquant_to_uquant_q10, + color_scrambled_pquant_to_uquant_q12, + color_scrambled_pquant_to_uquant_q16, + color_scrambled_pquant_to_uquant_q20, + color_scrambled_pquant_to_uquant_q24, + color_scrambled_pquant_to_uquant_q32, + color_scrambled_pquant_to_uquant_q40, + color_scrambled_pquant_to_uquant_q48, + color_scrambled_pquant_to_uquant_q64, + color_scrambled_pquant_to_uquant_q80, + color_scrambled_pquant_to_uquant_q96, + color_scrambled_pquant_to_uquant_q128, + color_scrambled_pquant_to_uquant_q160, + color_scrambled_pquant_to_uquant_q192, + color_scrambled_pquant_to_uquant_q256 }; -// The quant_mode_table[integercount/2][bits] gives us the quantization level for a given integer +// The quant_mode_table[integer_count/2][bits] gives us the quantization level for a given integer // count and number of bits that the integer may fit into. const int8_t quant_mode_table[10][128] { { diff --git a/Source/astcenc_symbolic_physical.cpp b/Source/astcenc_symbolic_physical.cpp index ea9aea5eb2c6c4422e630ae90afc351e6b9193c3..21803e08227d7ce4ca61a45f214fe1d4bfaf6a17 100644 --- a/Source/astcenc_symbolic_physical.cpp +++ b/Source/astcenc_symbolic_physical.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -24,36 +24,21 @@ #include /** - * @brief Write up to 8 bits at an arbitrary bit offset. - * - * The stored value is at most 8 bits, but can be stored at an offset of between 0 and 7 bits so - * may span two separate bytes in memory. + * @brief Reverse bits in a byte. * - * @param value The value to write. - * @param bitcount The number of bits to write, starting from LSB. - * @param bitoffset The bit offset to store at, between 0 and 7. - * @param[in,out] ptr The data pointer to write to. + * @param p The value to reverse. + * + * @return The reversed result. */ -static inline void write_bits( - int value, - int bitcount, - int bitoffset, - uint8_t* ptr -) { - int mask = (1 << bitcount) - 1; - value &= mask; - ptr += bitoffset >> 3; - bitoffset &= 7; - value <<= bitoffset; - mask <<= bitoffset; - mask = ~mask; - - ptr[0] &= mask; - ptr[0] |= value; - ptr[1] &= mask >> 8; - ptr[1] |= value >> 8; +static inline int bitrev8(int p) +{ + p = ((p & 0x0F) << 4) | ((p >> 4) & 0x0F); + p = ((p & 0x33) << 2) | ((p >> 2) & 0x33); + p = ((p & 0x55) << 1) | ((p >> 1) & 0x55); + return p; } + /** * @brief Read up to 8 bits at an arbitrary bit offset. * @@ -80,19 +65,37 @@ static inline int read_bits( return value; } +#if !defined(ASTCENC_DECOMPRESS_ONLY) + /** - * @brief Reverse bits in a byte. + * @brief Write up to 8 bits at an arbitrary bit offset. * - * @param p The value to reverse. - * - * @return The reversed result. + * The stored value is at most 8 bits, but can be stored at an offset of between 0 and 7 bits so + * may span two separate bytes in memory. + * + * @param value The value to write. + * @param bitcount The number of bits to write, starting from LSB. + * @param bitoffset The bit offset to store at, between 0 and 7. + * @param[in,out] ptr The data pointer to write to. */ -static inline int bitrev8(int p) -{ - p = ((p & 0x0F) << 4) | ((p >> 4) & 0x0F); - p = ((p & 0x33) << 2) | ((p >> 2) & 0x33); - p = ((p & 0x55) << 1) | ((p >> 1) & 0x55); - return p; +static inline void write_bits( + int value, + int bitcount, + int bitoffset, + uint8_t* ptr +) { + int mask = (1 << bitcount) - 1; + value &= mask; + ptr += bitoffset >> 3; + bitoffset &= 7; + value <<= bitoffset; + mask <<= bitoffset; + mask = ~mask; + + ptr[0] &= mask; + ptr[0] |= value; + ptr[1] &= mask >> 8; + ptr[1] |= value >> 8; } static const int HIGH_SPEED_PROFILE_COLOR_BYTES = 8; @@ -101,27 +104,41 @@ static const int HIGH_SPEED_PROFILE_WEIGHT_BYTES = 16; void symbolic_to_physical( const block_size_descriptor& bsd, const symbolic_compressed_block& scb, - physical_compressed_block& pcb + uint8_t pcb[16] ) { assert(scb.block_type != SYM_BTYPE_ERROR); + const auto& bm = bsd.get_block_mode(scb.block_mode); + const auto& di = bsd.get_decimation_info(bm.decimation_mode); + int weight_count = di.weight_count; + quant_method weight_quant_method = bm.get_weight_quant_mode(); + float weight_quant_levels = static_cast(get_quant_level(weight_quant_method)); + const auto& qat = quant_and_xfer_tables[weight_quant_method]; if (scb.privateProfile == HIGH_SPEED_PROFILE) { + uint8_t weights[64]; + for (int i = 0; i < weight_count; i++) + { + float uqw = static_cast(scb.weights[i]); + float qw = (uqw / 64.0f) * (weight_quant_levels - 1.0f); + int qwi = static_cast(qw + 0.5f); + weights[i] = qat.scramble_map[qwi]; + } uint8_t weightbuf[HIGH_SPEED_PROFILE_WEIGHT_BYTES] = {0}; - encode_ise(QUANT_6, HIGH_SPEED_PROFILE_WEIGHT_BYTES, scb.weights, weightbuf, 0); + encode_ise(QUANT_6, HIGH_SPEED_PROFILE_WEIGHT_BYTES, weights, weightbuf, 0); for (int i = 0; i < HIGH_SPEED_PROFILE_WEIGHT_BYTES; i++) { - pcb.data[i] = static_cast(bitrev8(weightbuf[HIGH_SPEED_PROFILE_WEIGHT_BYTES - 1 - i])); + pcb[i] = static_cast(bitrev8(weightbuf[HIGH_SPEED_PROFILE_WEIGHT_BYTES - 1 - i])); } - pcb.data[0] = 0x43; // the first byte of every block stream is 0x43 for HIGH_SPEED_PROFILE - pcb.data[1] = 0x80; // the second byte of every block stream is 0x80 for HIGH_SPEED_PROFILE - pcb.data[2] = 0x01; // the third (2 idx) byte of every block stream is 0x01 for HIGH_SPEED_PROFILE + pcb[0] = 0x43; // the first byte of every block stream is 0x43 for HIGH_SPEED_PROFILE + pcb[1] = 0x80; // the second byte of every block stream is 0x80 for HIGH_SPEED_PROFILE + pcb[2] = 0x01; // the third (2 idx) byte of every block stream is 0x01 for HIGH_SPEED_PROFILE uint8_t values_to_encode[HIGH_SPEED_PROFILE_COLOR_BYTES]; for (int j = 0; j < HIGH_SPEED_PROFILE_COLOR_BYTES; j++) { values_to_encode[j] = scb.color_values[0][j]; } encode_ise(scb.get_color_quant_mode(), HIGH_SPEED_PROFILE_COLOR_BYTES, - values_to_encode, pcb.data, 17); // the color is starting from 17th bit for HIGH_SPEED_PROFILE + values_to_encode, pcb, 17); // the color is starting from 17th bit for HIGH_SPEED_PROFILE return; } @@ -132,13 +149,13 @@ void symbolic_to_physical( static const uint8_t cbytes[8] { 0xFC, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; for (unsigned int i = 0; i < 8; i++) { - pcb.data[i] = cbytes[i]; + pcb[i] = cbytes[i]; } for (unsigned int i = 0; i < BLOCK_MAX_COMPONENTS; i++) { - pcb.data[2 * i + 8] = scb.constant_color[i] & 0xFF; - pcb.data[2 * i + 9] = (scb.constant_color[i] >> 8) & 0xFF; + pcb[2 * i + 8] = scb.constant_color[i] & 0xFF; + pcb[2 * i + 9] = (scb.constant_color[i] >> 8) & 0xFF; } return; @@ -151,13 +168,13 @@ void symbolic_to_physical( static const uint8_t cbytes[8] { 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; for (unsigned int i = 0; i < 8; i++) { - pcb.data[i] = cbytes[i]; + pcb[i] = cbytes[i]; } for (unsigned int i = 0; i < BLOCK_MAX_COMPONENTS; i++) { - pcb.data[2 * i + 8] = scb.constant_color[i] & 0xFF; - pcb.data[2 * i + 9] = (scb.constant_color[i] >> 8) & 0xFF; + pcb[2 * i + 8] = scb.constant_color[i] & 0xFF; + pcb[2 * i + 9] = (scb.constant_color[i] >> 8) & 0xFF; } return; @@ -169,50 +186,60 @@ void symbolic_to_physical( // They are encoded as an ordinary integer-sequence, then bit-reversed uint8_t weightbuf[16] { 0 }; - const auto& bm = bsd.get_block_mode(scb.block_mode); - const auto& di = bsd.get_decimation_info(bm.decimation_mode); - int weight_count = di.weight_count; - quant_method weight_quant_method = bm.get_weight_quant_mode(); int is_dual_plane = bm.is_dual_plane; int real_weight_count = is_dual_plane ? 2 * weight_count : weight_count; int bits_for_weights = get_ise_sequence_bitcount(real_weight_count, weight_quant_method); + uint8_t weights[64]; if (is_dual_plane) { - uint8_t weights[64]; for (int i = 0; i < weight_count; i++) { - weights[2 * i] = scb.weights[i]; - weights[2 * i + 1] = scb.weights[i + WEIGHTS_PLANE2_OFFSET]; + float uqw = static_cast(scb.weights[i]); + float qw = (uqw / 64.0f) * (weight_quant_levels - 1.0f); + int qwi = static_cast(qw + 0.5f); + weights[2 * i] = qat.scramble_map[qwi]; + + uqw = static_cast(scb.weights[i + WEIGHTS_PLANE2_OFFSET]); + qw = (uqw / 64.0f) * (weight_quant_levels - 1.0f); + qwi = static_cast(qw + 0.5f); + weights[2 * i + 1] = qat.scramble_map[qwi]; } - encode_ise(weight_quant_method, real_weight_count, weights, weightbuf, 0); } else { - encode_ise(weight_quant_method, weight_count, scb.weights, weightbuf, 0); + for (int i = 0; i < weight_count; i++) + { + float uqw = static_cast(scb.weights[i]); + float qw = (uqw / 64.0f) * (weight_quant_levels - 1.0f); + int qwi = static_cast(qw + 0.5f); + weights[i] = qat.scramble_map[qwi]; + } } + encode_ise(weight_quant_method, real_weight_count, weights, weightbuf, 0); + for (int i = 0; i < 16; i++) { - pcb.data[i] = static_cast(bitrev8(weightbuf[15 - i])); + pcb[i] = static_cast(bitrev8(weightbuf[15 - i])); } - write_bits(scb.block_mode, 11, 0, pcb.data); - write_bits(partition_count - 1, 2, 11, pcb.data); + write_bits(scb.block_mode, 11, 0, pcb); + write_bits(partition_count - 1, 2, 11, pcb); int below_weights_pos = 128 - bits_for_weights; // Encode partition index and color endpoint types for blocks with 2+ partitions if (partition_count > 1) { - write_bits(scb.partition_index, 6, 13, pcb.data); - write_bits(scb.partition_index >> 6, PARTITION_INDEX_BITS - 6, 19, pcb.data); + write_bits(scb.partition_index, 6, 13, pcb); + write_bits(scb.partition_index >> 6, PARTITION_INDEX_BITS - 6, 19, pcb); if (scb.color_formats_matched) { - write_bits(scb.color_formats[0] << 2, 6, 13 + PARTITION_INDEX_BITS, pcb.data); + write_bits(scb.color_formats[0] << 2, 6, 13 + PARTITION_INDEX_BITS, pcb); } else { @@ -251,44 +278,48 @@ void symbolic_to_physical( int encoded_type_highpart = encoded_type >> 6; int encoded_type_highpart_size = (3 * partition_count) - 4; int encoded_type_highpart_pos = 128 - bits_for_weights - encoded_type_highpart_size; - write_bits(encoded_type_lowpart, 6, 13 + PARTITION_INDEX_BITS, pcb.data); - write_bits(encoded_type_highpart, encoded_type_highpart_size, encoded_type_highpart_pos, pcb.data); + write_bits(encoded_type_lowpart, 6, 13 + PARTITION_INDEX_BITS, pcb); + write_bits(encoded_type_highpart, encoded_type_highpart_size, encoded_type_highpart_pos, pcb); below_weights_pos -= encoded_type_highpart_size; } } else { - write_bits(scb.color_formats[0], 4, 13, pcb.data); + write_bits(scb.color_formats[0], 4, 13, pcb); } // In dual-plane mode, encode the color component of the second plane of weights if (is_dual_plane) { - write_bits(scb.plane2_component, 2, below_weights_pos - 2, pcb.data); + write_bits(scb.plane2_component, 2, below_weights_pos - 2, pcb); } // Encode the color components uint8_t values_to_encode[32]; int valuecount_to_encode = 0; + + const uint8_t* pack_table = color_uquant_to_scrambled_pquant_tables[scb.quant_mode - QUANT_6]; for (unsigned int i = 0; i < scb.partition_count; i++) { int vals = 2 * (scb.color_formats[i] >> 2) + 2; assert(vals <= 8); for (int j = 0; j < vals; j++) { - values_to_encode[j + valuecount_to_encode] = scb.color_values[i][j]; + values_to_encode[j + valuecount_to_encode] = pack_table[scb.color_values[i][j]]; } valuecount_to_encode += vals; } - encode_ise(scb.get_color_quant_mode(), valuecount_to_encode, values_to_encode, pcb.data, + encode_ise(scb.get_color_quant_mode(), valuecount_to_encode, values_to_encode, pcb, scb.partition_count == 1 ? 17 : 19 + PARTITION_INDEX_BITS); } +#endif + /* See header for documentation. */ void physical_to_symbolic( const block_size_descriptor& bsd, - const physical_compressed_block& pcb, + const uint8_t pcb[16], symbolic_compressed_block& scb ) { uint8_t bswapped[16]; @@ -296,7 +327,7 @@ void physical_to_symbolic( scb.block_type = SYM_BTYPE_NONCONST; // Extract header fields - int block_mode = read_bits(11, 0, pcb.data); + int block_mode = read_bits(11, 0, pcb); if ((block_mode & 0x1FF) == 0x1FC) { // Constant color block @@ -314,24 +345,24 @@ void physical_to_symbolic( scb.partition_count = 0; for (int i = 0; i < 4; i++) { - scb.constant_color[i] = pcb.data[2 * i + 8] | (pcb.data[2 * i + 9] << 8); + scb.constant_color[i] = pcb[2 * i + 8] | (pcb[2 * i + 9] << 8); } // Additionally, check that the void-extent if (bsd.zdim == 1) { // 2D void-extent - int rsvbits = read_bits(2, 10, pcb.data); + int rsvbits = read_bits(2, 10, pcb); if (rsvbits != 3) { scb.block_type = SYM_BTYPE_ERROR; return; } - int vx_low_s = read_bits(8, 12, pcb.data) | (read_bits(5, 12 + 8, pcb.data) << 8); - int vx_high_s = read_bits(8, 25, pcb.data) | (read_bits(5, 25 + 8, pcb.data) << 8); - int vx_low_t = read_bits(8, 38, pcb.data) | (read_bits(5, 38 + 8, pcb.data) << 8); - int vx_high_t = read_bits(8, 51, pcb.data) | (read_bits(5, 51 + 8, pcb.data) << 8); + int vx_low_s = read_bits(8, 12, pcb) | (read_bits(5, 12 + 8, pcb) << 8); + int vx_high_s = read_bits(8, 25, pcb) | (read_bits(5, 25 + 8, pcb) << 8); + int vx_low_t = read_bits(8, 38, pcb) | (read_bits(5, 38 + 8, pcb) << 8); + int vx_high_t = read_bits(8, 51, pcb) | (read_bits(5, 51 + 8, pcb) << 8); int all_ones = vx_low_s == 0x1FFF && vx_high_s == 0x1FFF && vx_low_t == 0x1FFF && vx_high_t == 0x1FFF; @@ -344,12 +375,12 @@ void physical_to_symbolic( else { // 3D void-extent - int vx_low_s = read_bits(9, 10, pcb.data); - int vx_high_s = read_bits(9, 19, pcb.data); - int vx_low_t = read_bits(9, 28, pcb.data); - int vx_high_t = read_bits(9, 37, pcb.data); - int vx_low_p = read_bits(9, 46, pcb.data); - int vx_high_p = read_bits(9, 55, pcb.data); + int vx_low_s = read_bits(9, 10, pcb); + int vx_high_s = read_bits(9, 19, pcb); + int vx_low_t = read_bits(9, 28, pcb); + int vx_high_t = read_bits(9, 37, pcb); + int vx_low_p = read_bits(9, 46, pcb); + int vx_high_p = read_bits(9, 55, pcb); int all_ones = vx_low_s == 0x1FF && vx_high_s == 0x1FF && vx_low_t == 0x1FF && vx_high_t == 0x1FF && vx_low_p == 0x1FF && vx_high_p == 0x1FF; @@ -374,38 +405,47 @@ void physical_to_symbolic( const auto& di = bsd.get_decimation_info(bm.decimation_mode); int weight_count = di.weight_count; + promise(weight_count > 0); + quant_method weight_quant_method = static_cast(bm.quant_mode); int is_dual_plane = bm.is_dual_plane; int real_weight_count = is_dual_plane ? 2 * weight_count : weight_count; - int partition_count = read_bits(2, 11, pcb.data) + 1; + int partition_count = read_bits(2, 11, pcb) + 1; + promise(partition_count > 0); scb.block_mode = static_cast(block_mode); scb.partition_count = static_cast(partition_count); for (int i = 0; i < 16; i++) { - bswapped[i] = static_cast(bitrev8(pcb.data[15 - i])); + bswapped[i] = static_cast(bitrev8(pcb[15 - i])); } int bits_for_weights = get_ise_sequence_bitcount(real_weight_count, weight_quant_method); int below_weights_pos = 128 - bits_for_weights; + uint8_t indices[64]; + const auto& qat = quant_and_xfer_tables[weight_quant_method]; + + decode_ise(weight_quant_method, real_weight_count, bswapped, indices, 0); + if (is_dual_plane) { - uint8_t indices[64]; - decode_ise(weight_quant_method, real_weight_count, bswapped, indices, 0); for (int i = 0; i < weight_count; i++) { - scb.weights[i] = indices[2 * i]; - scb.weights[i + WEIGHTS_PLANE2_OFFSET] = indices[2 * i + 1]; + scb.weights[i] = qat.unscramble_and_unquant_map[indices[2 * i]]; + scb.weights[i + WEIGHTS_PLANE2_OFFSET] = qat.unscramble_and_unquant_map[indices[2 * i + 1]]; } } else { - decode_ise(weight_quant_method, weight_count, bswapped, scb.weights, 0); + for (int i = 0; i < weight_count; i++) + { + scb.weights[i] = qat.unscramble_and_unquant_map[indices[i]]; + } } if (is_dual_plane && partition_count == 4) @@ -421,14 +461,15 @@ void physical_to_symbolic( int encoded_type_highpart_size = 0; if (partition_count == 1) { - color_formats[0] = read_bits(4, 13, pcb.data); + color_formats[0] = read_bits(4, 13, pcb); scb.partition_index = 0; } else { encoded_type_highpart_size = (3 * partition_count) - 4; below_weights_pos -= encoded_type_highpart_size; - int encoded_type = read_bits(6, 13 + PARTITION_INDEX_BITS, pcb.data) | (read_bits(encoded_type_highpart_size, below_weights_pos, pcb.data) << 6); + int encoded_type = read_bits(6, 13 + PARTITION_INDEX_BITS, pcb) | + (read_bits(encoded_type_highpart_size, below_weights_pos, pcb) << 6); int baseclass = encoded_type & 0x3; if (baseclass == 0) { @@ -458,7 +499,8 @@ void physical_to_symbolic( bitpos += 2; } } - scb.partition_index = static_cast(read_bits(6, 13, pcb.data) | (read_bits(PARTITION_INDEX_BITS - 6, 19, pcb.data) << 6)); + scb.partition_index = static_cast(read_bits(6, 13, pcb) | + (read_bits(PARTITION_INDEX_BITS - 6, 19, pcb) << 6)); } for (int i = 0; i < partition_count; i++) @@ -502,24 +544,27 @@ void physical_to_symbolic( // Unpack the integer color values and assign to endpoints scb.quant_mode = static_cast(color_quant_level); + uint8_t values_to_decode[32]; - decode_ise(static_cast(color_quant_level), color_integer_count, pcb.data, + decode_ise(static_cast(color_quant_level), color_integer_count, pcb, values_to_decode, (partition_count == 1 ? 17 : 19 + PARTITION_INDEX_BITS)); int valuecount_to_decode = 0; + const uint8_t* unpack_table = color_scrambled_pquant_to_uquant_tables[scb.quant_mode - QUANT_6]; for (int i = 0; i < partition_count; i++) { int vals = 2 * (color_formats[i] >> 2) + 2; for (int j = 0; j < vals; j++) { - scb.color_values[i][j] = values_to_decode[j + valuecount_to_decode]; + scb.color_values[i][j] = unpack_table[values_to_decode[j + valuecount_to_decode]]; } valuecount_to_decode += vals; } // Fetch component for second-plane in the case of dual plane of weights. + scb.plane2_component = -1; if (is_dual_plane) { - scb.plane2_component = static_cast(read_bits(2, below_weights_pos - 2, pcb.data)); + scb.plane2_component = static_cast(read_bits(2, below_weights_pos - 2, pcb)); } } diff --git a/Source/astcenc_vecmathlib.h b/Source/astcenc_vecmathlib.h index 07a2ff3f3f94bdfa7f481784b410825d3531b6db..d48f1d73ea058f7aaf620e3a86965fd0cd4c8667 100644 --- a/Source/astcenc_vecmathlib.h +++ b/Source/astcenc_vecmathlib.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2021 Arm Limited +// Copyright 2019-2022 Arm Limited // Copyright 2008 Jose Fonseca // // Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -26,7 +26,7 @@ * with that is available at compile time. The current vector width is * accessible for e.g. loop strides via the ASTCENC_SIMD_WIDTH constant. * - * Explicit scalar types are acessible via the vint1, vfloat1, vmask1 types. + * Explicit scalar types are accessible via the vint1, vfloat1, vmask1 types. * These are provided primarily for prototyping and algorithm debug of VLA * implementations. * @@ -60,10 +60,13 @@ #if !defined(__clang__) && defined(_MSC_VER) #define ASTCENC_SIMD_INLINE __forceinline + #define ASTCENC_NO_INLINE #elif defined(__GNUC__) && !defined(__clang__) #define ASTCENC_SIMD_INLINE __attribute__((always_inline)) inline + #define ASTCENC_NO_INLINE __attribute__ ((noinline)) #else #define ASTCENC_SIMD_INLINE __attribute__((always_inline, nodebug)) inline + #define ASTCENC_NO_INLINE __attribute__ ((noinline)) #endif #if ASTCENC_AVX >= 2 @@ -160,7 +163,7 @@ */ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_8(unsigned int count) { - return count & ~(8 - 1); + return count & static_cast(~(8 - 1)); } /** @@ -172,7 +175,7 @@ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_8(unsigned int coun */ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_4(unsigned int count) { - return count & ~(4 - 1); + return count & static_cast(~(4 - 1)); } /** @@ -186,7 +189,7 @@ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_4(unsigned int coun */ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_vla(unsigned int count) { - return count & ~(ASTCENC_SIMD_WIDTH - 1); + return count & static_cast(~(ASTCENC_SIMD_WIDTH - 1)); } /** @@ -200,7 +203,7 @@ ASTCENC_SIMD_INLINE unsigned int round_down_to_simd_multiple_vla(unsigned int co */ ASTCENC_SIMD_INLINE unsigned int round_up_to_simd_multiple_vla(unsigned int count) { - int multiples = (count + ASTCENC_SIMD_WIDTH - 1) / ASTCENC_SIMD_WIDTH; + unsigned int multiples = (count + ASTCENC_SIMD_WIDTH - 1) / ASTCENC_SIMD_WIDTH; return multiples * ASTCENC_SIMD_WIDTH; } @@ -219,7 +222,7 @@ ASTCENC_SIMD_INLINE vfloat change_sign(vfloat a, vfloat b) /** * @brief Return fast, but approximate, vector atan(x). * - * Max error of this implementaiton is 0.004883. + * Max error of this implementation is 0.004883. */ ASTCENC_SIMD_INLINE vfloat atan(vfloat x) { @@ -399,7 +402,7 @@ static ASTCENC_SIMD_INLINE vint4 clz(vint4 a) // the original integer value into a 2^N encoding we can recover easily. // Convert to float without risk of rounding up by keeping only top 8 bits. - // This trick is is guranteed to keep top 8 bits and clear the 9th. + // This trick is is guaranteed to keep top 8 bits and clear the 9th. a = (~lsr<8>(a)) & a; a = float_as_int(int_to_float(a)); @@ -413,7 +416,7 @@ static ASTCENC_SIMD_INLINE vint4 clz(vint4 a) /** * @brief Return lanewise 2^a for each lane in @c a. * - * Use of signed int mean that this is only valid for values in range [0, 31]. + * Use of signed int means that this is only valid for values in range [0, 31]. */ static ASTCENC_SIMD_INLINE vint4 two_to_the_n(vint4 a) { @@ -507,7 +510,7 @@ static ASTCENC_SIMD_INLINE vfloat4 frexp(vfloat4 a, vint4& exp) exp = (lsr<23>(ai) & 0xFF) - 126; // Extract and unbias the mantissa - vint4 manti = (ai & 0x807FFFFF) | 0x3F000000; + vint4 manti = (ai & static_cast(0x807FFFFF)) | 0x3F000000; return int_as_float(manti); } diff --git a/Source/astcenc_vecmathlib_avx2_8.h b/Source/astcenc_vecmathlib_avx2_8.h index fe8a1b16669c1a3152b23f0d9609893dd0e45dbb..3ca25e35e1380286750c743be52e87d6c7b60049 100644 --- a/Source/astcenc_vecmathlib_avx2_8.h +++ b/Source/astcenc_vecmathlib_avx2_8.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2021 Arm Limited +// Copyright 2019-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -36,6 +36,9 @@ #include +// Define convenience intrinsics that are missing on older compilers +#define astcenc_mm256_set_m128i(m, n) _mm256_insertf128_si256(_mm256_castsi128_si256((n)), (m), 1) + // ============================================================================ // vfloat8 data type // ============================================================================ @@ -86,7 +89,8 @@ struct vfloat8 /** * @brief Construct from an existing SIMD register. */ - ASTCENC_SIMD_INLINE explicit vfloat8(__m256 a) { + ASTCENC_SIMD_INLINE explicit vfloat8(__m256 a) + { m = a; } @@ -237,6 +241,14 @@ struct vint8 return vint8(_mm256_broadcastd_epi32(a)); } + /** + * @brief Factory that returns a vector loaded from unaligned memory. + */ + static ASTCENC_SIMD_INLINE vint8 load(const uint8_t* p) + { + return vint8(_mm256_lddqu_si256(reinterpret_cast(p))); + } + /** * @brief Factory that returns a vector loaded from 32B aligned memory. */ @@ -340,9 +352,9 @@ ASTCENC_SIMD_INLINE vmask8 operator~(vmask8 a) * * bit0 = lane 0 */ -ASTCENC_SIMD_INLINE unsigned mask(vmask8 a) +ASTCENC_SIMD_INLINE unsigned int mask(vmask8 a) { - return _mm256_movemask_ps(a.m); + return static_cast(_mm256_movemask_ps(a.m)); } /** @@ -354,7 +366,7 @@ ASTCENC_SIMD_INLINE bool any(vmask8 a) } /** - * @brief True if any lanes are enabled, false otherwise. + * @brief True if all lanes are enabled, false otherwise. */ ASTCENC_SIMD_INLINE bool all(vmask8 a) { @@ -461,6 +473,14 @@ ASTCENC_SIMD_INLINE vmask8 operator>(vint8 a, vint8 b) return vmask8(_mm256_cmpgt_epi32(a.m, b.m)); } +/** + * @brief Logical shift left. + */ +template ASTCENC_SIMD_INLINE vint8 lsl(vint8 a) +{ + return vint8(_mm256_slli_epi32(a.m, s)); +} + /** * @brief Arithmetic shift right. */ @@ -503,16 +523,13 @@ ASTCENC_SIMD_INLINE vint8 hmin(vint8 a) m = _mm_min_epi32(m, _mm_shuffle_epi32(m, _MM_SHUFFLE(0,0,0,1))); m = _mm_shuffle_epi32(m, _MM_SHUFFLE(0,0,0,0)); - // This is the most logical implementation, but the convenience intrinsic - // is missing on older compilers (supported in g++ 9 and clang++ 9). - //__m256i r = _mm256_set_m128i(m, m) - __m256i r = _mm256_insertf128_si256(_mm256_castsi128_si256(m), m, 1); + __m256i r = astcenc_mm256_set_m128i(m, m); vint8 vmin(r); return vmin; } /** - * @brief Return the horizontal minimum of a vector. + * @brief Return the horizontal maximum of a vector. */ ASTCENC_SIMD_INLINE vint8 hmax(vint8 a) { @@ -521,10 +538,7 @@ ASTCENC_SIMD_INLINE vint8 hmax(vint8 a) m = _mm_max_epi32(m, _mm_shuffle_epi32(m, _MM_SHUFFLE(0,0,0,1))); m = _mm_shuffle_epi32(m, _MM_SHUFFLE(0,0,0,0)); - // This is the most logical implementation, but the convenience intrinsic - // is missing on older compilers (supported in g++ 9 and clang++ 9). - //__m256i r = _mm256_set_m128i(m, m) - __m256i r = _mm256_insertf128_si256(_mm256_castsi128_si256(m), m, 1); + __m256i r = astcenc_mm256_set_m128i(m, m); vint8 vmax(r); return vmax; } @@ -578,10 +592,7 @@ ASTCENC_SIMD_INLINE vint8 pack_low_bytes(vint8 v) __m128i a1 = _mm256_extracti128_si256(a, 1); __m128i b = _mm_unpacklo_epi32(a0, a1); - // This is the most logical implementation, but the convenience intrinsic - // is missing on older compilers (supported in g++ 9 and clang++ 9). - //__m256i r = _mm256_set_m128i(b, b) - __m256i r = _mm256_insertf128_si256(_mm256_castsi128_si256(b), b, 1); + __m256i r = astcenc_mm256_set_m128i(b, b); return vint8(r); } @@ -731,6 +742,16 @@ ASTCENC_SIMD_INLINE vfloat8 min(vfloat8 a, vfloat8 b) return vfloat8(_mm256_min_ps(a.m, b.m)); } +/** + * @brief Return the min vector of a vector and a scalar. + * + * If either lane value is NaN, @c b will be returned for that lane. + */ +ASTCENC_SIMD_INLINE vfloat8 min(vfloat8 a, float b) +{ + return min(a, vfloat8(b)); +} + /** * @brief Return the max vector of two vectors. * @@ -741,6 +762,16 @@ ASTCENC_SIMD_INLINE vfloat8 max(vfloat8 a, vfloat8 b) return vfloat8(_mm256_max_ps(a.m, b.m)); } +/** + * @brief Return the max vector of a vector and a scalar. + * + * If either lane value is NaN, @c b will be returned for that lane. + */ +ASTCENC_SIMD_INLINE vfloat8 max(vfloat8 a, float b) +{ + return max(a, vfloat8(b)); +} + /** * @brief Return the clamped value between min and max. * @@ -805,13 +836,13 @@ ASTCENC_SIMD_INLINE vfloat8 hmin(vfloat8 a) { __m128 vlow = _mm256_castps256_ps128(a.m); __m128 vhigh = _mm256_extractf128_ps(a.m, 1); - vlow = _mm_min_ps(vlow, vhigh); + vlow = _mm_min_ps(vlow, vhigh); // First do an horizontal reduction. __m128 shuf = _mm_shuffle_ps(vlow, vlow, _MM_SHUFFLE(2, 3, 0, 1)); __m128 mins = _mm_min_ps(vlow, shuf); - shuf = _mm_movehl_ps(shuf, mins); - mins = _mm_min_ss(mins, shuf); + shuf = _mm_movehl_ps(shuf, mins); + mins = _mm_min_ss(mins, shuf); // This is the most logical implementation, but the convenience intrinsic // is missing on older compilers (supported in g++ 9 and clang++ 9). @@ -836,13 +867,13 @@ ASTCENC_SIMD_INLINE vfloat8 hmax(vfloat8 a) { __m128 vlow = _mm256_castps256_ps128(a.m); __m128 vhigh = _mm256_extractf128_ps(a.m, 1); - vhigh = _mm_max_ps(vlow, vhigh); + vhigh = _mm_max_ps(vlow, vhigh); // First do an horizontal reduction. __m128 shuf = _mm_shuffle_ps(vhigh, vhigh, _MM_SHUFFLE(2, 3, 0, 1)); __m128 maxs = _mm_max_ps(vhigh, shuf); - shuf = _mm_movehl_ps(shuf,maxs); - maxs = _mm_max_ss(maxs, shuf); + shuf = _mm_movehl_ps(shuf,maxs); + maxs = _mm_max_ss(maxs, shuf); // This is the most logical implementation, but the convenience intrinsic // is missing on older compilers (supported in g++ 9 and clang++ 9). @@ -972,6 +1003,16 @@ ASTCENC_SIMD_INLINE vint8 float_to_int(vfloat8 a) return vint8(_mm256_cvttps_epi32(a.m)); } +/** + * @brief Return a integer value for a float vector, using round-to-nearest. + */ +ASTCENC_SIMD_INLINE vint8 float_to_int_rtn(vfloat8 a) +{ + a = a + vfloat8(0.5f); + return vint8(_mm256_cvttps_epi32(a.m)); +} + + /** * @brief Return a float value for an integer vector. */ @@ -1004,23 +1045,154 @@ ASTCENC_SIMD_INLINE vfloat8 int_as_float(vint8 a) return vfloat8(_mm256_castsi256_ps(a.m)); } +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint8& t0p) +{ + // AVX2 duplicates the table within each 128-bit lane + __m128i t0n = t0.m; + t0p = vint8(astcenc_mm256_set_m128i(t0n, t0n)); +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4 t1, vint8& t0p, vint8& t1p) +{ + // AVX2 duplicates the table within each 128-bit lane + __m128i t0n = t0.m; + t0p = vint8(astcenc_mm256_set_m128i(t0n, t0n)); + + __m128i t1n = _mm_xor_si128(t0.m, t1.m); + t1p = vint8(astcenc_mm256_set_m128i(t1n, t1n)); +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare( + vint4 t0, vint4 t1, vint4 t2, vint4 t3, + vint8& t0p, vint8& t1p, vint8& t2p, vint8& t3p) +{ + // AVX2 duplicates the table within each 128-bit lane + __m128i t0n = t0.m; + t0p = vint8(astcenc_mm256_set_m128i(t0n, t0n)); + + __m128i t1n = _mm_xor_si128(t0.m, t1.m); + t1p = vint8(astcenc_mm256_set_m128i(t1n, t1n)); + + __m128i t2n = _mm_xor_si128(t1.m, t2.m); + t2p = vint8(astcenc_mm256_set_m128i(t2n, t2n)); + + __m128i t3n = _mm_xor_si128(t2.m, t3.m); + t3p = vint8(astcenc_mm256_set_m128i(t3n, t3n)); +} + +/** + * @brief Perform an 8-bit 16-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint8 vtable_8bt_32bi(vint8 t0, vint8 idx) +{ + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m256i idxx = _mm256_or_si256(idx.m, _mm256_set1_epi32(static_cast(0xFFFFFF00))); + + __m256i result = _mm256_shuffle_epi8(t0.m, idxx); + return vint8(result); +} + +/** + * @brief Perform an 8-bit 32-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint8 vtable_8bt_32bi(vint8 t0, vint8 t1, vint8 idx) +{ + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m256i idxx = _mm256_or_si256(idx.m, _mm256_set1_epi32(static_cast(0xFFFFFF00))); + + __m256i result = _mm256_shuffle_epi8(t0.m, idxx); + idxx = _mm256_sub_epi8(idxx, _mm256_set1_epi8(16)); + + __m256i result2 = _mm256_shuffle_epi8(t1.m, idxx); + result = _mm256_xor_si256(result, result2); + return vint8(result); +} + +/** + * @brief Perform an 8-bit 64-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint8 vtable_8bt_32bi(vint8 t0, vint8 t1, vint8 t2, vint8 t3, vint8 idx) +{ + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m256i idxx = _mm256_or_si256(idx.m, _mm256_set1_epi32(static_cast(0xFFFFFF00))); + + __m256i result = _mm256_shuffle_epi8(t0.m, idxx); + idxx = _mm256_sub_epi8(idxx, _mm256_set1_epi8(16)); + + __m256i result2 = _mm256_shuffle_epi8(t1.m, idxx); + result = _mm256_xor_si256(result, result2); + idxx = _mm256_sub_epi8(idxx, _mm256_set1_epi8(16)); + + result2 = _mm256_shuffle_epi8(t2.m, idxx); + result = _mm256_xor_si256(result, result2); + idxx = _mm256_sub_epi8(idxx, _mm256_set1_epi8(16)); + + result2 = _mm256_shuffle_epi8(t3.m, idxx); + result = _mm256_xor_si256(result, result2); + + return vint8(result); +} + +/** + * @brief Return a vector of interleaved RGBA data. + * + * Input vectors have the value stored in the bottom 8 bits of each lane, + * with high bits set to zero. + * + * Output vector stores a single RGBA texel packed in each lane. + */ +ASTCENC_SIMD_INLINE vint8 interleave_rgba8(vint8 r, vint8 g, vint8 b, vint8 a) +{ + return r + lsl<8>(g) + lsl<16>(b) + lsl<24>(a); +} + +/** + * @brief Store a vector, skipping masked lanes. + * + * All masked lanes must be at the end of vector, after all non-masked lanes. + */ +ASTCENC_SIMD_INLINE void store_lanes_masked(uint8_t* base, vint8 data, vmask8 mask) +{ + _mm256_maskstore_epi32(reinterpret_cast(base), _mm256_castps_si256(mask.m), data.m); +} + /** * @brief Debug function to print a vector of ints. */ ASTCENC_SIMD_INLINE void print(vint8 a) { - alignas(ASTCENC_VECALIGN) int v[8]; + alignas(32) int v[8]; storea(a, v); printf("v8_i32:\n %8d %8d %8d %8d %8d %8d %8d %8d\n", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]); } +/** + * @brief Debug function to print a vector of ints. + */ +ASTCENC_SIMD_INLINE void printx(vint8 a) +{ + alignas(32) int v[8]; + storea(a, v); + printf("v8_i32:\n %08x %08x %08x %08x %08x %08x %08x %08x\n", + v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]); +} + /** * @brief Debug function to print a vector of floats. */ ASTCENC_SIMD_INLINE void print(vfloat8 a) { - alignas(ASTCENC_VECALIGN) float v[8]; + alignas(32) float v[8]; storea(a, v); printf("v8_f32:\n %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f\n", static_cast(v[0]), static_cast(v[1]), diff --git a/Source/astcenc_vecmathlib_common_4.h b/Source/astcenc_vecmathlib_common_4.h index b7d644d8c9fdc8649047f0c770b69fca10d82884..1e04367c1ff1cc114fe863d028fe98bf6b917f48 100644 --- a/Source/astcenc_vecmathlib_common_4.h +++ b/Source/astcenc_vecmathlib_common_4.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2020-2021 Arm Limited +// Copyright 2020-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -361,23 +361,51 @@ static inline int popcount(uint64_t v) #endif +/** + * @brief Apply signed bit transfer. + * + * @param input0 The first encoded endpoint. + * @param input1 The second encoded endpoint. + */ +static ASTCENC_SIMD_INLINE void bit_transfer_signed( + vint4& input0, + vint4& input1 +) { + input1 = lsr<1>(input1) | (input0 & 0x80); + input0 = lsr<1>(input0) & 0x3F; + + vmask4 mask = (input0 & 0x20) != vint4::zero(); + input0 = select(input0, input0 - 0x40, mask); +} + /** * @brief Debug function to print a vector of ints. */ ASTCENC_SIMD_INLINE void print(vint4 a) { - alignas(16) int v[4]; + ASTCENC_ALIGNAS int v[4]; storea(a, v); printf("v4_i32:\n %8d %8d %8d %8d\n", v[0], v[1], v[2], v[3]); } +/** + * @brief Debug function to print a vector of ints. + */ +ASTCENC_SIMD_INLINE void printx(vint4 a) +{ + ASTCENC_ALIGNAS int v[4]; + storea(a, v); + printf("v4_i32:\n %08x %08x %08x %08x\n", + v[0], v[1], v[2], v[3]); +} + /** * @brief Debug function to print a vector of floats. */ ASTCENC_SIMD_INLINE void print(vfloat4 a) { - alignas(16) float v[4]; + ASTCENC_ALIGNAS float v[4]; storea(a, v); printf("v4_f32:\n %0.4f %0.4f %0.4f %0.4f\n", static_cast(v[0]), static_cast(v[1]), diff --git a/Source/astcenc_vecmathlib_neon_4.h b/Source/astcenc_vecmathlib_neon_4.h index 7ac9da3fff6b9e5b8a3a9defa12fd81ee241fc71..42545e7562727fcd713b00ddb35fb52bdabeaf54 100644 --- a/Source/astcenc_vecmathlib_neon_4.h +++ b/Source/astcenc_vecmathlib_neon_4.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2022 Arm Limited +// Copyright 2019-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -38,6 +38,7 @@ #endif #include +#include // ============================================================================ // vfloat4 data type @@ -106,7 +107,7 @@ struct vfloat4 */ template ASTCENC_SIMD_INLINE void set_lane(float a) { - m = vld1q_lane_f32(&a, m, l); + m = vsetq_lane_f32(a, m, l); } /** @@ -122,7 +123,7 @@ struct vfloat4 */ static ASTCENC_SIMD_INLINE vfloat4 load1(const float* p) { - return vfloat4(vdupq_n_f32(*p)); + return vfloat4(vld1q_dup_f32(p)); } /** @@ -202,9 +203,8 @@ struct vint4 */ ASTCENC_SIMD_INLINE explicit vint4(const uint8_t *p) { - uint32x2_t t8 {}; // Cast is safe - NEON loads are allowed to be unaligned - t8 = vld1_lane_u32((const uint32_t*)p, t8, 0); + uint32x2_t t8 = vld1_dup_u32(reinterpret_cast(p)); uint16x4_t t16 = vget_low_u16(vmovl_u8(vreinterpret_u8_u32(t8))); m = vreinterpretq_s32_u32(vmovl_u16(t16)); } @@ -251,7 +251,7 @@ struct vint4 */ template ASTCENC_SIMD_INLINE void set_lane(int a) { - m = vld1q_lane_s32(&a, m, l); + m = vsetq_lane_s32(a, m, l); } /** @@ -270,6 +270,16 @@ struct vint4 return vint4(*p); } + /** + * @brief Factory that returns a vector loaded from unaligned memory. + */ + static ASTCENC_SIMD_INLINE vint4 load(const uint8_t* p) + { + vint4 data; + std::memcpy(&data.m, p, 4 * sizeof(int)); + return data; + } + /** * @brief Factory that returns a vector loaded from 16B aligned memory. */ @@ -283,7 +293,7 @@ struct vint4 */ static ASTCENC_SIMD_INLINE vint4 lane_id() { - alignas(ASTCENC_VECALIGN) static const int data[4] { 0, 1, 2, 3 }; + alignas(16) static const int data[4] { 0, 1, 2, 3 }; return vint4(vld1q_s32(data)); } @@ -346,6 +356,14 @@ struct vmask4 m = vreinterpretq_u32_s32(ms); } + /** + * @brief Get the scalar from a single lane. + */ + template ASTCENC_SIMD_INLINE bool lane() const + { + return vgetq_lane_u32(m, l) != 0; + } + /** * @brief The vector ... */ @@ -577,12 +595,20 @@ ASTCENC_SIMD_INLINE void store(vint4 a, int* p) vst1q_s32(p, a.m); } +/** + * @brief Store a vector to an unaligned memory address. + */ +ASTCENC_SIMD_INLINE void store(vint4 a, uint8_t* p) +{ + std::memcpy(p, &a.m, sizeof(int) * 4); +} + /** * @brief Store lowest N (vector width) bytes into an unaligned address. */ ASTCENC_SIMD_INLINE void store_nbytes(vint4 a, uint8_t* p) { - vst1q_lane_s32((int32_t*)p, a.m, 0); + vst1q_lane_s32(reinterpret_cast(p), a.m, 0); } /** @@ -842,7 +868,7 @@ ASTCENC_SIMD_INLINE vint4 float_to_int(vfloat4 a) */ ASTCENC_SIMD_INLINE vint4 float_to_int_rtn(vfloat4 a) { - a = round(a); + a = a + vfloat4(0.5f); return vint4(vcvtq_s32_f32(a.m)); } @@ -874,7 +900,7 @@ ASTCENC_SIMD_INLINE vint4 float_to_float16(vfloat4 a) static inline uint16_t float_to_float16(float a) { vfloat4 av(a); - return float_to_float16(av).lane<0>(); + return static_cast(float_to_float16(av).lane<0>()); } /** @@ -924,6 +950,138 @@ ASTCENC_SIMD_INLINE vfloat4 int_as_float(vint4 v) return vfloat4(vreinterpretq_f32_s32(v.m)); } +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4& t0p) +{ + t0p = t0; +} + + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4 t1, vint4& t0p, vint4& t1p) +{ + t0p = t0; + t1p = t1; +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare( + vint4 t0, vint4 t1, vint4 t2, vint4 t3, + vint4& t0p, vint4& t1p, vint4& t2p, vint4& t3p) +{ + t0p = t0; + t1p = t1; + t2p = t2; + t3p = t3; +} + +/** + * @brief Perform an 8-bit 16-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 idx) +{ + int8x16_t table { + vreinterpretq_s8_s32(t0.m) + }; + + // Set index byte above max index for unused bytes so table lookup returns zero + int32x4_t idx_masked = vorrq_s32(idx.m, vdupq_n_s32(0xFFFFFF00)); + uint8x16_t idx_bytes = vreinterpretq_u8_s32(idx_masked); + + return vint4(vreinterpretq_s32_s8(vqtbl1q_s8(table, idx_bytes))); +} + +/** + * @brief Perform an 8-bit 32-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 idx) +{ + int8x16x2_t table { + vreinterpretq_s8_s32(t0.m), + vreinterpretq_s8_s32(t1.m) + }; + + // Set index byte above max index for unused bytes so table lookup returns zero + int32x4_t idx_masked = vorrq_s32(idx.m, vdupq_n_s32(0xFFFFFF00)); + uint8x16_t idx_bytes = vreinterpretq_u8_s32(idx_masked); + + return vint4(vreinterpretq_s32_s8(vqtbl2q_s8(table, idx_bytes))); +} + +/** + * @brief Perform an 8-bit 64-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 t2, vint4 t3, vint4 idx) +{ + int8x16x4_t table { + vreinterpretq_s8_s32(t0.m), + vreinterpretq_s8_s32(t1.m), + vreinterpretq_s8_s32(t2.m), + vreinterpretq_s8_s32(t3.m) + }; + + // Set index byte above max index for unused bytes so table lookup returns zero + int32x4_t idx_masked = vorrq_s32(idx.m, vdupq_n_s32(0xFFFFFF00)); + uint8x16_t idx_bytes = vreinterpretq_u8_s32(idx_masked); + + return vint4(vreinterpretq_s32_s8(vqtbl4q_s8(table, idx_bytes))); +} + +/** + * @brief Return a vector of interleaved RGBA data. + * + * Input vectors have the value stored in the bottom 8 bits of each lane, + * with high bits set to zero. + * + * Output vector stores a single RGBA texel packed in each lane. + */ +ASTCENC_SIMD_INLINE vint4 interleave_rgba8(vint4 r, vint4 g, vint4 b, vint4 a) +{ + return r + lsl<8>(g) + lsl<16>(b) + lsl<24>(a); +} + +/** + * @brief Store a single vector lane to an unaligned address. + */ +ASTCENC_SIMD_INLINE void store_lane(uint8_t* base, int data) +{ + std::memcpy(base, &data, sizeof(int)); +} + +/** + * @brief Store a vector, skipping masked lanes. + * + * All masked lanes must be at the end of vector, after all non-masked lanes. + */ +ASTCENC_SIMD_INLINE void store_lanes_masked(uint8_t* base, vint4 data, vmask4 mask) +{ + if (mask.lane<3>()) + { + store(data, base); + } + else if (mask.lane<2>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + store_lane(base + 8, data.lane<2>()); + } + else if (mask.lane<1>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + } + else if (mask.lane<0>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + } +} + #define ASTCENC_USE_NATIVE_POPCOUNT 1 /** diff --git a/Source/astcenc_vecmathlib_none_4.h b/Source/astcenc_vecmathlib_none_4.h index 5a399ef5e4d3f4e9d86e0f5d9b4dfccb9060edb8..1c95c2ff88a26a9aaf17860e14630af47184a7cc 100644 --- a/Source/astcenc_vecmathlib_none_4.h +++ b/Source/astcenc_vecmathlib_none_4.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2021 Arm Limited +// Copyright 2019-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -275,6 +275,16 @@ struct vint4 return vint4(*p); } + /** + * @brief Factory that returns a vector loaded from unaligned memory. + */ + static ASTCENC_SIMD_INLINE vint4 load(const uint8_t* p) + { + vint4 data; + std::memcpy(&data.m, p, 4 * sizeof(int)); + return data; + } + /** * @brief Factory that returns a vector loaded from 16B aligned memory. */ @@ -341,6 +351,13 @@ struct vmask4 m[3] = d == false ? 0 : -1; } + /** + * @brief Get the scalar value of a single lane. + */ + template ASTCENC_SIMD_INLINE float lane() const + { + return m[l] != 0; + } /** * @brief The vector ... @@ -550,10 +567,15 @@ template ASTCENC_SIMD_INLINE vint4 lsl(vint4 a) */ template ASTCENC_SIMD_INLINE vint4 lsr(vint4 a) { - return vint4((int)(((unsigned int)a.m[0]) >> s), - (int)(((unsigned int)a.m[1]) >> s), - (int)(((unsigned int)a.m[2]) >> s), - (int)(((unsigned int)a.m[3]) >> s)); + unsigned int as0 = static_cast(a.m[0]) >> s; + unsigned int as1 = static_cast(a.m[1]) >> s; + unsigned int as2 = static_cast(a.m[2]) >> s; + unsigned int as3 = static_cast(a.m[3]) >> s; + + return vint4(static_cast(as0), + static_cast(as1), + static_cast(as2), + static_cast(as3)); } /** @@ -639,13 +661,20 @@ ASTCENC_SIMD_INLINE void store(vint4 a, int* p) p[3] = a.m[3]; } +/** + * @brief Store a vector to an unaligned memory address. + */ +ASTCENC_SIMD_INLINE void store(vint4 a, uint8_t* p) +{ + std::memcpy(p, a.m, sizeof(int) * 4); +} + /** * @brief Store lowest N (vector width) bytes into an unaligned address. */ ASTCENC_SIMD_INLINE void store_nbytes(vint4 a, uint8_t* p) { - int* pi = (int*)p; - *pi = a.m[0]; + std::memcpy(p, a.m, sizeof(uint8_t) * 4); } /** @@ -678,10 +707,10 @@ ASTCENC_SIMD_INLINE vint4 pack_low_bytes(vint4 a) */ ASTCENC_SIMD_INLINE vint4 select(vint4 a, vint4 b, vmask4 cond) { - return vint4((cond.m[0] & 0x80000000) ? b.m[0] : a.m[0], - (cond.m[1] & 0x80000000) ? b.m[1] : a.m[1], - (cond.m[2] & 0x80000000) ? b.m[2] : a.m[2], - (cond.m[3] & 0x80000000) ? b.m[3] : a.m[3]); + return vint4((cond.m[0] & static_cast(0x80000000)) ? b.m[0] : a.m[0], + (cond.m[1] & static_cast(0x80000000)) ? b.m[1] : a.m[1], + (cond.m[2] & static_cast(0x80000000)) ? b.m[2] : a.m[2], + (cond.m[3] & static_cast(0x80000000)) ? b.m[3] : a.m[3]); } // ============================================================================ @@ -892,10 +921,10 @@ ASTCENC_SIMD_INLINE vfloat4 sqrt(vfloat4 a) */ ASTCENC_SIMD_INLINE vfloat4 select(vfloat4 a, vfloat4 b, vmask4 cond) { - return vfloat4((cond.m[0] & 0x80000000) ? b.m[0] : a.m[0], - (cond.m[1] & 0x80000000) ? b.m[1] : a.m[1], - (cond.m[2] & 0x80000000) ? b.m[2] : a.m[2], - (cond.m[3] & 0x80000000) ? b.m[3] : a.m[3]); + return vfloat4((cond.m[0] & static_cast(0x80000000)) ? b.m[0] : a.m[0], + (cond.m[1] & static_cast(0x80000000)) ? b.m[1] : a.m[1], + (cond.m[2] & static_cast(0x80000000)) ? b.m[2] : a.m[2], + (cond.m[3] & static_cast(0x80000000)) ? b.m[3] : a.m[3]); } /** @@ -903,10 +932,10 @@ ASTCENC_SIMD_INLINE vfloat4 select(vfloat4 a, vfloat4 b, vmask4 cond) */ ASTCENC_SIMD_INLINE vfloat4 select_msb(vfloat4 a, vfloat4 b, vmask4 cond) { - return vfloat4((cond.m[0] & 0x80000000) ? b.m[0] : a.m[0], - (cond.m[1] & 0x80000000) ? b.m[1] : a.m[1], - (cond.m[2] & 0x80000000) ? b.m[2] : a.m[2], - (cond.m[3] & 0x80000000) ? b.m[3] : a.m[3]); + return vfloat4((cond.m[0] & static_cast(0x80000000)) ? b.m[0] : a.m[0], + (cond.m[1] & static_cast(0x80000000)) ? b.m[1] : a.m[1], + (cond.m[2] & static_cast(0x80000000)) ? b.m[2] : a.m[2], + (cond.m[3] & static_cast(0x80000000)) ? b.m[3] : a.m[3]); } /** @@ -947,10 +976,10 @@ ASTCENC_SIMD_INLINE void storea(vfloat4 a, float* ptr) */ ASTCENC_SIMD_INLINE vint4 float_to_int(vfloat4 a) { - return vint4((int)a.m[0], - (int)a.m[1], - (int)a.m[2], - (int)a.m[3]); + return vint4(static_cast(a.m[0]), + static_cast(a.m[1]), + static_cast(a.m[2]), + static_cast(a.m[3])); } /**f @@ -958,10 +987,11 @@ ASTCENC_SIMD_INLINE vint4 float_to_int(vfloat4 a) */ ASTCENC_SIMD_INLINE vint4 float_to_int_rtn(vfloat4 a) { - return vint4((int)(a.m[0] + 0.5f), - (int)(a.m[1] + 0.5f), - (int)(a.m[2] + 0.5f), - (int)(a.m[3] + 0.5f)); + a = a + vfloat4(0.5f); + return vint4(static_cast(a.m[0]), + static_cast(a.m[1]), + static_cast(a.m[2]), + static_cast(a.m[3])); } /** @@ -969,10 +999,10 @@ ASTCENC_SIMD_INLINE vint4 float_to_int_rtn(vfloat4 a) */ ASTCENC_SIMD_INLINE vfloat4 int_to_float(vint4 a) { - return vfloat4((float)a.m[0], - (float)a.m[1], - (float)a.m[2], - (float)a.m[3]); + return vfloat4(static_cast(a.m[0]), + static_cast(a.m[1]), + static_cast(a.m[2]), + static_cast(a.m[3])); } /** @@ -1001,10 +1031,10 @@ static inline uint16_t float_to_float16(float a) ASTCENC_SIMD_INLINE vfloat4 float16_to_float(vint4 a) { return vfloat4( - sf16_to_float(a.lane<0>()), - sf16_to_float(a.lane<1>()), - sf16_to_float(a.lane<2>()), - sf16_to_float(a.lane<3>())); + sf16_to_float(static_cast(a.lane<0>())), + sf16_to_float(static_cast(a.lane<1>())), + sf16_to_float(static_cast(a.lane<2>())), + sf16_to_float(static_cast(a.lane<3>()))); } /** @@ -1025,7 +1055,7 @@ ASTCENC_SIMD_INLINE float float16_to_float(uint16_t a) ASTCENC_SIMD_INLINE vint4 float_as_int(vfloat4 a) { vint4 r; - memcpy(r.m, a.m, 4 * 4); + std::memcpy(r.m, a.m, 4 * 4); return r; } @@ -1039,8 +1069,138 @@ ASTCENC_SIMD_INLINE vint4 float_as_int(vfloat4 a) ASTCENC_SIMD_INLINE vfloat4 int_as_float(vint4 a) { vfloat4 r; - memcpy(r.m, a.m, 4 * 4); + std::memcpy(r.m, a.m, 4 * 4); return r; } +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4& t0p) +{ + t0p = t0; +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4 t1, vint4& t0p, vint4& t1p) +{ + t0p = t0; + t1p = t1; +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare( + vint4 t0, vint4 t1, vint4 t2, vint4 t3, + vint4& t0p, vint4& t1p, vint4& t2p, vint4& t3p) +{ + t0p = t0; + t1p = t1; + t2p = t2; + t3p = t3; +} + +/** + * @brief Perform an 8-bit 16-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 idx) +{ + uint8_t table[16]; + + std::memcpy(table + 0, t0.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +} + + +/** + * @brief Perform an 8-bit 32-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 idx) +{ + uint8_t table[32]; + + std::memcpy(table + 0, t0.m, 4 * sizeof(int)); + std::memcpy(table + 16, t1.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +} + +/** + * @brief Perform an 8-bit 64-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 t2, vint4 t3, vint4 idx) +{ + uint8_t table[64]; + + std::memcpy(table + 0, t0.m, 4 * sizeof(int)); + std::memcpy(table + 16, t1.m, 4 * sizeof(int)); + std::memcpy(table + 32, t2.m, 4 * sizeof(int)); + std::memcpy(table + 48, t3.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +} + +/** + * @brief Return a vector of interleaved RGBA data. + * + * Input vectors have the value stored in the bottom 8 bits of each lane, + * with high bits set to zero. + * + * Output vector stores a single RGBA texel packed in each lane. + */ +ASTCENC_SIMD_INLINE vint4 interleave_rgba8(vint4 r, vint4 g, vint4 b, vint4 a) +{ + return r + lsl<8>(g) + lsl<16>(b) + lsl<24>(a); +} + +/** + * @brief Store a single vector lane to an unaligned address. + */ +ASTCENC_SIMD_INLINE void store_lane(uint8_t* base, int data) +{ + std::memcpy(base, &data, sizeof(int)); +} + +/** + * @brief Store a vector, skipping masked lanes. + * + * All masked lanes must be at the end of vector, after all non-masked lanes. + * Input is a byte array of at least 4 bytes per unmasked entry. + */ +ASTCENC_SIMD_INLINE void store_lanes_masked(uint8_t* base, vint4 data, vmask4 mask) +{ + if (mask.m[3]) + { + store(data, base); + } + else if (mask.m[2]) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + store_lane(base + 8, data.lane<2>()); + } + else if (mask.m[1]) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + } + else if (mask.m[0]) + { + store_lane(base + 0, data.lane<0>()); + } +} + #endif // #ifndef ASTC_VECMATHLIB_NONE_4_H_INCLUDED diff --git a/Source/astcenc_vecmathlib_sse_4.h b/Source/astcenc_vecmathlib_sse_4.h index 868522dc2b7abb64ae057658c402859a6f683cd5..b69655f9041adc1e8aa582d8a3054d65cef1eef1 100644 --- a/Source/astcenc_vecmathlib_sse_4.h +++ b/Source/astcenc_vecmathlib_sse_4.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2021 Arm Limited +// Copyright 2019-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -39,6 +39,7 @@ #endif #include +#include // ============================================================================ // vfloat4 data type @@ -292,6 +293,18 @@ struct vint4 return vint4(*p); } + /** + * @brief Factory that returns a vector loaded from unaligned memory. + */ + static ASTCENC_SIMD_INLINE vint4 load(const uint8_t* p) + { +#if ASTCENC_SSE >= 41 + return vint4(_mm_lddqu_si128(reinterpret_cast(p))); +#else + return vint4(_mm_loadu_si128(reinterpret_cast(p))); +#endif + } + /** * @brief Factory that returns a vector loaded from 16B aligned memory. */ @@ -363,6 +376,14 @@ struct vmask4 m = _mm_castsi128_ps(mask.m); } + /** + * @brief Get the scalar value of a single lane. + */ + template ASTCENC_SIMD_INLINE bool lane() const + { + return _mm_cvtss_f32(_mm_shuffle_ps(m, m, l)) != 0.0f; + } + /** * @brief The vector ... */ @@ -412,7 +433,7 @@ ASTCENC_SIMD_INLINE vmask4 operator~(vmask4 a) */ ASTCENC_SIMD_INLINE unsigned int mask(vmask4 a) { - return _mm_movemask_ps(a.m); + return static_cast(_mm_movemask_ps(a.m)); } // ============================================================================ @@ -625,6 +646,14 @@ ASTCENC_SIMD_INLINE void store(vint4 a, int* p) _mm_storeu_ps(reinterpret_cast(p), _mm_castsi128_ps(a.m)); } +/** + * @brief Store a vector to an unaligned memory address. + */ +ASTCENC_SIMD_INLINE void store(vint4 a, uint8_t* p) +{ + std::memcpy(p, &a.m, sizeof(int) * 4); +} + /** * @brief Store lowest N (vector width) bytes into an unaligned address. */ @@ -801,7 +830,7 @@ ASTCENC_SIMD_INLINE vfloat4 round(vfloat4 a) return vfloat4(_mm_round_ps(a.m, flags)); #else __m128 v = a.m; - __m128 neg_zero = _mm_castsi128_ps(_mm_set1_epi32(0x80000000)); + __m128 neg_zero = _mm_castsi128_ps(_mm_set1_epi32(static_cast(0x80000000))); __m128 no_fraction = _mm_set1_ps(8388608.0f); __m128 abs_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7FFFFFFF)); __m128 sign = _mm_and_ps(v, neg_zero); @@ -926,7 +955,7 @@ ASTCENC_SIMD_INLINE vint4 float_to_int(vfloat4 a) */ ASTCENC_SIMD_INLINE vint4 float_to_int_rtn(vfloat4 a) { - a = round(a); + a = a + vfloat4(0.5f); return vint4(_mm_cvttps_epi32(a.m)); } @@ -980,10 +1009,10 @@ ASTCENC_SIMD_INLINE vfloat4 float16_to_float(vint4 a) return vfloat4(f32); #else return vfloat4( - sf16_to_float(a.lane<0>()), - sf16_to_float(a.lane<1>()), - sf16_to_float(a.lane<2>()), - sf16_to_float(a.lane<3>())); + sf16_to_float(static_cast(a.lane<0>())), + sf16_to_float(static_cast(a.lane<1>())), + sf16_to_float(static_cast(a.lane<2>())), + sf16_to_float(static_cast(a.lane<3>()))); #endif } @@ -993,7 +1022,7 @@ ASTCENC_SIMD_INLINE vfloat4 float16_to_float(vint4 a) ASTCENC_SIMD_INLINE float float16_to_float(uint16_t a) { #if ASTCENC_F16C >= 1 - __m128i packed = _mm_set1_epi16(a); + __m128i packed = _mm_set1_epi16(static_cast(a)); __m128 f32 = _mm_cvtph_ps(packed); return _mm_cvtss_f32(f32); #else @@ -1025,6 +1054,208 @@ ASTCENC_SIMD_INLINE vfloat4 int_as_float(vint4 v) return vfloat4(_mm_castsi128_ps(v.m)); } +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4& t0p) +{ + t0p = t0; +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare(vint4 t0, vint4 t1, vint4& t0p, vint4& t1p) +{ +#if ASTCENC_SSE >= 41 + t0p = t0; + t1p = t0 ^ t1; +#else + t0p = t0; + t1p = t1; +#endif +} + +/** + * @brief Prepare a vtable lookup table for use with the native SIMD size. + */ +ASTCENC_SIMD_INLINE void vtable_prepare( + vint4 t0, vint4 t1, vint4 t2, vint4 t3, + vint4& t0p, vint4& t1p, vint4& t2p, vint4& t3p) +{ +#if ASTCENC_SSE >= 41 + t0p = t0; + t1p = t0 ^ t1; + t2p = t1 ^ t2; + t3p = t2 ^ t3; +#else + t0p = t0; + t1p = t1; + t2p = t2; + t3p = t3; +#endif +} + +/** + * @brief Perform an 8-bit 16-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 idx) +{ +#if ASTCENC_SSE >= 41 + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m128i idxx = _mm_or_si128(idx.m, _mm_set1_epi32(static_cast(0xFFFFFF00))); + + __m128i result = _mm_shuffle_epi8(t0.m, idxx); + return vint4(result); +#else + uint8_t table[16]; + + std::memcpy(table + 0, &t0.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +#endif +} + +/** + * @brief Perform an 8-bit 32-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 idx) +{ +#if ASTCENC_SSE >= 41 + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m128i idxx = _mm_or_si128(idx.m, _mm_set1_epi32(static_cast(0xFFFFFF00))); + + __m128i result = _mm_shuffle_epi8(t0.m, idxx); + idxx = _mm_sub_epi8(idxx, _mm_set1_epi8(16)); + + __m128i result2 = _mm_shuffle_epi8(t1.m, idxx); + result = _mm_xor_si128(result, result2); + + return vint4(result); +#else + uint8_t table[32]; + + std::memcpy(table + 0, &t0.m, 4 * sizeof(int)); + std::memcpy(table + 16, &t1.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +#endif +} + +/** + * @brief Perform an 8-bit 64-entry table lookup, with 32-bit indexes. + */ +ASTCENC_SIMD_INLINE vint4 vtable_8bt_32bi(vint4 t0, vint4 t1, vint4 t2, vint4 t3, vint4 idx) +{ +#if ASTCENC_SSE >= 41 + // Set index byte MSB to 1 for unused bytes so shuffle returns zero + __m128i idxx = _mm_or_si128(idx.m, _mm_set1_epi32(static_cast(0xFFFFFF00))); + + __m128i result = _mm_shuffle_epi8(t0.m, idxx); + idxx = _mm_sub_epi8(idxx, _mm_set1_epi8(16)); + + __m128i result2 = _mm_shuffle_epi8(t1.m, idxx); + result = _mm_xor_si128(result, result2); + idxx = _mm_sub_epi8(idxx, _mm_set1_epi8(16)); + + result2 = _mm_shuffle_epi8(t2.m, idxx); + result = _mm_xor_si128(result, result2); + idxx = _mm_sub_epi8(idxx, _mm_set1_epi8(16)); + + result2 = _mm_shuffle_epi8(t3.m, idxx); + result = _mm_xor_si128(result, result2); + + return vint4(result); +#else + uint8_t table[64]; + + std::memcpy(table + 0, &t0.m, 4 * sizeof(int)); + std::memcpy(table + 16, &t1.m, 4 * sizeof(int)); + std::memcpy(table + 32, &t2.m, 4 * sizeof(int)); + std::memcpy(table + 48, &t3.m, 4 * sizeof(int)); + + return vint4(table[idx.lane<0>()], + table[idx.lane<1>()], + table[idx.lane<2>()], + table[idx.lane<3>()]); +#endif +} + +/** + * @brief Return a vector of interleaved RGBA data. + * + * Input vectors have the value stored in the bottom 8 bits of each lane, + * with high bits set to zero. + * + * Output vector stores a single RGBA texel packed in each lane. + */ +ASTCENC_SIMD_INLINE vint4 interleave_rgba8(vint4 r, vint4 g, vint4 b, vint4 a) +{ +// Workaround an XCode compiler internal fault; note is slower than slli_epi32 +// so we should revert this when we get the opportunity +#if defined(__APPLE__) + __m128i value = r.m; + value = _mm_add_epi32(value, _mm_bslli_si128(g.m, 1)); + value = _mm_add_epi32(value, _mm_bslli_si128(b.m, 2)); + value = _mm_add_epi32(value, _mm_bslli_si128(a.m, 3)); + return vint4(value); +#else + __m128i value = r.m; + value = _mm_add_epi32(value, _mm_slli_epi32(g.m, 8)); + value = _mm_add_epi32(value, _mm_slli_epi32(b.m, 16)); + value = _mm_add_epi32(value, _mm_slli_epi32(a.m, 24)); + return vint4(value); +#endif +} + +/** + * @brief Store a single vector lane to an unaligned address. + */ +ASTCENC_SIMD_INLINE void store_lane(uint8_t* base, int data) +{ + std::memcpy(base, &data, sizeof(int)); +} + +/** + * @brief Store a vector, skipping masked lanes. + * + * All masked lanes must be at the end of vector, after all non-masked lanes. + */ +ASTCENC_SIMD_INLINE void store_lanes_masked(uint8_t* base, vint4 data, vmask4 mask) +{ +#if ASTCENC_AVX >= 2 + _mm_maskstore_epi32(reinterpret_cast(base), _mm_castps_si128(mask.m), data.m); +#else + // Note - we cannot use _mm_maskmoveu_si128 as the underlying hardware doesn't guarantee + // fault suppression on masked lanes so we can get page faults at the end of an image. + if (mask.lane<3>() != 0.0f) + { + store(data, base); + } + else if (mask.lane<2>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + store_lane(base + 8, data.lane<2>()); + } + else if (mask.lane<1>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + store_lane(base + 4, data.lane<1>()); + } + else if (mask.lane<0>() != 0.0f) + { + store_lane(base + 0, data.lane<0>()); + } +#endif +} + #if defined(ASTCENC_NO_INVARIANCE) && (ASTCENC_SSE >= 41) #define ASTCENC_USE_NATIVE_DOT_PRODUCT 1 diff --git a/Source/astcenc_weight_align.cpp b/Source/astcenc_weight_align.cpp index 96eb6ae6650fed1f62ad439fcd2225e41ef58529..4e993e7397a192601aac9f7042d2ef105aeee3de 100644 --- a/Source/astcenc_weight_align.cpp +++ b/Source/astcenc_weight_align.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -44,26 +44,24 @@ #include #include - -static constexpr unsigned int ANGULAR_STEPS { 40 }; - -// Store a reduced sin/cos table for 64 possible weight values; this causes slight quality loss -// compared to using sin() and cos() directly. Must be 2^N. -static constexpr unsigned int SINCOS_STEPS { 64 }; +static constexpr unsigned int ANGULAR_STEPS { 32 }; static_assert((ANGULAR_STEPS % ASTCENC_SIMD_WIDTH) == 0, "ANGULAR_STEPS must be multiple of ASTCENC_SIMD_WIDTH"); -static uint8_t max_angular_steps_needed_for_quant_level[13]; +static_assert(ANGULAR_STEPS >= 32, + "ANGULAR_STEPS must be at least max(steps_for_quant_level)"); + +// Store a reduced sin/cos table for 64 possible weight values; this causes +// slight quality loss compared to using sin() and cos() directly. Must be 2^N. +static constexpr unsigned int SINCOS_STEPS { 64 }; -// The next-to-last entry is supposed to have the value 33. This because the 32-weight mode leaves a -// double-sized hole in the middle of the weight space, so we are better off matching 33 weights. -static const uint8_t quantization_steps_for_level[13] { - 2, 3, 4, 5, 6, 8, 10, 12, 16, 20, 24, 33, 36 +static const uint8_t steps_for_quant_level[12] { + 2, 3, 4, 5, 6, 8, 10, 12, 16, 20, 24, 32 }; -alignas(ASTCENC_VECALIGN) static float sin_table[SINCOS_STEPS][ANGULAR_STEPS]; -alignas(ASTCENC_VECALIGN) static float cos_table[SINCOS_STEPS][ANGULAR_STEPS]; +ASTCENC_ALIGNAS static float sin_table[SINCOS_STEPS][ANGULAR_STEPS]; +ASTCENC_ALIGNAS static float cos_table[SINCOS_STEPS][ANGULAR_STEPS]; #if defined(ASTCENC_DIAGNOSTICS) static bool print_once { true }; @@ -72,7 +70,6 @@ alignas(ASTCENC_VECALIGN) static float cos_table[SINCOS_STEPS][ANGULAR_STEPS]; /* See header for documentation. */ void prepare_angular_tables() { - unsigned int max_angular_steps_needed_for_quant_steps[ANGULAR_STEPS + 1]; for (unsigned int i = 0; i < ANGULAR_STEPS; i++) { float angle_step = static_cast(i + 1); @@ -82,13 +79,6 @@ void prepare_angular_tables() sin_table[j][i] = static_cast(sinf((2.0f * astc::PI / (SINCOS_STEPS - 1.0f)) * angle_step * static_cast(j))); cos_table[j][i] = static_cast(cosf((2.0f * astc::PI / (SINCOS_STEPS - 1.0f)) * angle_step * static_cast(j))); } - - max_angular_steps_needed_for_quant_steps[i + 1] = astc::min(i + 1, ANGULAR_STEPS - 1); - } - - for (unsigned int i = 0; i < 13; i++) - { - max_angular_steps_needed_for_quant_level[i] = max_angular_steps_needed_for_quant_steps[quantization_steps_for_level[i]]; } } @@ -109,7 +99,7 @@ static void compute_angular_offsets( promise(weight_count > 0); promise(max_angular_steps > 0); - alignas(ASTCENC_VECALIGN) int isamplev[BLOCK_MAX_WEIGHTS]; + ASTCENC_ALIGNAS int isamplev[BLOCK_MAX_WEIGHTS]; // Precompute isample; arrays are always allocated 64 elements long for (unsigned int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH) @@ -165,7 +155,7 @@ static void compute_lowest_and_highest_weight( unsigned int max_angular_steps, unsigned int max_quant_steps, const float* offsets, - int* lowest_weight, + float* lowest_weight, int* weight_span, float* error, float* cut_low_weight_error, @@ -184,11 +174,11 @@ static void compute_lowest_and_highest_weight( vfloat errval = vfloat::zero(); vfloat cut_low_weight_err = vfloat::zero(); vfloat cut_high_weight_err = vfloat::zero(); - vfloat offset = loada(&offsets[sp]); + vfloat offset = loada(offsets + sp); - for (unsigned int j = 0; j < weight_count; ++j) + for (unsigned int j = 0; j < weight_count; j++) { - vfloat sval = load1(&dec_weight_ideal_value[j]) * rcp_stepsize - offset; + vfloat sval = load1(dec_weight_ideal_value + j) * rcp_stepsize - offset; vfloat svalrte = round(sval); vfloat diff = sval - svalrte; errval += diff * diff; @@ -218,16 +208,16 @@ static void compute_lowest_and_highest_weight( vint span = float_to_int(maxidx - minidx + vfloat(1)); span = min(span, vint(max_quant_steps + 3)); span = max(span, vint(2)); - storea(float_to_int(minidx), &lowest_weight[sp]); - storea(span, &weight_span[sp]); + storea(minidx, lowest_weight + sp); + storea(span, weight_span + sp); // The cut_(lowest/highest)_weight_error indicate the error that results from forcing // samples that should have had the weight value one step (up/down). vfloat ssize = 1.0f / rcp_stepsize; vfloat errscale = ssize * ssize; - storea(errval * errscale, &error[sp]); - storea(cut_low_weight_err * errscale, &cut_low_weight_error[sp]); - storea(cut_high_weight_err * errscale, &cut_high_weight_error[sp]); + storea(errval * errscale, error + sp); + storea(cut_low_weight_err * errscale, cut_low_weight_error + sp); + storea(cut_high_weight_err * errscale, cut_high_weight_error + sp); rcp_stepsize = rcp_stepsize + vfloat(ASTCENC_SIMD_WIDTH); } @@ -246,21 +236,22 @@ static void compute_angular_endpoints_for_quant_levels( unsigned int weight_count, const float* dec_weight_ideal_value, unsigned int max_quant_level, - float low_value[12], - float high_value[12] + float low_value[TUNE_MAX_ANGULAR_QUANT + 1], + float high_value[TUNE_MAX_ANGULAR_QUANT + 1] ) { - unsigned int max_quant_steps = quantization_steps_for_level[max_quant_level]; + unsigned int max_quant_steps = steps_for_quant_level[max_quant_level]; + unsigned int max_angular_steps = steps_for_quant_level[max_quant_level]; + + ASTCENC_ALIGNAS float angular_offsets[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) float angular_offsets[ANGULAR_STEPS]; - unsigned int max_angular_steps = max_angular_steps_needed_for_quant_level[max_quant_level]; compute_angular_offsets(weight_count, dec_weight_ideal_value, max_angular_steps, angular_offsets); - alignas(ASTCENC_VECALIGN) int32_t lowest_weight[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) int32_t weight_span[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) float error[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) float cut_low_weight_error[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) float cut_high_weight_error[ANGULAR_STEPS]; + ASTCENC_ALIGNAS float lowest_weight[ANGULAR_STEPS]; + ASTCENC_ALIGNAS int32_t weight_span[ANGULAR_STEPS]; + ASTCENC_ALIGNAS float error[ANGULAR_STEPS]; + ASTCENC_ALIGNAS float cut_low_weight_error[ANGULAR_STEPS]; + ASTCENC_ALIGNAS float cut_high_weight_error[ANGULAR_STEPS]; compute_lowest_and_highest_weight(weight_count, dec_weight_ideal_value, max_angular_steps, max_quant_steps, @@ -270,7 +261,7 @@ static void compute_angular_endpoints_for_quant_levels( // For each quantization level, find the best error terms. Use packed vectors so data-dependent // branches can become selects. This involves some integer to float casts, but the values are // small enough so they never round the wrong way. - vfloat4 best_results[40]; + vfloat4 best_results[36]; // Initialize the array to some safe defaults promise(max_quant_steps > 0); @@ -296,30 +287,30 @@ static void compute_angular_endpoints_for_quant_levels( // Check best error against record N vfloat4 best_result = best_results[idx_span]; vfloat4 new_result = vfloat4(error[i], i_flt, 0.0f, 0.0f); - vmask4 mask1(best_result.lane<0>() > error[i]); - best_results[idx_span] = select(best_result, new_result, mask1); + vmask4 mask = vfloat4(best_result.lane<0>()) > vfloat4(error[i]); + best_results[idx_span] = select(best_result, new_result, mask); // Check best error against record N-1 with either cut low or cut high best_result = best_results[idx_span - 1]; new_result = vfloat4(error_cut_low, i_flt, 1.0f, 0.0f); - vmask4 mask2(best_result.lane<0>() > error_cut_low); - best_result = select(best_result, new_result, mask2); + mask = vfloat4(best_result.lane<0>()) > vfloat4(error_cut_low); + best_result = select(best_result, new_result, mask); new_result = vfloat4(error_cut_high, i_flt, 0.0f, 0.0f); - vmask4 mask3(best_result.lane<0>() > error_cut_high); - best_results[idx_span - 1] = select(best_result, new_result, mask3); + mask = vfloat4(best_result.lane<0>()) > vfloat4(error_cut_high); + best_results[idx_span - 1] = select(best_result, new_result, mask); // Check best error against record N-2 with both cut low and high best_result = best_results[idx_span - 2]; new_result = vfloat4(error_cut_low_high, i_flt, 1.0f, 0.0f); - vmask4 mask4(best_result.lane<0>() > error_cut_low_high); - best_results[idx_span - 2] = select(best_result, new_result, mask4); + mask = vfloat4(best_result.lane<0>()) > vfloat4(error_cut_low_high); + best_results[idx_span - 2] = select(best_result, new_result, mask); } for (unsigned int i = 0; i <= max_quant_level; i++) { - unsigned int q = quantization_steps_for_level[i]; + unsigned int q = steps_for_quant_level[i]; int bsi = static_cast(best_results[q].lane<1>()); // Did we find anything? @@ -333,181 +324,28 @@ static void compute_angular_endpoints_for_quant_levels( bsi = astc::max(0, bsi); - float stepsize = 1.0f / (1.0f + static_cast(bsi)); - int lwi = lowest_weight[bsi] + static_cast(best_results[q].lane<2>()); - int hwi = lwi + q - 1; - - float offset = angular_offsets[bsi] * stepsize; - low_value[i] = offset + static_cast(lwi) * stepsize; - high_value[i] = offset + static_cast(hwi) * stepsize; - } -} + float lwi = lowest_weight[bsi] + best_results[q].lane<2>(); + float hwi = lwi + static_cast(q) - 1.0f; -/** - * @brief For a given step size compute the lowest and highest weight, variant for low weight count. - * - * Compute the lowest and highest weight that results from quantizing using the given stepsize and - * offset, and then compute the resulting error. The cut errors indicate the error that results from - * forcing samples that should have had one weight value one step up or down. - * - * @param weight_count The number of (decimated) weights. - * @param dec_weight_quant_uvalue The decimated and quantized weight values. - * @param max_angular_steps The maximum number of steps to be tested. - * @param max_quant_steps The maximum quantization level to be tested. - * @param offsets The angular offsets array. - * @param[out] lowest_weight Per angular step, the lowest weight. - * @param[out] weight_span Per angular step, the span between lowest and highest weight. - * @param[out] error Per angular step, the error. - */ -static void compute_lowest_and_highest_weight_lwc( - unsigned int weight_count, - const float* dec_weight_quant_uvalue, - unsigned int max_angular_steps, - unsigned int max_quant_steps, - const float* offsets, - int* lowest_weight, - int* weight_span, - float* error -) { - promise(weight_count > 0); - promise(max_angular_steps > 0); - - vfloat rcp_stepsize = vfloat::lane_id() + vfloat(1.0f); - - // Arrays are ANGULAR_STEPS long, so always safe to run full vectors - for (unsigned int sp = 0; sp < max_angular_steps; sp += ASTCENC_SIMD_WIDTH) - { - vfloat minidx(128.0f); - vfloat maxidx(-128.0f); - vfloat errval = vfloat::zero(); - vfloat offset = loada(&offsets[sp]); - - for (unsigned int j = 0; j < weight_count; ++j) - { - vfloat sval = load1(&dec_weight_quant_uvalue[j]) * rcp_stepsize - offset; - vfloat svalrte = round(sval); - vfloat diff = sval - svalrte; - errval += diff * diff; - - // Reset tracker on min hit - vmask mask = svalrte < minidx; - minidx = select(minidx, svalrte, mask); - - // Reset tracker on max hit - mask = svalrte > maxidx; - maxidx = select(maxidx, svalrte, mask); - } - - // Write out min weight and weight span; clamp span to a usable range - vint span = float_to_int(maxidx - minidx + vfloat(1.0f)); - span = min(span, vint(max_quant_steps + 3)); - span = max(span, vint(2)); - storea(float_to_int(minidx), &lowest_weight[sp]); - storea(span, &weight_span[sp]); - - // The cut_(lowest/highest)_weight_error indicate the error that results from forcing - // samples that should have had the weight value one step (up/down). - vfloat ssize = 1.0f / rcp_stepsize; - vfloat errscale = ssize * ssize; - storea(errval * errscale, &error[sp]); - - rcp_stepsize = rcp_stepsize + vfloat(ASTCENC_SIMD_WIDTH); - } -} - -/** - * @brief The main function for the angular algorithm, variant for low weight count. - * - * @param weight_count The number of (decimated) weights. - * @param dec_weight_ideal_value The ideal decimated unquantized weight values. - * @param max_quant_level The maximum quantization level to be tested. - * @param[out] low_value Per angular step, the lowest weight value. - * @param[out] high_value Per angular step, the highest weight value. - */ -static void compute_angular_endpoints_for_quant_levels_lwc( - unsigned int weight_count, - const float* dec_weight_ideal_value, - unsigned int max_quant_level, - float low_value[12], - float high_value[12] -) { - unsigned int max_quant_steps = quantization_steps_for_level[max_quant_level]; - unsigned int max_angular_steps = max_angular_steps_needed_for_quant_level[max_quant_level]; - - alignas(ASTCENC_VECALIGN) float angular_offsets[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) int32_t lowest_weight[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) int32_t weight_span[ANGULAR_STEPS]; - alignas(ASTCENC_VECALIGN) float error[ANGULAR_STEPS]; - - compute_angular_offsets(weight_count, dec_weight_ideal_value, - max_angular_steps, angular_offsets); - - - compute_lowest_and_highest_weight_lwc(weight_count, dec_weight_ideal_value, - max_angular_steps, max_quant_steps, - angular_offsets, lowest_weight, weight_span, error); - - // For each quantization level, find the best error terms. Use packed vectors so data-dependent - // branches can become selects. This involves some integer to float casts, but the values are - // small enough so they never round the wrong way. - vfloat4 best_results[ANGULAR_STEPS]; - - // Initialize the array to some safe defaults - promise(max_quant_steps > 0); - for (unsigned int i = 0; i < (max_quant_steps + 4); i++) - { - best_results[i] = vfloat4(ERROR_CALC_DEFAULT, -1.0f, 0.0f, 0.0f); - } - - promise(max_angular_steps > 0); - for (unsigned int i = 0; i < max_angular_steps; i++) - { - int idx_span = weight_span[i]; - - // Check best error against record N - vfloat4 current_best = best_results[idx_span]; - vfloat4 candidate = vfloat4(error[i], static_cast(i), 0.0f, 0.0f); - vmask4 mask(current_best.lane<0>() > error[i]); - best_results[idx_span] = select(current_best, candidate, mask); - } - - for (unsigned int i = 0; i <= max_quant_level; i++) - { - unsigned int q = quantization_steps_for_level[i]; - int bsi = static_cast(best_results[q].lane<1>()); - - // Did we find anything? -#if defined(ASTCENC_DIAGNOSTICS) - if ((bsi < 0) && print_once) - { - print_once = false; - printf("INFO: Unable to find low weight encoding within search error limit.\n\n"); - } -#endif - - bsi = astc::max(0, bsi); - - int lwi = lowest_weight[bsi]; - int hwi = lwi + q - 1; - - low_value[i] = (angular_offsets[bsi] + static_cast(lwi)) / (1.0f + static_cast(bsi)); - high_value[i] = (angular_offsets[bsi] + static_cast(hwi)) / (1.0f + static_cast(bsi)); + float stepsize = 1.0f / (1.0f + static_cast(bsi)); + low_value[i] = (angular_offsets[bsi] + lwi) * stepsize; + high_value[i] = (angular_offsets[bsi] + hwi) * stepsize; } } /* See header for documentation. */ void compute_angular_endpoints_1plane( - unsigned int tune_low_weight_limit, bool only_always, const block_size_descriptor& bsd, const float* dec_weight_ideal_value, + unsigned int max_weight_quant, compression_working_buffers& tmpbuf ) { float (&low_value)[WEIGHTS_MAX_BLOCK_MODES] = tmpbuf.weight_low_value1; float (&high_value)[WEIGHTS_MAX_BLOCK_MODES] = tmpbuf.weight_high_value1; - float (&low_values)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_low_values1; - float (&high_values)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_high_values1; + float (&low_values)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_low_values1; + float (&high_values)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_high_values1; unsigned int max_decimation_modes = only_always ? bsd.decimation_mode_count_always : bsd.decimation_mode_count_selected; @@ -515,33 +353,34 @@ void compute_angular_endpoints_1plane( for (unsigned int i = 0; i < max_decimation_modes; i++) { const decimation_mode& dm = bsd.decimation_modes[i]; - if (!dm.ref_1_plane) + if (!dm.is_ref_1plane(static_cast(max_weight_quant))) { continue; } unsigned int weight_count = bsd.get_decimation_info(i).weight_count; - if (weight_count < tune_low_weight_limit) + unsigned int max_precision = dm.maxprec_1plane; + if (max_precision > TUNE_MAX_ANGULAR_QUANT) { - compute_angular_endpoints_for_quant_levels_lwc( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, - dm.maxprec_1plane, low_values[i], high_values[i]); + max_precision = TUNE_MAX_ANGULAR_QUANT; } - else + + if (max_precision > max_weight_quant) { - compute_angular_endpoints_for_quant_levels( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, - dm.maxprec_1plane, low_values[i], high_values[i]); + max_precision = max_weight_quant; } + + compute_angular_endpoints_for_quant_levels( + weight_count, + dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, + max_precision, low_values[i], high_values[i]); } unsigned int max_block_modes = only_always ? bsd.block_mode_count_1plane_always : bsd.block_mode_count_1plane_selected; promise(max_block_modes > 0); - for (unsigned int i = 0; i < max_block_modes; ++i) + for (unsigned int i = 0; i < max_block_modes; i++) { const block_mode& bm = bsd.block_modes[i]; assert(!bm.is_dual_plane); @@ -549,16 +388,24 @@ void compute_angular_endpoints_1plane( unsigned int quant_mode = bm.quant_mode; unsigned int decim_mode = bm.decimation_mode; - low_value[i] = low_values[decim_mode][quant_mode]; - high_value[i] = high_values[decim_mode][quant_mode]; + if (quant_mode <= TUNE_MAX_ANGULAR_QUANT) + { + low_value[i] = low_values[decim_mode][quant_mode]; + high_value[i] = high_values[decim_mode][quant_mode]; + } + else + { + low_value[i] = 0.0f; + high_value[i] = 1.0f; + } } } /* See header for documentation. */ void compute_angular_endpoints_2planes( - unsigned int tune_low_weight_limit, const block_size_descriptor& bsd, const float* dec_weight_ideal_value, + unsigned int max_weight_quant, compression_working_buffers& tmpbuf ) { float (&low_value1)[WEIGHTS_MAX_BLOCK_MODES] = tmpbuf.weight_low_value1; @@ -566,46 +413,42 @@ void compute_angular_endpoints_2planes( float (&low_value2)[WEIGHTS_MAX_BLOCK_MODES] = tmpbuf.weight_low_value2; float (&high_value2)[WEIGHTS_MAX_BLOCK_MODES] = tmpbuf.weight_high_value2; - float (&low_values1)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_low_values1; - float (&high_values1)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_high_values1; - float (&low_values2)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_low_values2; - float (&high_values2)[WEIGHTS_MAX_DECIMATION_MODES][12] = tmpbuf.weight_high_values2; + float (&low_values1)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_low_values1; + float (&high_values1)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_high_values1; + float (&low_values2)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_low_values2; + float (&high_values2)[WEIGHTS_MAX_DECIMATION_MODES][TUNE_MAX_ANGULAR_QUANT + 1] = tmpbuf.weight_high_values2; promise(bsd.decimation_mode_count_selected > 0); for (unsigned int i = 0; i < bsd.decimation_mode_count_selected; i++) { const decimation_mode& dm = bsd.decimation_modes[i]; - if (!dm.ref_2_planes) + if (!dm.is_ref_2plane(static_cast(max_weight_quant))) { continue; } unsigned int weight_count = bsd.get_decimation_info(i).weight_count; - if (weight_count < tune_low_weight_limit) + unsigned int max_precision = dm.maxprec_2planes; + if (max_precision > TUNE_MAX_ANGULAR_QUANT) { - compute_angular_endpoints_for_quant_levels_lwc( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, - dm.maxprec_2planes, low_values1[i], high_values1[i]); - - compute_angular_endpoints_for_quant_levels_lwc( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS + WEIGHTS_PLANE2_OFFSET, - dm.maxprec_2planes, low_values2[i], high_values2[i]); + max_precision = TUNE_MAX_ANGULAR_QUANT; } - else + + if (max_precision > max_weight_quant) { - compute_angular_endpoints_for_quant_levels( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, - dm.maxprec_2planes, low_values1[i], high_values1[i]); - - compute_angular_endpoints_for_quant_levels( - weight_count, - dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS + WEIGHTS_PLANE2_OFFSET, - dm.maxprec_2planes, low_values2[i], high_values2[i]); + max_precision = max_weight_quant; } + + compute_angular_endpoints_for_quant_levels( + weight_count, + dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS, + max_precision, low_values1[i], high_values1[i]); + + compute_angular_endpoints_for_quant_levels( + weight_count, + dec_weight_ideal_value + i * BLOCK_MAX_WEIGHTS + WEIGHTS_PLANE2_OFFSET, + max_precision, low_values2[i], high_values2[i]); } unsigned int start = bsd.block_mode_count_1plane_selected; @@ -616,10 +459,20 @@ void compute_angular_endpoints_2planes( unsigned int quant_mode = bm.quant_mode; unsigned int decim_mode = bm.decimation_mode; - low_value1[i] = low_values1[decim_mode][quant_mode]; - high_value1[i] = high_values1[decim_mode][quant_mode]; - low_value2[i] = low_values2[decim_mode][quant_mode]; - high_value2[i] = high_values2[decim_mode][quant_mode]; + if (quant_mode <= TUNE_MAX_ANGULAR_QUANT) + { + low_value1[i] = low_values1[decim_mode][quant_mode]; + high_value1[i] = high_values1[decim_mode][quant_mode]; + low_value2[i] = low_values2[decim_mode][quant_mode]; + high_value2[i] = high_values2[decim_mode][quant_mode]; + } + else + { + low_value1[i] = 0.0f; + high_value1[i] = 1.0f; + low_value2[i] = 0.0f; + high_value2[i] = 1.0f; + } } } diff --git a/Source/astcenc_weight_quant_xfer_tables.cpp b/Source/astcenc_weight_quant_xfer_tables.cpp index 9501f787d2c60bc3ab0665e4ff4c9d0cb82860cc..8fdf73adc23ebb30432981552cffb6b8b59f5157 100644 --- a/Source/astcenc_weight_quant_xfer_tables.cpp +++ b/Source/astcenc_weight_quant_xfer_tables.cpp @@ -23,145 +23,125 @@ #define _ 0 // Using _ to indicate an entry that will not be used. -const quantization_and_transfer_table quant_and_xfer_tables[12] { - // Quantization method 0, range 0..1 +const quant_and_transfer_table quant_and_xfer_tables[12] { + // QUANT2, range 0..1 { - QUANT_2, - {0, 64, 255}, + {0, 64}, {0, 1}, {0, 64}, - {0x01004000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, + {0x4000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, - 0x01004000} + 0x4000} }, - // Quantization method 1, range 0..2 + // QUANT_3, range 0..2 { - QUANT_3, - {0, 32, 64, 255}, + {0, 32, 64}, {0, 1, 2}, {0, 32, 64}, - {0x01002000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, - _,_,0x02004000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, - _,_,_,_,0x02014020} + {0x2000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, + _,_,0x4000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_, + _,_,_,_,0x4020} }, - // Quantization method 2, range 0..3 + // QUANT_4, range 0..3 { - QUANT_4, - {0, 21, 43, 64, 255}, + {0, 21, 43, 64}, {0, 1, 2, 3}, {0, 21, 43, 64}, - {0x01001500,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x02002b00,_,_,_,_, - _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x03014015,_,_,_,_,_,_,_,_,_,_,_,_, - _,_,_,_,_,_,_,_,0x0302402b} + {0x1500,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x2b00,_,_,_,_, + _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x4015,_,_,_,_,_,_,_,_,_,_,_,_, + _,_,_,_,_,_,_,_,0x402b} }, - // Quantization method 3, range 0..4 + //QUANT_5, range 0..4 { - QUANT_5, - {0, 16, 32, 48, 64, 255}, + {0, 16, 32, 48, 64}, {0, 1, 2, 3, 4}, {0, 16, 32, 48, 64}, - {0x01001000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x02002000,_,_,_,_,_,_,_,_,_, - _,_,_,_,_,_,0x03013010,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x04024020,_,_,_, - _,_,_,_,_,_,_,_,_,_,_,_,0x04034030} + {0x1000,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x2000,_,_,_,_,_,_,_,_,_, + _,_,_,_,_,_,0x3010,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,0x4020,_,_,_, + _,_,_,_,_,_,_,_,_,_,_,_,0x4030} }, - // Quantization method 4, range 0..5 + // QUANT_6, range 0..5 { - QUANT_6, - {0, 12, 25, 39, 52, 64, 255}, + {0, 12, 25, 39, 52, 64}, {0, 2, 4, 5, 3, 1}, {0, 64, 12, 52, 25, 39}, - {0x02000c00,_,_,_,_,_,_,_,_,_,_,_,0x04001900,_,_,_,_,_,_,_,_,_,_,_,_, - 0x0502270c,_,_,_,_,_,_,_,_,_,_,_,_,_,0x03043419,_,_,_,_,_,_,_,_,_,_, - _,_,0x01054027,_,_,_,_,_,_,_,_,_,_,_,0x01034034} + {0x0c00,_,_,_,_,_,_,_,_,_,_,_,0x1900,_,_,_,_,_,_,_,_,_,_,_,_, + 0x270c,_,_,_,_,_,_,_,_,_,_,_,_,_,0x3419,_,_,_,_,_,_,_,_,_,_, + _,_,0x4027,_,_,_,_,_,_,_,_,_,_,_,0x4034} }, - // Quantization method 5, range 0..7 + // QUANT_8, range 0..7 { - QUANT_8, - {0, 9, 18, 27, 37, 46, 55, 64, 255}, + {0, 9, 18, 27, 37, 46, 55, 64}, {0, 1, 2, 3, 4, 5, 6, 7}, {0, 9, 18, 27, 37, 46, 55, 64}, - {0x01000900,_,_,_,_,_,_,_,_,0x02001200,_,_,_,_,_,_,_,_,0x03011b09,_,_, - _,_,_,_,_,_,0x04022512,_,_,_,_,_,_,_,_,_,0x05032e1b,_,_,_,_,_,_,_,_, - 0x06043725,_,_,_,_,_,_,_,_,0x0705402e,_,_,_,_,_,_,_,_,0x07064037} + {0x0900,_,_,_,_,_,_,_,_,0x1200,_,_,_,_,_,_,_,_,0x1b09,_,_, + _,_,_,_,_,_,0x2512,_,_,_,_,_,_,_,_,_,0x2e1b,_,_,_,_,_,_,_,_, + 0x3725,_,_,_,_,_,_,_,_,0x402e,_,_,_,_,_,_,_,_,0x4037} }, - // Quantization method 6, range 0..9 + // QUANT_10, range 0..9 { - QUANT_10, - {0, 7, 14, 21, 28, 36, 43, 50, 57, 64, 255}, + {0, 7, 14, 21, 28, 36, 43, 50, 57, 64}, {0, 2, 4, 6, 8, 9, 7, 5, 3, 1}, {0, 64, 7, 57, 14, 50, 21, 43, 28, 36}, - {0x02000700,_,_,_,_,_,_,0x04000e00,_,_,_,_,_,_,0x06021507,_,_,_,_,_,_, - 0x08041c0e,_,_,_,_,_,_,0x09062415,_,_,_,_,_,_,_,0x07082b1c,_,_,_,_,_, - _,0x05093224,_,_,_,_,_,_,0x0307392b,_,_,_,_,_,_,0x01054032,_,_,_,_,_, - _,0x01034039} + {0x0700,_,_,_,_,_,_,0x0e00,_,_,_,_,_,_,0x1507,_,_,_,_,_,_, + 0x1c0e,_,_,_,_,_,_,0x2415,_,_,_,_,_,_,_,0x2b1c,_,_,_,_,_, + _,0x3224,_,_,_,_,_,_,0x392b,_,_,_,_,_,_,0x4032,_,_,_,_,_, + _,0x4039} }, - // Quantization method 7, range 0..11 + // QUANT_12, range 0..11 { - QUANT_12, - {0, 5, 11, 17, 23, 28, 36, 41, 47, 53, 59, 64, 255}, + {0, 5, 11, 17, 23, 28, 36, 41, 47, 53, 59, 64}, {0, 4, 8, 2, 6, 10, 11, 7, 3, 9, 5, 1}, {0, 64, 17, 47, 5, 59, 23, 41, 11, 53, 28, 36}, - {0x04000500,_,_,_,_,0x08000b00,_,_,_,_,_,0x02041105,_,_,_,_,_, - 0x0608170b,_,_,_,_,_,0x0a021c11,_,_,_,_,0x0b062417,_,_,_,_,_,_,_, - 0x070a291c,_,_,_,_,0x030b2f24,_,_,_,_,_,0x09073529,_,_,_,_,_, - 0x05033b2f,_,_,_,_,_,0x01094035,_,_,_,_,0x0105403b} + {0x0500,_,_,_,_,0x0b00,_,_,_,_,_,0x1105,_,_,_,_,_, + 0x170b,_,_,_,_,_,0x1c11,_,_,_,_,0x2417,_,_,_,_,_,_,_, + 0x291c,_,_,_,_,0x2f24,_,_,_,_,_,0x3529,_,_,_,_,_, + 0x3b2f,_,_,_,_,_,0x4035,_,_,_,_,0x403b} }, - // Quantization method 8, range 0..15 + // QUANT_16, range 0..15 { - QUANT_16, - {0, 4, 8, 12, 17, 21, 25, 29, 35, 39, 43, 47, 52, 56, 60, 64, 255}, + {0, 4, 8, 12, 17, 21, 25, 29, 35, 39, 43, 47, 52, 56, 60, 64}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {0, 4, 8, 12, 17, 21, 25, 29, 35, 39, 43, 47, 52, 56, 60, 64}, - {0x01000400,_,_,_,0x02000800,_,_,_,0x03010c04,_,_,_,0x04021108,_,_,_,_, - 0x0503150c,_,_,_,0x06041911,_,_,_,0x07051d15,_,_,_,0x08062319,_,_,_,_, - _,0x0907271d,_,_,_,0x0a082b23,_,_,_,0x0b092f27,_,_,_,0x0c0a342b,_,_,_, - _,0x0d0b382f,_,_,_,0x0e0c3c34,_,_,_,0x0f0d4038,_,_,_,0x0f0e403c} + {0x0400,_,_,_,0x0800,_,_,_,0x0c04,_,_,_,0x1108,_,_,_,_, + 0x150c,_,_,_,0x1911,_,_,_,0x1d15,_,_,_,0x2319,_,_,_,_, + _,0x271d,_,_,_,0x2b23,_,_,_,0x2f27,_,_,_,0x342b,_,_,_, + _,0x382f,_,_,_,0x3c34,_,_,_,0x4038,_,_,_,0x403c} }, - // Quantization method 9, range 0..19 + // QUANT_20, range 0..19 { - QUANT_20, - {0, 3, 6, 9, 13, 16, 19, 23, 26, 29, 35, 38, 41, 45, 48, 51, 55, 58, - 61, 64, 255}, + {0, 3, 6, 9, 13, 16, 19, 23, 26, 29, 35, 38, 41, 45, 48, 51, 55, 58, 61, 64}, {0, 4, 8, 12, 16, 2, 6, 10, 14, 18, 19, 15, 11, 7, 3, 17, 13, 9, 5, 1}, - {0, 64, 16, 48, 3, 61, 19, 45, 6, 58, 23, 41, 9, 55, 26, 38, 13, 51, - 29, 35}, - {0x04000300,_,_,0x08000600,_,_,0x0c040903,_,_,0x10080d06,_,_,_, - 0x020c1009,_,_,0x0610130d,_,_,0x0a021710,_,_,_,0x0e061a13,_,_, - 0x120a1d17,_,_,0x130e231a,_,_,_,_,_,0x0f12261d,_,_,0x0b132923,_,_, - 0x070f2d26,_,_,_,0x030b3029,_,_,0x1107332d,_,_,0x0d033730,_,_,_, - 0x09113a33,_,_,0x050d3d37,_,_,0x0109403a,_,_,0x0105403d} + {0, 64, 16, 48, 3, 61, 19, 45, 6, 58, 23, 41, 9, 55, 26, 38, 13, 51, 29, 35}, + {0x0300,_,_,0x0600,_,_,0x0903,_,_,0x0d06,_,_,_, + 0x1009,_,_,0x130d,_,_,0x1710,_,_,_,0x1a13,_,_, + 0x1d17,_,_,0x231a,_,_,_,_,_,0x261d,_,_,0x2923,_,_, + 0x2d26,_,_,_,0x3029,_,_,0x332d,_,_,0x3730,_,_,_, + 0x3a33,_,_,0x3d37,_,_,0x403a,_,_,0x403d} }, - // Quantization method 10, range 0..23 + // QUANT_24, range 0..23 { - QUANT_24, - {0, 2, 5, 8, 11, 13, 16, 19, 22, 24, 27, 30, 34, 37, 40, 42, 45, 48, - 51, 53, 56, 59, 62, 64, 255}, - {0, 8, 16, 2, 10, 18, 4, 12, 20, 6, 14, 22, 23, 15, 7, 21, 13, 5, 19, - 11, 3, 17, 9, 1}, - {0, 64, 8, 56, 16, 48, 24, 40, 2, 62, 11, 53, 19, 45, 27, 37, 5, 59, - 13, 51, 22, 42, 30, 34}, - {0x08000200,_,0x10000500,_,_,0x02080802,_,_,0x0a100b05,_,_,0x12020d08, - _,0x040a100b,_,_,0x0c12130d,_,_,0x14041610,_,_,0x060c1813,_, - 0x0e141b16,_,_,0x16061e18,_,_,0x170e221b,_,_,_,0x0f16251e,_,_, - 0x07172822,_,_,0x150f2a25,_,0x0d072d28,_,_,0x0515302a,_,_,0x130d332d, - _,_,0x0b053530,_,0x03133833,_,_,0x110b3b35,_,_,0x09033e38,_,_, - 0x0111403b,_,0x0109403e} + {0, 2, 5, 8, 11, 13, 16, 19, 22, 24, 27, 30, 34, 37, 40, 42, 45, 48, 51, 53, 56, 59, 62, 64}, + {0, 8, 16, 2, 10, 18, 4, 12, 20, 6, 14, 22, 23, 15, 7, 21, 13, 5, 19, 11, 3, 17, 9, 1}, + {0, 64, 8, 56, 16, 48, 24, 40, 2, 62, 11, 53, 19, 45, 27, 37, 5, 59, 13, 51, 22, 42, 30, 34}, + {0x0200,_,0x0500,_,_,0x0802,_,_,0x0b05,_,_,0x0d08, + _,0x100b,_,_,0x130d,_,_,0x1610,_,_,0x1813,_, + 0x1b16,_,_,0x1e18,_,_,0x221b,_,_,_,0x251e,_,_, + 0x2822,_,_,0x2a25,_,0x2d28,_,_,0x302a,_,_,0x332d, + _,_,0x3530,_,0x3833,_,_,0x3b35,_,_,0x3e38,_,_, + 0x403b,_,0x403e} }, - // Quantization method 11, range 0..31 + // QUANT_32, range 0..31 { - QUANT_32, - {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 34, 36, 38, - 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 255}, - {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}, - {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 34, 36, 38, - 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64}, - {0x01000200,_,0x02000400,_,0x03010602,_,0x04020804,_,0x05030a06,_, - 0x06040c08,_,0x07050e0a,_,0x0806100c,_,0x0907120e,_,0x0a081410,_, - 0x0b091612,_,0x0c0a1814,_,0x0d0b1a16,_,0x0e0c1c18,_,0x0f0d1e1a,_, - 0x100e221c,_,_,_,0x110f241e,_,0x12102622,_,0x13112824,_,0x14122a26,_, - 0x15132c28,_,0x16142e2a,_,0x1715302c,_,0x1816322e,_,0x19173430,_, - 0x1a183632,_,0x1b193834,_,0x1c1a3a36,_,0x1d1b3c38,_,0x1e1c3e3a,_, - 0x1f1d403c,_,0x1f1e403e} + {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64}, + {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}, + {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64}, + {0x0200,_,0x0400,_,0x0602,_,0x0804,_,0x0a06,_, + 0x0c08,_,0x0e0a,_,0x100c,_,0x120e,_,0x1410,_, + 0x1612,_,0x1814,_,0x1a16,_,0x1c18,_,0x1e1a,_, + 0x221c,_,_,_,0x241e,_,0x2622,_,0x2824,_,0x2a26,_, + 0x2c28,_,0x2e2a,_,0x302c,_,0x322e,_,0x3430,_, + 0x3632,_,0x3834,_,0x3a36,_,0x3c38,_,0x3e3a,_, + 0x403c,_,0x403e} } }; diff --git a/Source/astcenc_platform_isa_detection.cpp b/Source/astcenccli_entry.cpp similarity index 57% rename from Source/astcenc_platform_isa_detection.cpp rename to Source/astcenccli_entry.cpp index 4158da31bef084ab82853030f390f05d41664f6a..19aed00a1d73c1504782f336366a68e086eee85c 100644 --- a/Source/astcenc_platform_isa_detection.cpp +++ b/Source/astcenccli_entry.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2020-2021 Arm Limited +// Copyright 2020-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -18,14 +18,25 @@ /** * @brief Platform-specific function implementations. * - * This module contains functions for querying the host extended ISA support. + * This module contains the CLI entry point which also performs the role of + * validating the host extended ISA support meets the needs of the tools. */ -// Include before the defines below to pick up any auto-setup based on compiler -// built-in config, if not being set explicitly by the build system -#include "astcenc_internal.h" +#include -#if (ASTCENC_SSE > 0) || (ASTCENC_AVX > 0) || \ +/** + * @brief The main entry point. + * + * @param argc The number of arguments. + * @param argv The vector of arguments. + * + * @return 0 on success, non-zero otherwise. + */ +int astcenc_main( + int argc, + char **argv); + +#if (ASTCENC_SSE > 20) || (ASTCENC_AVX > 0) || \ (ASTCENC_POPCNT > 0) || (ASTCENC_F16C > 0) static bool g_init { false }; @@ -47,7 +58,7 @@ static bool g_cpu_has_f16c { false }; ============================================================================ */ #if !defined(__clang__) && defined(_MSC_VER) #define WIN32_LEAN_AND_MEAN -#include +#include #include /** @@ -119,8 +130,13 @@ static void detect_cpu_isa() } #endif -/* See header for documentation. */ -bool cpu_supports_popcnt() +#if ASTCENC_POPCNT > 0 +/** + * @brief Run-time detection if the host CPU supports the POPCNT extension. + * + * @return @c true if supported, @c false if not. + */ +static bool cpu_supports_popcnt() { if (!g_init) { @@ -129,9 +145,15 @@ bool cpu_supports_popcnt() return g_cpu_has_popcnt; } +#endif -/* See header for documentation. */ -bool cpu_supports_f16c() +#if ASTCENC_F16C > 0 +/** + * @brief Run-time detection if the host CPU supports F16C extension. + * + * @return @c true if supported, @c false if not. + */ +static bool cpu_supports_f16c() { if (!g_init) { @@ -140,9 +162,15 @@ bool cpu_supports_f16c() return g_cpu_has_f16c; } +#endif -/* See header for documentation. */ -bool cpu_supports_sse41() +#if ASTCENC_SSE >= 41 +/** + * @brief Run-time detection if the host CPU supports SSE 4.1 extension. + * + * @return @c true if supported, @c false if not. + */ +static bool cpu_supports_sse41() { if (!g_init) { @@ -151,9 +179,15 @@ bool cpu_supports_sse41() return g_cpu_has_sse41; } +#endif -/* See header for documentation. */ -bool cpu_supports_avx2() +#if ASTCENC_AVX >= 2 +/** + * @brief Run-time detection if the host CPU supports AVX 2 extension. + * + * @return @c true if supported, @c false if not. + */ +static bool cpu_supports_avx2() { if (!g_init) { @@ -162,5 +196,81 @@ bool cpu_supports_avx2() return g_cpu_has_avx2; } +#endif + +/** + * @brief Print a string to stderr. + */ +static inline void print_error( + const char* format +) { + fprintf(stderr, "%s", format); +} + +/** + * @brief Validate CPU ISA support meets the requirements of this build of the library. + * + * Each library build is statically compiled for a particular set of CPU ISA features, such as the + * SIMD support or other ISA extensions such as POPCNT. This function checks that the host CPU + * actually supports everything this build needs. + * + * @return Return @c true if validated, @c false otherwise. + */ +static bool validate_cpu_isa() +{ + #if ASTCENC_AVX >= 2 + if (!cpu_supports_avx2()) + { + print_error("ERROR: Host does not support AVX2 ISA extension\n"); + return false; + } + #endif + + #if ASTCENC_F16C >= 1 + if (!cpu_supports_f16c()) + { + print_error("ERROR: Host does not support F16C ISA extension\n"); + return false; + } + #endif + + #if ASTCENC_SSE >= 41 + if (!cpu_supports_sse41()) + { + print_error("ERROR: Host does not support SSE4.1 ISA extension\n"); + return false; + } + #endif + + #if ASTCENC_POPCNT >= 1 + if (!cpu_supports_popcnt()) + { + print_error("ERROR: Host does not support POPCNT ISA extension\n"); + return false; + } + #endif + + return true; +} + +#else + +// Fallback for cases with no dynamic ISA availability +static bool validate_cpu_isa() +{ + return true; +} #endif + +int main( + int argc, + char **argv +) { + if (!validate_cpu_isa()) + { + return 1; + } + + return astcenc_main(argc, argv); +} diff --git a/Source/astcenccli_error_metrics.cpp b/Source/astcenccli_error_metrics.cpp index 277477031449250b8e0bae8d589d9d3ed84429ea..4e01a9eefed2a6cdeeb3fb6753a2bb63c765b2b3 100644 --- a/Source/astcenccli_error_metrics.cpp +++ b/Source/astcenccli_error_metrics.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2022 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -25,44 +25,39 @@ #include "astcenccli_internal.h" /** - * @brief An accumulator using Kahan compensated floating-point summation. - * - * This method keeps higher precision than direct summation by keeping track of - * the error compensation factor @c comp which can be added into the next - * calculation. This allows single precision floats to be used in places that - * would otherwise need double precision, which is useful when vectorizing. + * @brief An accumulator for errors. */ -class kahan_accum4 +class error_accum4 { public: /** @brief The running sum. */ - vfloat4 sum { vfloat4::zero() }; - - /** @brief The current compensation factor. */ - vfloat4 comp { vfloat4::zero() }; + double sum_r { 0.0 }; + double sum_g { 0.0 }; + double sum_b { 0.0 }; + double sum_a { 0.0 }; }; /** - * @brief The incremental addition operator for Kahan summation. + * @brief Incremental addition operator for error accumulators. * - * @param val The Kahan accumulator to increment + * @param val The accumulator to increment * @param inc The increment to apply * * @return The updated accumulator */ -static kahan_accum4& operator+=( - kahan_accum4 &val, +static error_accum4& operator+=( + error_accum4 &val, vfloat4 inc ) { - vfloat4 y = inc - val.comp; - vfloat4 t = val.sum + y; - val.comp = (t - val.sum) - y; - val.sum = t; + val.sum_r += static_cast(inc.lane<0>()); + val.sum_g += static_cast(inc.lane<1>()); + val.sum_b += static_cast(inc.lane<2>()); + val.sum_a += static_cast(inc.lane<3>()); return val; } /** - * @brief mPSNR tonemapping operator for HDR images. + * @brief mPSNR tone-mapping operator for HDR images. * * @param val The color value to tone map * @param fstop The exposure fstop; should be in range [-125, 125] @@ -124,10 +119,10 @@ void compute_error_metrics( static const int componentmasks[5] { 0x00, 0x07, 0x0C, 0x07, 0x0F }; int componentmask = componentmasks[input_components]; - kahan_accum4 errorsum; - kahan_accum4 alpha_scaled_errorsum; - kahan_accum4 log_errorsum; - kahan_accum4 mpsnr_errorsum; + error_accum4 errorsum; + error_accum4 alpha_scaled_errorsum; + error_accum4 log_errorsum; + error_accum4 mpsnr_errorsum; double mean_angular_errorsum = 0.0; double worst_angular_errorsum = 0.0; @@ -146,7 +141,7 @@ void compute_error_metrics( img2->dim_x, img2->dim_y, img2->dim_z); } - float rgb_peak = 0.0f; + double rgb_peak = 0.0; unsigned int xsize1 = img1->dim_x; unsigned int xsize2 = img2->dim_x; @@ -237,7 +232,10 @@ void compute_error_metrics( color2 = clamp(0, 65504.0f, color2); } - rgb_peak = astc::max(color1.lane<0>(), color1.lane<1>(), color1.lane<2>(), rgb_peak); + rgb_peak = astc::max(static_cast(color1.lane<0>()), + static_cast(color1.lane<1>()), + static_cast(color1.lane<2>()), + rgb_peak); vfloat4 diffcolor = color1 - color2; vfloat4 diffcolor_sq = diffcolor * diffcolor; @@ -291,106 +289,118 @@ void compute_error_metrics( } } - float pixels = static_cast(dim_x * dim_y * dim_z); - float num = 0.0f; - float alpha_num = 0.0f; - float log_num = 0.0f; - float mpsnr_num = 0.0f; - float samples = 0.0f; + double pixels = static_cast(dim_x * dim_y * dim_z); + double samples = 0.0; + + double num = 0.0; + double alpha_num = 0.0; + double log_num = 0.0; + double mpsnr_num = 0.0; if (componentmask & 1) { - num += errorsum.sum.lane<0>(); - alpha_num += alpha_scaled_errorsum.sum.lane<0>(); - log_num += log_errorsum.sum.lane<0>(); - mpsnr_num += mpsnr_errorsum.sum.lane<0>(); + num += errorsum.sum_r; + alpha_num += alpha_scaled_errorsum.sum_r; + log_num += log_errorsum.sum_r; + mpsnr_num += mpsnr_errorsum.sum_r; samples += pixels; } if (componentmask & 2) { - num += errorsum.sum.lane<1>(); - alpha_num += alpha_scaled_errorsum.sum.lane<1>(); - log_num += log_errorsum.sum.lane<1>(); - mpsnr_num += mpsnr_errorsum.sum.lane<1>(); + num += errorsum.sum_g; + alpha_num += alpha_scaled_errorsum.sum_g; + log_num += log_errorsum.sum_g; + mpsnr_num += mpsnr_errorsum.sum_g; samples += pixels; } if (componentmask & 4) { - num += errorsum.sum.lane<2>(); - alpha_num += alpha_scaled_errorsum.sum.lane<2>(); - log_num += log_errorsum.sum.lane<2>(); - mpsnr_num += mpsnr_errorsum.sum.lane<2>(); + num += errorsum.sum_b; + alpha_num += alpha_scaled_errorsum.sum_b; + log_num += log_errorsum.sum_b; + mpsnr_num += mpsnr_errorsum.sum_b; samples += pixels; } if (componentmask & 8) { - num += errorsum.sum.lane<3>(); - alpha_num += alpha_scaled_errorsum.sum.lane<3>(); + num += errorsum.sum_a; + alpha_num += alpha_scaled_errorsum.sum_a; samples += pixels; } - float denom = samples; - float stopcount = static_cast(fstop_hi - fstop_lo + 1); - float mpsnr_denom = pixels * 3.0f * stopcount * 255.0f * 255.0f; + double denom = samples; + double stopcount = static_cast(fstop_hi - fstop_lo + 1); + double mpsnr_denom = pixels * 3.0 * stopcount * 255.0 * 255.0; - float psnr; - if (num == 0.0f) - psnr = 999.0f; + double psnr; + if (num == 0.0) + { + psnr = 999.0; + } else - psnr = 10.0f * log10f(denom / num); + { + psnr = 10.0 * log10(denom / num); + } - float rgb_psnr = psnr; + double rgb_psnr = psnr; printf("Quality metrics\n"); printf("===============\n\n"); if (componentmask & 8) { - printf(" PSNR (LDR-RGBA): %9.4f dB\n", static_cast(psnr)); + printf(" PSNR (LDR-RGBA): %9.4f dB\n", psnr); - float alpha_psnr; - if (alpha_num == 0.0f) - alpha_psnr = 999.0f; + double alpha_psnr; + if (alpha_num == 0.0) + { + alpha_psnr = 999.0; + } else - alpha_psnr = 10.0f * log10f(denom / alpha_num); - printf(" Alpha-weighted PSNR: %9.4f dB\n", static_cast(alpha_psnr)); + { + alpha_psnr = 10.0 * log10(denom / alpha_num); + } + printf(" Alpha-weighted PSNR: %9.4f dB\n", alpha_psnr); - float rgb_num = hadd_rgb_s(errorsum.sum); - if (rgb_num == 0.0f) - rgb_psnr = 999.0f; + double rgb_num = errorsum.sum_r + errorsum.sum_g + errorsum.sum_b; + if (rgb_num == 0.0) + { + rgb_psnr = 999.0; + } else - rgb_psnr = 10.0f * log10f(pixels * 3.0f / rgb_num); - printf(" PSNR (LDR-RGB): %9.4f dB\n", static_cast(rgb_psnr)); + { + rgb_psnr = 10.0 * log10(pixels * 3.0 / rgb_num); + } + printf(" PSNR (LDR-RGB): %9.4f dB\n", rgb_psnr); } else { - printf(" PSNR (LDR-RGB): %9.4f dB\n", static_cast(psnr)); + printf(" PSNR (LDR-RGB): %9.4f dB\n", psnr); } if (compute_hdr_metrics) { printf(" PSNR (RGB norm to peak): %9.4f dB (peak %f)\n", - static_cast(rgb_psnr + 20.0f * log10f(rgb_peak)), - static_cast(rgb_peak)); + rgb_psnr + 20.0 * log10(rgb_peak), rgb_peak); - float mpsnr; - if (mpsnr_num == 0.0f) + double mpsnr; + if (mpsnr_num == 0.0) { - mpsnr = 999.0f; + mpsnr = 999.0; } else { - mpsnr = 10.0f * log10f(mpsnr_denom / mpsnr_num); + mpsnr = 10.0 * log10(mpsnr_denom / mpsnr_num); } printf(" mPSNR (RGB): %9.4f dB (fstops %+d to %+d)\n", - static_cast(mpsnr), fstop_lo, fstop_hi); + mpsnr, fstop_lo, fstop_hi); - float logrmse = astc::sqrt(log_num / pixels); - printf(" LogRMSE (RGB): %9.4f\n", static_cast(logrmse)); + double logrmse = sqrt(log_num / pixels); + printf(" LogRMSE (RGB): %9.4f\n", logrmse); } if (compute_normal_metrics) diff --git a/Source/astcenccli_image.cpp b/Source/astcenccli_image.cpp index 7f766544d20ae9db4cfd198021f690fd96a0dc4a..4b1bb637a066f0a221e04f4ff5468b900a462c2a 100644 --- a/Source/astcenccli_image.cpp +++ b/Source/astcenccli_image.cpp @@ -36,12 +36,12 @@ astcenc_image *alloc_image( img->dim_y = dim_y; img->dim_z = dim_z; + void** data = new void*[dim_z]; + img->data = data; + if (bitness == 8) { - void** data = new void*[dim_z]; img->data_type = ASTCENC_TYPE_U8; - img->data = data; - for (unsigned int z = 0; z < dim_z; z++) { data[z] = new uint8_t[dim_x * dim_y * 4]; @@ -49,10 +49,7 @@ astcenc_image *alloc_image( } else if (bitness == 16) { - void** data = new void*[dim_z]; img->data_type = ASTCENC_TYPE_F16; - img->data = data; - for (unsigned int z = 0; z < dim_z; z++) { data[z] = new uint16_t[dim_x * dim_y * 4]; @@ -61,10 +58,7 @@ astcenc_image *alloc_image( else // if (bitness == 32) { assert(bitness == 32); - void** data = new void*[dim_z]; img->data_type = ASTCENC_TYPE_F32; - img->data = data; - for (unsigned int z = 0; z < dim_z; z++) { data[z] = new float[dim_x * dim_y * 4]; @@ -239,15 +233,18 @@ astcenc_image* astc_img_from_unorm8x4_array( /* See header for documentation. */ float* floatx4_array_from_astc_img( const astcenc_image* img, - bool y_flip + bool y_flip, + unsigned int z_index ) { unsigned int dim_x = img->dim_x; unsigned int dim_y = img->dim_y; float *buf = new float[4 * dim_x * dim_y]; + assert(z_index < img->dim_z); + if (img->data_type == ASTCENC_TYPE_U8) { - uint8_t* data8 = static_cast(img->data[0]); + uint8_t* data8 = static_cast(img->data[z_index]); for (unsigned int y = 0; y < dim_y; y++) { unsigned int ymod = y_flip ? dim_y - y - 1 : y; @@ -264,7 +261,7 @@ float* floatx4_array_from_astc_img( } else if (img->data_type == ASTCENC_TYPE_F16) { - uint16_t* data16 = static_cast(img->data[0]); + uint16_t* data16 = static_cast(img->data[z_index]); for (unsigned int y = 0; y < dim_y; y++) { unsigned int ymod = y_flip ? dim_y - y - 1 : y; @@ -287,7 +284,7 @@ float* floatx4_array_from_astc_img( else // if (img->data_type == ASTCENC_TYPE_F32) { assert(img->data_type == ASTCENC_TYPE_F32); - float* data32 = static_cast(img->data[0]); + float* data32 = static_cast(img->data[z_index]); for (unsigned int y = 0; y < dim_y; y++) { unsigned int ymod = y_flip ? dim_y - y - 1 : y; diff --git a/Source/astcenccli_image_external.cpp b/Source/astcenccli_image_external.cpp index bd7449609a74ce02f97285b4d5b16d5063e61148..0c81b8f6c817011fbbb0795782869af4b2a4a1e9 100644 --- a/Source/astcenccli_image_external.cpp +++ b/Source/astcenccli_image_external.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -26,7 +26,7 @@ #include "astcenccli_internal.h" -// Configure the STB image imagewrite library build. +// Configure the STB image write library build. #define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION #define STBI_NO_GIF @@ -61,7 +61,7 @@ static void astcenc_runtime_assert(bool condition) { if (!condition) { - printf("ERROR: Corrupt input image\n"); + print_error("ERROR: Corrupt input image\n"); exit(1); } } @@ -92,7 +92,7 @@ astcenc_image* load_png_with_wuffs( std::ifstream file(filename, std::ios::binary | std::ios::ate); if (!file) { - printf("ERROR: Failed to load image %s (can't fopen)\n", filename); + print_error("ERROR: Failed to load image %s (can't fopen)\n", filename); return nullptr; } diff --git a/Source/astcenccli_image_load_store.cpp b/Source/astcenccli_image_load_store.cpp index 6878a0d5a96d4d690dab19217453a9efe371672b..4076466ace60ca111fca1e959859787a4c1efa29 100644 --- a/Source/astcenccli_image_load_store.cpp +++ b/Source/astcenccli_image_load_store.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include "astcenccli_internal.h" @@ -32,8 +34,39 @@ #include "stb_image_write.h" #include "tinyexr.h" +/** + * @brief Determine the output file name to use for a sliced image write. + * + * @param img The source data for the image. + * @param filename The base name of the file to save. + * @param index The slice index to write. + * + * @return The file name to use when saving the file. + */ +static std::string get_output_filename( + const astcenc_image* img, + const char* filename, + unsigned int index +) { + if (img->dim_z <= 1) + { + return filename; + } + + std::string fnmod(filename); + std::string fnext = fnmod.substr(fnmod.find_last_of(".")); + + // Remove the extension + fnmod = fnmod.erase(fnmod.length() - fnext.size()); + + // Insert the file index into the base name, then append the extension + std::stringstream ss; + ss << fnmod << "_" << std::setw(3) << std::setfill('0') << index << fnext; + return ss.str(); +} + /* ============================================================================ - Image load and store through the stb_iamge and tinyexr libraries + Image load and store through the stb_image and tinyexr libraries ============================================================================ */ /** @@ -59,7 +92,7 @@ static astcenc_image* load_image_with_tinyexr( int load_res = LoadEXR(&image, &dim_x, &dim_y, filename, &err); if (load_res != TINYEXR_SUCCESS) { - printf("ERROR: Failed to load image %s (%s)\n", filename, err); + print_error("ERROR: Failed to load image %s (%s)\n", filename, err); free(reinterpret_cast(const_cast(err))); return nullptr; } @@ -115,7 +148,7 @@ static astcenc_image* load_image_with_stb( } } - printf("ERROR: Failed to load image %s (%s)\n", filename, stbi_failure_reason()); + print_error("ERROR: Failed to load image %s (%s)\n", filename, stbi_failure_reason()); return nullptr; } @@ -133,9 +166,21 @@ static bool store_exr_image_with_tinyexr( const char* filename, int y_flip ) { - float *buf = floatx4_array_from_astc_img(img, y_flip); - int res = SaveEXR(buf, img->dim_x, img->dim_y, 4, 1, filename, nullptr); - delete[] buf; + int res { 0 }; + + for (unsigned int i = 0; i < img->dim_z; i++) + { + std::string fnmod = get_output_filename(img, filename, i); + float* buf = floatx4_array_from_astc_img(img, y_flip, i); + + res = SaveEXR(buf, img->dim_x, img->dim_y, 4, 1, fnmod.c_str(), nullptr); + delete[] buf; + if (res < 0) + { + break; + } + } + return res >= 0; } @@ -153,11 +198,23 @@ static bool store_png_image_with_stb( const char* filename, int y_flip ) { + int res { 0 }; + assert(img->data_type == ASTCENC_TYPE_U8); - uint8_t* buf = reinterpret_cast(img->data[0]); - stbi_flip_vertically_on_write(y_flip); - int res = stbi_write_png(filename, img->dim_x, img->dim_y, 4, buf, img->dim_x * 4); + for (unsigned int i = 0; i < img->dim_z; i++) + { + std::string fnmod = get_output_filename(img, filename, i); + uint8_t* buf = reinterpret_cast(img->data[i]); + + stbi_flip_vertically_on_write(y_flip); + res = stbi_write_png(fnmod.c_str(), img->dim_x, img->dim_y, 4, buf, img->dim_x * 4); + if (res == 0) + { + break; + } + } + return res != 0; } @@ -175,11 +232,23 @@ static bool store_tga_image_with_stb( const char* filename, int y_flip ) { + int res { 0 }; + assert(img->data_type == ASTCENC_TYPE_U8); - uint8_t* buf = reinterpret_cast(img->data[0]); - stbi_flip_vertically_on_write(y_flip); - int res = stbi_write_tga(filename, img->dim_x, img->dim_y, 4, buf); + for (unsigned int i = 0; i < img->dim_z; i++) + { + std::string fnmod = get_output_filename(img, filename, i); + uint8_t* buf = reinterpret_cast(img->data[i]); + + stbi_flip_vertically_on_write(y_flip); + res = stbi_write_tga(fnmod.c_str(), img->dim_x, img->dim_y, 4, buf); + if (res == 0) + { + break; + } + } + return res != 0; } @@ -197,11 +266,23 @@ static bool store_bmp_image_with_stb( const char* filename, int y_flip ) { + int res { 0 }; + assert(img->data_type == ASTCENC_TYPE_U8); - uint8_t* buf = reinterpret_cast(img->data[0]); - stbi_flip_vertically_on_write(y_flip); - int res = stbi_write_bmp(filename, img->dim_x, img->dim_y, 4, buf); + for (unsigned int i = 0; i < img->dim_z; i++) + { + std::string fnmod = get_output_filename(img, filename, i); + uint8_t* buf = reinterpret_cast(img->data[i]); + + stbi_flip_vertically_on_write(y_flip); + res = stbi_write_bmp(fnmod.c_str(), img->dim_x, img->dim_y, 4, buf); + if (res == 0) + { + break; + } + } + return res != 0; } @@ -219,9 +300,21 @@ static bool store_hdr_image_with_stb( const char* filename, int y_flip ) { - float* buf = floatx4_array_from_astc_img(img, y_flip); - int res = stbi_write_hdr(filename, img->dim_x, img->dim_y, 4, buf); - delete[] buf; + int res { 0 }; + + for (unsigned int i = 0; i < img->dim_z; i++) + { + std::string fnmod = get_output_filename(img, filename, i); + float* buf = floatx4_array_from_astc_img(img, y_flip, i); + + res = stbi_write_hdr(fnmod.c_str(), img->dim_x, img->dim_y, 4, buf); + delete[] buf; + if (res == 0) + { + break; + } + } + return res != 0; } @@ -625,6 +718,16 @@ static uint32_t u32_byterev(uint32_t v) #define GL_LUMINANCE 0x1909 #define GL_LUMINANCE_ALPHA 0x190A +#define GL_R8 0x8229 +#define GL_RG8 0x822B +#define GL_RGB8 0x8051 +#define GL_RGBA8 0x8058 + +#define GL_R16F 0x822D +#define GL_RG16F 0x822F +#define GL_RGB16F 0x881B +#define GL_RGBA16F 0x881A + #define GL_UNSIGNED_BYTE 0x1401 #define GL_UNSIGNED_SHORT 0x1403 #define GL_HALF_FLOAT 0x140B @@ -768,7 +871,7 @@ static unsigned int get_format( ) { for (auto& it : ASTC_FORMATS) { - if ((it.x == x) && (it.y == y) && (it.z == z) && (it.is_srgb == is_srgb)) + if ((it.x == x) && (it.y == y) && (it.z == z) && (it.is_srgb == is_srgb)) { return it.format; } @@ -794,7 +897,7 @@ struct ktx_header uint32_t bytes_of_key_value_data; // size in bytes of the key-and-value area immediately following the header. }; -// magic 12-byte sequence that must appear at the beginning of every KTX file. +// Magic 12-byte sequence that must appear at the beginning of every KTX file. static uint8_t ktx_magic[12] { 0xAB, 0x4B, 0x54, 0x58, 0x20, 0x31, 0x31, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A }; @@ -909,9 +1012,9 @@ static astcenc_image* load_ktx_uncompressed_image( return nullptr; } - // Although these are set up later, we include a default initializer to remove warnings - int bytes_per_component = 1; // bytes per component in the KTX file. - int bitness = 8; // internal precision we will use in the codec. + // Although these are set up later, use default initializer to remove warnings + int bitness = 8; // Internal precision after conversion + int bytes_per_component = 1; // Bytes per component in the KTX file scanline_transfer copy_method = R8_TO_RGBA8; switch (hdr.gl_type) @@ -1017,7 +1120,7 @@ static astcenc_image* load_ktx_uncompressed_image( } case GL_FLOAT: { - bitness = 32; + bitness = 16; bytes_per_component = 4; switch (hdr.gl_format) { @@ -1126,7 +1229,7 @@ static astcenc_image* load_ktx_uncompressed_image( } } - // then transfer data from the surface to our own image-data-structure. + // Transfer data from the surface to our own image data structure astcenc_image *astc_img = alloc_image(bitness, dim_x, dim_y, dim_z); for (unsigned int z = 0; z < dim_z; z++) @@ -1155,7 +1258,7 @@ static astcenc_image* load_ktx_uncompressed_image( } delete[] buf; - is_hdr = bitness == 32; + is_hdr = bitness >= 16; component_count = components; return astc_img; } @@ -1352,7 +1455,15 @@ static bool store_ktx_uncompressed_image( ktx_header hdr; static const int gl_format_of_components[4] { - GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA + GL_RED, GL_RG, GL_RGB, GL_RGBA + }; + + static const int gl_sized_format_of_components_ldr[4] { + GL_R8, GL_RG8, GL_RGB8, GL_RGBA8 + }; + + static const int gl_sized_format_of_components_hdr[4] { + GL_R16F, GL_RG16F, GL_RGB16F, GL_RGBA16F }; memcpy(hdr.magic, ktx_magic, 12); @@ -1360,8 +1471,15 @@ static bool store_ktx_uncompressed_image( hdr.gl_type = (bitness == 16) ? GL_HALF_FLOAT : GL_UNSIGNED_BYTE; hdr.gl_type_size = bitness / 8; hdr.gl_format = gl_format_of_components[image_components - 1]; - hdr.gl_internal_format = gl_format_of_components[image_components - 1]; - hdr.gl_base_internal_format = gl_format_of_components[image_components - 1]; + if (bitness == 16) + { + hdr.gl_internal_format = gl_sized_format_of_components_hdr[image_components - 1]; + } + else + { + hdr.gl_internal_format = gl_sized_format_of_components_ldr[image_components - 1]; + } + hdr.gl_base_internal_format = hdr.gl_format; hdr.pixel_width = dim_x; hdr.pixel_height = dim_y; hdr.pixel_depth = (dim_z == 1) ? 0 : dim_z; @@ -1915,7 +2033,7 @@ static astcenc_image* load_dds_uncompressed_image( } delete[] buf; - is_hdr = bitness == 16; + is_hdr = bitness >= 16; component_count = components; return astc_img; } @@ -2295,7 +2413,7 @@ bool store_ncimage( eptr = ".ktx"; // use KTX file format if we don't have an ending. } - for (int i=0; i < storer_descr_count; i++) + for (int i = 0; i < storer_descr_count; i++) { if (strcmp(eptr, storer_descs[i].ending1) == 0 || strcmp(eptr, storer_descs[i].ending2) == 0) @@ -2338,7 +2456,6 @@ static unsigned int unpack_bytes( } /* See header for documentation. */ -// TODO: Return a bool? int load_cimage( const char* filename, astc_compressed_image& img @@ -2346,22 +2463,22 @@ int load_cimage( std::ifstream file(filename, std::ios::in | std::ios::binary); if (!file) { - printf("ERROR: File open failed '%s'\n", filename); + print_error("ERROR: File open failed '%s'\n", filename); return 1; } astc_header hdr; file.read(reinterpret_cast(&hdr), sizeof(astc_header)); - if (!file) + if (file.fail()) { - printf("ERROR: File read failed '%s'\n", filename); + print_error("ERROR: File read failed '%s'\n", filename); return 1; } unsigned int magicval = unpack_bytes(hdr.magic[0], hdr.magic[1], hdr.magic[2], hdr.magic[3]); if (magicval != ASTC_MAGIC_ID) { - printf("ERROR: File not recognized '%s'\n", filename); + print_error("ERROR: File not recognized '%s'\n", filename); return 1; } @@ -2376,7 +2493,7 @@ int load_cimage( if (dim_x == 0 || dim_y == 0 || dim_z == 0) { - printf("ERROR: File corrupt '%s'\n", filename); + print_error("ERROR: Image header corrupt '%s'\n", filename); return 1; } @@ -2388,9 +2505,10 @@ int load_cimage( uint8_t *buffer = new uint8_t[data_size]; file.read(reinterpret_cast(buffer), data_size); - if (!file) + if (file.fail()) { - printf("ERROR: File read failed '%s'\n", filename); + print_error("ERROR: Image data size exceeded file size '%s'\n", filename); + delete[] buffer; return 1; } @@ -2406,7 +2524,6 @@ int load_cimage( } /* See header for documentation. */ -// TODO: Return a bool? int store_cimage( const astc_compressed_image& img, const char* filename @@ -2436,7 +2553,7 @@ int store_cimage( std::ofstream file(filename, std::ios::out | std::ios::binary); if (!file) { - printf("ERROR: File open failed '%s'\n", filename); + print_error("ERROR: File open failed '%s'\n", filename); return 1; } diff --git a/Source/astcenccli_internal.h b/Source/astcenccli_internal.h index 26a41a049df907604f0f1ae5f4ae30c14dc9f81c..ee3a44e716ad7159b26651ccdf65661197b9bf86 100644 --- a/Source/astcenccli_internal.h +++ b/Source/astcenccli_internal.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -68,6 +68,9 @@ struct cli_config_options /** @brief The number of threads to use for processing. */ unsigned int thread_count; + /** @brief The number of repeats to execute for benchmarking. */ + unsigned int repeat_count; + /** @brief The number of image slices to load for a 3D image. */ unsigned int array_size; @@ -77,6 +80,9 @@ struct cli_config_options /** @brief @c true if the images should be y-flipped. */ bool y_flip; + /** @brief @c true if diagnostic images should be stored. */ + bool diagnostic_images; + /** @brief The low exposure fstop for error computation. */ int low_fstop; @@ -90,6 +96,26 @@ struct cli_config_options astcenc_swizzle swz_decode; }; +/** + * @brief Print a string to stderr. + */ +static inline void print_error( + const char* format +) { + fprintf(stderr, "%s", format); +} + +/** + * @brief Print a formatted string to stderr. + */ +template +static inline void print_error( + const char* format, + _Args...args +) { + fprintf(stderr, format, args...); +} + /** * @brief Load uncompressed image. * @@ -271,18 +297,20 @@ astcenc_image* astc_img_from_unorm8x4_array( bool y_flip); /** - * @brief Create a flattened RGBA FLOAT32 data array from an image structure. + * @brief Create a flattened RGBA FLOAT32 data array for a single slice from an image structure. * * The returned data array is allocated with @c new[] and must be freed with a @c delete[] call. * - * @param img The input image. - * @param y_flip Should the data in the array be Y flipped? + * @param img The input image. + * @param y_flip Should the data in the array be Y flipped? + * @param z_index The slice index to convert. * * @return The data array. */ float* floatx4_array_from_astc_img( const astcenc_image* img, - bool y_flip); + bool y_flip, + unsigned int z_index); /** * @brief Create a flattened RGBA UNORM8 data array from an image structure. @@ -357,14 +385,28 @@ int get_cpu_count(); * All threads run the same thread function, and have the same thread payload, but are given a * unique thread ID (0 .. N-1) as a parameter to the run function to allow thread-specific behavior. * -|* @param thread_count The number of threads to spawn. - * @param func The function to execute. Must have the signature: - * void (int thread_count, int thread_id, void* payload) - * @param payload Pointer to an opaque thread payload object. + * @param operation The name of the operation for this async task. + * @param thread_count The number of threads to spawn. + * @param func The function to execute. Must have the signature: + * void (int thread_count, int thread_id, void* payload) + * @param payload Pointer to an opaque thread payload object. */ void launch_threads( + const char* operation, int thread_count, void (*func)(int, int, void*), void *payload); +/** + * @brief The main entry point. + * + * @param argc The number of arguments. + * @param argv The vector of arguments. + * + * @return 0 on success, non-zero otherwise. + */ +int astcenc_main( + int argc, + char **argv); + #endif diff --git a/Source/astcenccli_platform_dependents.cpp b/Source/astcenccli_platform_dependents.cpp index fcca5aa72b79cae041b4cf302712189931f5ac55..d5857f17b8365818b416893c1dcc8a872943b752 100644 --- a/Source/astcenccli_platform_dependents.cpp +++ b/Source/astcenccli_platform_dependents.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2021 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -38,7 +38,7 @@ #if defined(_WIN32) && !defined(__CYGWIN__) #define WIN32_LEAN_AND_MEAN -#include +#include /** @brief Alias pthread_t to one of the internal Windows types. */ typedef HANDLE pthread_t; @@ -58,9 +58,61 @@ static int pthread_create( static_cast(attribs); LPTHREAD_START_ROUTINE func = reinterpret_cast(threadfunc); *thread = CreateThread(nullptr, 0, func, thread_arg, 0, nullptr); + + // Ensure we return 0 on success, non-zero on error + if (*thread == NULL) + { + return 1; + } + return 0; } +/** + * @brief Manually set CPU group and thread affinity. + * + * This is needed on Windows 10 or older to allow benefit from large core count + * systems with more than 64 logical CPUs. The assignment is skipped on systems + * with a single processor group, as it is not necessary. + */ +static void set_group_affinity( + pthread_t thread, + int thread_index +) { + // Skip thread assignment for hardware with a single CPU group + int group_count = GetActiveProcessorGroupCount(); + if (group_count == 1) + { + return; + } + + // Ensure we have a valid assign if user creates more threads than cores + int assign_index = thread_index % get_cpu_count(); + int assign_group { 0 }; + int assign_group_cpu_count { 0 }; + + // Determine which core group and core in the group to use for this thread + int group_cpu_count_sum { 0 }; + for (int group = 0; group < group_count; group++) + { + int group_cpu_count = static_cast(GetMaximumProcessorCount(group)); + group_cpu_count_sum += group_cpu_count; + + if (assign_index < group_cpu_count_sum) + { + assign_group = group; + assign_group_cpu_count = group_cpu_count; + break; + } + } + + // Set the affinity to the assigned group, and all supported cores + GROUP_AFFINITY affinity {}; + affinity.Mask = (1 << assign_group_cpu_count) - 1; + affinity.Group = assign_group; + SetThreadGroupAffinity(thread, &affinity, nullptr); +} + /** * @brief Proxy Windows @c WaitForSingleObject underneath a pthreads-like wrapper. */ @@ -76,9 +128,8 @@ static int pthread_join( /* See header for documentation */ int get_cpu_count() { - SYSTEM_INFO sysinfo; - GetSystemInfo(&sysinfo); - return sysinfo.dwNumberOfProcessors; + DWORD cpu_count = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS); + return static_cast(cpu_count); } /* See header for documentation */ @@ -151,6 +202,7 @@ static void* launch_threads_helper( /* See header for documentation */ void launch_threads( + const char* operation, int thread_count, void (*func)(int, int, void*), void *payload @@ -163,22 +215,58 @@ void launch_threads( } // Otherwise spawn worker threads - launch_desc *thread_descs = new launch_desc[thread_count]; + launch_desc *thread_descs = new launch_desc[thread_count]; + int actual_thread_count { 0 }; + for (int i = 0; i < thread_count; i++) { - thread_descs[i].thread_count = thread_count; - thread_descs[i].thread_id = i; - thread_descs[i].payload = payload; - thread_descs[i].func = func; + thread_descs[actual_thread_count].thread_count = thread_count; + thread_descs[actual_thread_count].thread_id = actual_thread_count; + thread_descs[actual_thread_count].payload = payload; + thread_descs[actual_thread_count].func = func; + + // Handle pthread_create failing by simply using fewer threads + int error = pthread_create( + &(thread_descs[actual_thread_count].thread_handle), + nullptr, + launch_threads_helper, + reinterpret_cast(thread_descs + actual_thread_count)); + + // Track how many threads we actually created + if (!error) + { + // Windows needs explicit thread assignment to handle large core count systems + #if defined(_WIN32) && !defined(__CYGWIN__) + set_group_affinity( + thread_descs[actual_thread_count].thread_handle, + actual_thread_count); + #endif - pthread_create(&(thread_descs[i].thread_handle), nullptr, - launch_threads_helper, reinterpret_cast(thread_descs + i)); + actual_thread_count++; + } } - // ... and then wait for them to complete - for (int i = 0; i < thread_count; i++) + // If we did not create thread_count threads then emit a warning + if (actual_thread_count != thread_count) + { + int log_count = actual_thread_count == 0 ? 1 : actual_thread_count; + const char* log_s = log_count == 1 ? "" : "s"; + printf("WARNING: %s using %d thread%s due to thread creation error\n\n", + operation, log_count, log_s); + } + + // If we managed to spawn any threads wait for them to complete + if (actual_thread_count != 0) { - pthread_join(thread_descs[i].thread_handle, nullptr); + for (int i = 0; i < actual_thread_count; i++) + { + pthread_join(thread_descs[i].thread_handle, nullptr); + } + } + // Else fall back to using this thread + else + { + func(1, 0, payload); } delete[] thread_descs; diff --git a/Source/astcenccli_toplevel.cpp b/Source/astcenccli_toplevel.cpp index ef012084eadaebeea5980c14f683f22cefbdfae1..d8360ea581be0daac27a7881ad03d012e077fae4 100644 --- a/Source/astcenccli_toplevel.cpp +++ b/Source/astcenccli_toplevel.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2024 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -22,11 +22,19 @@ #include "astcenc.h" #include "astcenccli_internal.h" +#if defined(_WIN32) + #include + #define isatty _isatty +#else + #include +#endif #include #include +#include #include #include #include +#include /* ============================================================================ Data structure definitions @@ -158,6 +166,35 @@ struct decompression_workload astcenc_error error; }; +/** + * @brief Callback emitting a progress bar + */ +extern "C" void progress_emitter( + float value +) { + const unsigned int bar_size = 25; + unsigned int parts = static_cast(value / 4.0f); + + char buffer[bar_size + 3]; + buffer[0] = '['; + + for (unsigned int i = 0; i < parts; i++) + { + buffer[i + 1] = '='; + } + + for (unsigned int i = parts; i < bar_size; i++) + { + buffer[i + 1] = ' '; + } + + buffer[bar_size + 1] = ']'; + buffer[bar_size + 2] = '\0'; + + printf(" Progress: %s %03.1f%%\r", buffer, static_cast(value)); + fflush(stdout); +} + /** * @brief Test if a string argument is a well formed float. */ @@ -312,7 +349,7 @@ static astcenc_image* load_uncomp_file( std::string slice_name = get_slice_filename(filename, image_index, error); if (error) { - printf("ERROR: Image pattern does not contain file extension: %s\n", filename); + print_error("ERROR: Image pattern does not contain file extension: %s\n", filename); break; } @@ -328,7 +365,7 @@ static astcenc_image* load_uncomp_file( // Check it is not a 3D image if (slice->dim_z != 1) { - printf("ERROR: Image arrays do not support 3D sources: %s\n", slice_name.c_str()); + print_error("ERROR: Image arrays do not support 3D sources: %s\n", slice_name.c_str()); break; } @@ -337,7 +374,7 @@ static astcenc_image* load_uncomp_file( { if ((is_hdr != slice_is_hdr) || (component_count != slice_component_count)) { - printf("ERROR: Image array[0] and [%d] are different formats\n", image_index); + print_error("ERROR: Image array[0] and [%d] are different formats\n", image_index); break; } @@ -345,7 +382,7 @@ static astcenc_image* load_uncomp_file( (slices[0]->dim_y != slice->dim_y) || (slices[0]->dim_z != slice->dim_z)) { - printf("ERROR: Image array[0] and [%d] are different dimensions\n", image_index); + print_error("ERROR: Image array[0] and [%d] are different dimensions\n", image_index); break; } } @@ -437,7 +474,7 @@ static int parse_commandline_options( if (operation == ASTCENC_OP_UNKNOWN) { - printf("ERROR: Unrecognized operation '%s'\n", argv[1]); + print_error("ERROR: Unrecognized operation '%s'\n", argv[1]); return 1; } @@ -488,7 +525,7 @@ static int init_astcenc_config( // Read and decode block size if (argc < 5) { - printf("ERROR: Block size must be specified\n"); + print_error("ERROR: Block size must be specified\n"); return 1; } @@ -498,14 +535,14 @@ static int init_astcenc_config( // Character after the last match should be a NUL if (!(((dimensions == 2) && !argv[4][cnt2D]) || ((dimensions == 3) && !argv[4][cnt3D]))) { - printf("ERROR: Block size '%s' is invalid\n", argv[4]); + print_error("ERROR: Block size '%s' is invalid\n", argv[4]); return 1; } // Read and decode search quality if (argc < 6) { - printf("ERROR: Search quality level must be specified\n"); + print_error("ERROR: Search quality level must be specified\n"); return 1; } @@ -525,6 +562,10 @@ static int init_astcenc_config( { quality = ASTCENC_PRE_THOROUGH; } + else if (!strcmp(argv[5], "-verythorough")) + { + quality = ASTCENC_PRE_VERYTHOROUGH; + } else if (!strcmp(argv[5], "-exhaustive")) { quality = ASTCENC_PRE_EXHAUSTIVE; @@ -535,7 +576,7 @@ static int init_astcenc_config( } else { - printf("ERROR: Search quality/preset '%s' is invalid\n", argv[5]); + print_error("ERROR: Search quality/preset '%s' is invalid\n", argv[5]); return 1; } @@ -553,14 +594,14 @@ static int init_astcenc_config( argidx++; flags |= ASTCENC_FLG_USE_ALPHA_WEIGHT; } - else if (!strcmp(argv[argidx], "-mask")) - { - flags |= ASTCENC_FLG_MAP_MASK; - } else if (!strcmp(argv[argidx], "-normal")) { flags |= ASTCENC_FLG_MAP_NORMAL; } + else if (!strcmp(argv[argidx], "-decode_unorm8")) + { + flags |= ASTCENC_FLG_USE_DECODE_UNORM8; + } else if (!strcmp(argv[argidx], "-rgbm")) { // Skip over the data value for now @@ -575,7 +616,7 @@ static int init_astcenc_config( { if (preprocess != ASTCENC_PP_NONE) { - printf("ERROR: Only a single image preprocess can be used\n"); + print_error("ERROR: Only a single image preprocess can be used\n"); return 1; } preprocess = ASTCENC_PP_NORMALIZE; @@ -584,7 +625,7 @@ static int init_astcenc_config( { if (preprocess != ASTCENC_PP_NONE) { - printf("ERROR: Only a single image preprocess can be used\n"); + print_error("ERROR: Only a single image preprocess can be used\n"); return 1; } preprocess = ASTCENC_PP_PREMULTIPLY; @@ -613,22 +654,22 @@ static int init_astcenc_config( quality, flags, &config); if (status == ASTCENC_ERR_BAD_BLOCK_SIZE) { - printf("ERROR: Block size '%s' is invalid\n", argv[4]); + print_error("ERROR: Block size '%s' is invalid\n", argv[4]); return 1; } - else if (status == ASTCENC_ERR_BAD_CPU_ISA) + else if (status == ASTCENC_ERR_BAD_DECODE_MODE) { - printf("ERROR: Required SIMD ISA support missing on this CPU\n"); + print_error("ERROR: Decode_unorm8 is not supported by HDR profiles\n", argv[4]); return 1; } else if (status == ASTCENC_ERR_BAD_CPU_FLOAT) { - printf("ERROR: astcenc must not be compiled with -ffast-math\n"); + print_error("ERROR: astcenc must not be compiled with -ffast-math\n"); return 1; } else if (status != ASTCENC_SUCCESS) { - printf("ERROR: Init config failed with %s\n", astcenc_get_error_string(status)); + print_error("ERROR: Init config failed with %s\n", astcenc_get_error_string(status)); return 1; } @@ -668,7 +709,7 @@ static int edit_astcenc_config( argidx += 5; if (argidx > argc) { - printf("ERROR: -cw switch with less than 4 arguments\n"); + print_error("ERROR: -cw switch with less than 4 arguments\n"); return 1; } @@ -682,7 +723,7 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -a switch with no argument\n"); + print_error("ERROR: -a switch with no argument\n"); return 1; } @@ -693,13 +734,13 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -esw switch with no argument\n"); + print_error("ERROR: -esw switch with no argument\n"); return 1; } if (strlen(argv[argidx - 1]) != 4) { - printf("ERROR: -esw pattern does not contain 4 characters\n"); + print_error("ERROR: -esw pattern does not contain 4 characters\n"); return 1; } @@ -727,7 +768,7 @@ static int edit_astcenc_config( swizzle_components[i] = ASTCENC_SWZ_1; break; default: - printf("ERROR: -esw component '%c' is not valid\n", argv[argidx - 1][i]); + print_error("ERROR: -esw component '%c' is not valid\n", argv[argidx - 1][i]); return 1; } } @@ -737,18 +778,72 @@ static int edit_astcenc_config( cli_config.swz_encode.b = swizzle_components[2]; cli_config.swz_encode.a = swizzle_components[3]; } + else if (!strcmp(argv[argidx], "-ssw")) + { + argidx += 2; + if (argidx > argc) + { + print_error("ERROR: -ssw switch with no argument\n"); + return 1; + } + + size_t char_count = strlen(argv[argidx - 1]); + if (char_count == 0) + { + print_error("ERROR: -ssw pattern contains no characters\n"); + return 1; + } + + if (char_count > 4) + { + print_error("ERROR: -ssw pattern contains more than 4 characters\n"); + return 1; + } + + bool found_r = false; + bool found_g = false; + bool found_b = false; + bool found_a = false; + + for (size_t i = 0; i < char_count; i++) + { + switch (argv[argidx - 1][i]) + { + case 'r': + found_r = true; + break; + case 'g': + found_g = true; + break; + case 'b': + found_b = true; + break; + case 'a': + found_a = true; + break; + default: + print_error("ERROR: -ssw component '%c' is not valid\n", argv[argidx - 1][i]); + return 1; + } + } + + config.cw_r_weight = found_r ? 1.0f : 0.0f; + config.cw_g_weight = found_g ? 1.0f : 0.0f; + config.cw_b_weight = found_b ? 1.0f : 0.0f; + config.cw_a_weight = found_a ? 1.0f : 0.0f; + } else if (!strcmp(argv[argidx], "-dsw")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -dsw switch with no argument\n"); + print_error("ERROR: -dsw switch with no argument\n"); return 1; } if (strlen(argv[argidx - 1]) != 4) { - printf("ERROR: -dsw switch does not contain 4 characters\n"); + print_error("ERROR: -dsw switch does not contain 4 characters\n"); return 1; } @@ -779,7 +874,7 @@ static int edit_astcenc_config( swizzle_components[i] = ASTCENC_SWZ_Z; break; default: - printf("ERROR: ERROR: -dsw component '%c' is not valid\n", argv[argidx - 1][i]); + print_error("ERROR: ERROR: -dsw component '%c' is not valid\n", argv[argidx - 1][i]); return 1; } } @@ -790,10 +885,6 @@ static int edit_astcenc_config( cli_config.swz_decode.a = swizzle_components[3]; } // presets begin here - else if (!strcmp(argv[argidx], "-mask")) - { - argidx++; - } else if (!strcmp(argv[argidx], "-normal")) { argidx++; @@ -813,13 +904,17 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -rgbm switch with no argument\n"); + print_error("ERROR: -rgbm switch with no argument\n"); return 1; } config.rgbm_m_scale = static_cast(atof(argv[argidx - 1])); config.cw_a_weight = 2.0f * config.rgbm_m_scale; } + else if (!strcmp(argv[argidx], "-decode_unorm8")) + { + argidx++; + } else if (!strcmp(argv[argidx], "-perceptual")) { argidx++; @@ -837,7 +932,7 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -blockmodelimit switch with no argument\n"); + print_error("ERROR: -blockmodelimit switch with no argument\n"); return 1; } @@ -848,87 +943,131 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -partitioncountlimit switch with no argument\n"); + print_error("ERROR: -partitioncountlimit switch with no argument\n"); return 1; } config.tune_partition_count_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-partitionindexlimit")) + else if (!strcmp(argv[argidx], "-2partitionindexlimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -partitionindexlimit switch with no argument\n"); + print_error("ERROR: -2partitionindexlimit switch with no argument\n"); return 1; } - config.tune_partition_index_limit = atoi(argv[argidx - 1]); + config.tune_2partition_index_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-dblimit")) + else if (!strcmp(argv[argidx], "-3partitionindexlimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -dblimit switch with no argument\n"); + print_error("ERROR: -3partitionindexlimit switch with no argument\n"); return 1; } - if ((config.profile == ASTCENC_PRF_LDR) || (config.profile == ASTCENC_PRF_LDR_SRGB)) + config.tune_3partition_index_limit = atoi(argv[argidx - 1]); + } + else if (!strcmp(argv[argidx], "-4partitionindexlimit")) + { + argidx += 2; + if (argidx > argc) { - config.tune_db_limit = static_cast(atof(argv[argidx - 1])); + print_error("ERROR: -4partitionindexlimit switch with no argument\n"); + return 1; } + + config.tune_4partition_index_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-2partitionlimitfactor")) + else if (!strcmp(argv[argidx], "-2partitioncandidatelimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -2partitionlimitfactor switch with no argument\n"); + print_error("ERROR: -2partitioncandidatelimit switch with no argument\n"); return 1; } - config.tune_2_partition_early_out_limit_factor = static_cast(atof(argv[argidx - 1])); + config.tune_2partitioning_candidate_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-3partitionlimitfactor")) + else if (!strcmp(argv[argidx], "-3partitioncandidatelimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -3partitionlimitfactor switch with no argument\n"); + print_error("ERROR: -3partitioncandidatelimit switch with no argument\n"); return 1; } - config.tune_3_partition_early_out_limit_factor = static_cast(atof(argv[argidx - 1])); + config.tune_3partitioning_candidate_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-2planelimitcorrelation")) + else if (!strcmp(argv[argidx], "-4partitioncandidatelimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -2planelimitcorrelation switch with no argument\n"); + print_error("ERROR: -4partitioncandidatelimit switch with no argument\n"); return 1; } - config.tune_2_plane_early_out_limit_correlation = static_cast(atof(argv[argidx - 1])); + config.tune_4partitioning_candidate_limit = atoi(argv[argidx - 1]); } - else if (!strcmp(argv[argidx], "-lowweightmodelimit")) + else if (!strcmp(argv[argidx], "-dblimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -lowweightmodelimit switch with no argument\n"); + print_error("ERROR: -dblimit switch with no argument\n"); return 1; } - config.tune_low_weight_count_limit = atoi(argv[argidx - 1]); + if ((config.profile == ASTCENC_PRF_LDR) || (config.profile == ASTCENC_PRF_LDR_SRGB)) + { + config.tune_db_limit = static_cast(atof(argv[argidx - 1])); + } + } + else if (!strcmp(argv[argidx], "-2partitionlimitfactor")) + { + argidx += 2; + if (argidx > argc) + { + print_error("ERROR: -2partitionlimitfactor switch with no argument\n"); + return 1; + } + + config.tune_2partition_early_out_limit_factor = static_cast(atof(argv[argidx - 1])); + } + else if (!strcmp(argv[argidx], "-3partitionlimitfactor")) + { + argidx += 2; + if (argidx > argc) + { + print_error("ERROR: -3partitionlimitfactor switch with no argument\n"); + return 1; + } + + config.tune_3partition_early_out_limit_factor = static_cast(atof(argv[argidx - 1])); + } + else if (!strcmp(argv[argidx], "-2planelimitcorrelation")) + { + argidx += 2; + if (argidx > argc) + { + print_error("ERROR: -2planelimitcorrelation switch with no argument\n"); + return 1; + } + + config.tune_2plane_early_out_limit_correlation = static_cast(atof(argv[argidx - 1])); } else if (!strcmp(argv[argidx], "-refinementlimit")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -refinementlimit switch with no argument\n"); + print_error("ERROR: -refinementlimit switch with no argument\n"); return 1; } @@ -939,7 +1078,7 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -candidatelimit switch with no argument\n"); + print_error("ERROR: -candidatelimit switch with no argument\n"); return 1; } @@ -950,12 +1089,28 @@ static int edit_astcenc_config( argidx += 2; if (argidx > argc) { - printf("ERROR: -j switch with no argument\n"); + print_error("ERROR: -j switch with no argument\n"); return 1; } cli_config.thread_count = atoi(argv[argidx - 1]); } + else if (!strcmp(argv[argidx], "-repeats")) + { + argidx += 2; + if (argidx > argc) + { + print_error("ERROR: -repeats switch with no argument\n"); + return 1; + } + + cli_config.repeat_count = atoi(argv[argidx - 1]); + if (cli_config.repeat_count <= 0) + { + print_error("ERROR: -repeats value must be at least one\n"); + return 1; + } + } else if (!strcmp(argv[argidx], "-yflip")) { argidx++; @@ -966,7 +1121,7 @@ static int edit_astcenc_config( argidx += 3; if (argidx > argc) { - printf("ERROR: -mpsnr switch with less than 2 arguments\n"); + print_error("ERROR: -mpsnr switch with less than 2 arguments\n"); return 1; } @@ -974,24 +1129,24 @@ static int edit_astcenc_config( cli_config.high_fstop = atoi(argv[argidx - 1]); if (cli_config.high_fstop < cli_config.low_fstop) { - printf("ERROR: -mpsnr switch is greater than the \n"); + print_error("ERROR: -mpsnr switch is greater than the \n"); return 1; } } - // Option: Encode a 3D image from an array of 2D images. - else if (!strcmp(argv[argidx], "-array")) + // Option: Encode a 3D image from a sequence of 2D images. + else if (!strcmp(argv[argidx], "-zdim")) { // Only supports compressing if (!(operation & ASTCENC_STAGE_COMPRESS)) { - printf("ERROR: -array switch is only valid for compression\n"); + print_error("ERROR: -zdim switch is only valid for compression\n"); return 1; } // Image depth must be specified. if (argidx + 2 > argc) { - printf("ERROR: -array switch with no argument\n"); + print_error("ERROR: -zdim switch with no argument\n"); return 1; } argidx++; @@ -999,24 +1154,24 @@ static int edit_astcenc_config( // Read array size (image depth). if (!sscanf(argv[argidx], "%u", &cli_config.array_size) || cli_config.array_size == 0) { - printf("ERROR: -array size '%s' is invalid\n", argv[argidx]); + print_error("ERROR: -zdim size '%s' is invalid\n", argv[argidx]); return 1; } if ((cli_config.array_size > 1) && (config.block_z == 1)) { - printf("ERROR: -array with 3D input data for a 2D output format\n"); + print_error("ERROR: -zdim with 3D input data for a 2D output format\n"); return 1; } argidx++; } #if defined(ASTCENC_DIAGNOSTICS) - else if (!strcmp(argv[argidx], "-dtrace-out")) + else if (!strcmp(argv[argidx], "-dtrace")) { argidx += 2; if (argidx > argc) { - printf("ERROR: -dtrace-out switch with no argument\n"); + print_error("ERROR: -dtrace switch with no argument\n"); return 1; } @@ -1028,9 +1183,14 @@ static int edit_astcenc_config( argidx += 2; // skip 2 chatacters to get next parameter config.privateProfile = static_cast(atoi(argv[argidx - 1])); } + else if (!strcmp(argv[argidx], "-dimage")) + { + argidx += 1; + cli_config.diagnostic_images = true; + } else // check others as well { - printf("ERROR: Argument '%s' not recognized\n", argv[argidx]); + print_error("ERROR: Argument '%s' not recognized\n", argv[argidx]); return 1; } } @@ -1046,7 +1206,7 @@ static int edit_astcenc_config( if (!config.trace_file_path) { - printf("ERROR: Diagnostics builds must set -dtrace-out\n"); + print_error("ERROR: Diagnostics builds must set -dtrace\n"); return 1; } #endif @@ -1107,11 +1267,13 @@ static void print_astcenc_config( printf(" B component weight: %g\n", static_cast(config.cw_b_weight)); printf(" A component weight: %g\n", static_cast(config.cw_a_weight)); printf(" Partition cutoff: %u partitions\n", config.tune_partition_count_limit); - printf(" Partition index cutoff: %u partition ids\n", config.tune_partition_index_limit); + printf(" 2 partition index cutoff: %u partition ids\n", config.tune_2partition_index_limit); + printf(" 3 partition index cutoff: %u partition ids\n", config.tune_3partition_index_limit); + printf(" 4 partition index cutoff: %u partition ids\n", config.tune_4partition_index_limit); printf(" PSNR cutoff: %g dB\n", static_cast(config.tune_db_limit)); - printf(" 3 partition cutoff: %g\n", static_cast(config.tune_2_partition_early_out_limit_factor)); - printf(" 4 partition cutoff: %g\n", static_cast(config.tune_3_partition_early_out_limit_factor)); - printf(" 2 plane correlation cutoff: %g\n", static_cast(config.tune_2_plane_early_out_limit_correlation)); + printf(" 3 partition cutoff: %g\n", static_cast(config.tune_2partition_early_out_limit_factor)); + printf(" 4 partition cutoff: %g\n", static_cast(config.tune_3partition_early_out_limit_factor)); + printf(" 2 plane correlation cutoff: %g\n", static_cast(config.tune_2plane_early_out_limit_correlation)); printf(" Block mode centile cutoff: %g%%\n", static_cast(config.tune_block_mode_limit)); printf(" Candidate cutoff: %u candidates\n", config.tune_candidate_limit); printf(" Refinement cutoff: %u iterations\n", config.tune_refinement_limit); @@ -1213,6 +1375,30 @@ static void image_set_pixel( data[(4 * img.dim_x * y) + (4 * x + 3)] = pixel.lane<3>(); } +/** + * @brief Set the value of a single pixel in an image. + * + * @param[out] img The output image; must use F32 texture components. + * @param x The pixel x coordinate. + * @param y The pixel y coordinate. + * @param pixel The pixel color value to write. + */ +static void image_set_pixel_u8( + astcenc_image& img, + size_t x, + size_t y, + vint4 pixel +) { + // We should never escape bounds + assert(x < img.dim_x); + assert(y < img.dim_y); + assert(img.data_type == ASTCENC_TYPE_U8); + + uint8_t* data = static_cast(img.data[0]); + pixel = pack_low_bytes(pixel); + store_nbytes(pixel, data + (4 * img.dim_x * y) + (4 * x )); +} + /** * @brief Create a copy of @c input with forced unit-length normal vectors. * @@ -1342,6 +1528,365 @@ static void image_preprocess_premultiply( } } +/** + * @brief Populate a single diagnostic image showing aspects of the encoding. + * + * @param context The context to use. + * @param image The compressed image to analyze. + * @param diag_image The output visualization image to populate. + * @param texel_func The per-texel callback used to determine output color. + */ +static void print_diagnostic_image( + astcenc_context* context, + const astc_compressed_image& image, + astcenc_image& diag_image, + std::function texel_func +) { + size_t block_cols = (image.dim_x + image.block_x - 1) / image.block_x; + size_t block_rows = (image.dim_y + image.block_y - 1) / image.block_y; + + uint8_t* data = image.data; + for (size_t block_y = 0; block_y < block_rows; block_y++) + { + for (size_t block_x = 0; block_x < block_cols; block_x++) + { + astcenc_block_info block_info; + astcenc_get_block_info(context, data, &block_info); + data += 16; + + size_t start_row = block_y * image.block_y; + size_t start_col = block_x * image.block_x; + + size_t end_row = astc::min(start_row + image.block_y, static_cast(image.dim_y)); + size_t end_col = astc::min(start_col + image.block_x, static_cast(image.dim_x)); + + for (size_t texel_y = start_row; texel_y < end_row; texel_y++) + { + for (size_t texel_x = start_col; texel_x < end_col; texel_x++) + { + vint4 color = texel_func(block_info, texel_x - start_col, texel_y - start_row); + image_set_pixel_u8(diag_image, texel_x, texel_y, color); + } + } + } + } +} + +/** + * @brief Print a set of diagnostic images showing aspects of the encoding. + * + * @param context The context to use. + * @param image The compressed image to analyze. + * @param output_file The output file name to use as a stem for new names. + */ +static void print_diagnostic_images( + astcenc_context* context, + const astc_compressed_image& image, + const std::string& output_file +) { + if (image.dim_z != 1) + { + return; + } + + // Try to find a file extension we know about + size_t index = output_file.find_last_of("."); + std::string stem = output_file; + if (index != std::string::npos) + { + stem = stem.substr(0, index); + } + + auto diag_image = alloc_image(8, image.dim_x, image.dim_y, image.dim_z); + + // ---- ---- ---- ---- Partitioning ---- ---- ---- ---- + auto partition_func = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + const vint4 colors[] { + vint4( 0, 0, 0, 255), + vint4(255, 0, 0, 255), + vint4( 0, 255, 0, 255), + vint4( 0, 0, 255, 255), + vint4(255, 255, 255, 255) + }; + + size_t texel_index = texel_y * info.block_x + texel_x; + + int partition { 0 }; + if (!info.is_constant_block) + { + partition = info.partition_assignment[texel_index] + 1; + } + + return colors[partition]; + }; + + print_diagnostic_image(context, image, *diag_image, partition_func); + std::string fname = stem + "_diag_partitioning.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Weight planes ---- ---- ---- ---- + auto texel_func1 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + const vint4 colors[] { + vint4( 0, 0, 0, 255), + vint4(255, 0, 0, 255), + vint4( 0, 255, 0, 255), + vint4( 0, 0, 255, 255), + vint4(255, 255, 255, 255) + }; + + int component { 0 }; + if (info.is_dual_plane_block) + { + component = info.dual_plane_component + 1; + } + + return colors[component]; + }; + + print_diagnostic_image(context, image, *diag_image, texel_func1); + fname = stem + "_diag_weight_plane2.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Weight density ---- ---- ---- ---- + auto texel_func2 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + float density = 0.0f; + if (!info.is_constant_block) + { + float texel_count = static_cast(info.block_x * info.block_y); + float weight_count = static_cast(info.weight_x * info.weight_y); + density = weight_count / texel_count; + } + + int densityi = static_cast(255.0f * density); + return vint4(densityi, densityi, densityi, 255); + }; + + print_diagnostic_image(context, image, *diag_image, texel_func2); + fname = stem + "_diag_weight_density.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Weight quant ---- ---- ---- ---- + auto texel_func3 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + int quant { 0 }; + if (!info.is_constant_block) + { + quant = info.weight_level_count - 1; + } + + return vint4(quant, quant, quant, 255); + }; + + print_diagnostic_image(context, image, *diag_image, texel_func3); + fname = stem + "_diag_weight_quant.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Color quant ---- ---- ---- ---- + auto texel_func4 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + int quant { 0 }; + if (!info.is_constant_block) + { + quant = info.color_level_count - 1; + } + + return vint4(quant, quant, quant, 255); + }; + + print_diagnostic_image(context, image, *diag_image, texel_func4); + fname = stem + "_diag_color_quant.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Color endpoint mode: Index ---- ---- ---- ---- + auto texel_func5 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + size_t texel_index = texel_y * info.block_x + texel_x; + + int cem { 255 }; + if (!info.is_constant_block) + { + uint8_t partition = info.partition_assignment[texel_index]; + cem = info.color_endpoint_modes[partition] * 16; + } + + return vint4(cem, cem, cem, 255); + }; + + print_diagnostic_image(context, image, *diag_image, texel_func5); + fname = stem + "_diag_cem_index.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Color endpoint mode: Components ---- ---- ---- ---- + auto texel_func6 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + const vint4 colors[] { + vint4( 0, 0, 0, 255), + vint4(255, 0, 0, 255), + vint4( 0, 255, 0, 255), + vint4( 0, 0, 255, 255), + vint4(255, 255, 255, 255) + }; + + size_t texel_index = texel_y * info.block_x + texel_x; + + int components { 0 }; + if (!info.is_constant_block) + { + uint8_t partition = info.partition_assignment[texel_index]; + uint8_t cem = info.color_endpoint_modes[partition]; + + switch (cem) + { + case 0: + case 1: + case 2: + case 3: + components = 1; + break; + case 4: + case 5: + components = 2; + break; + case 6: + case 7: + case 8: + case 9: + case 11: + components = 3; + break; + default: + components = 4; + break; + } + } + + return colors[components]; + }; + + print_diagnostic_image(context, image, *diag_image, texel_func6); + fname = stem + "_diag_cem_components.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Color endpoint mode: Style ---- ---- ---- ---- + auto texel_func7 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + const vint4 colors[] { + vint4( 0, 0, 0, 255), + vint4(255, 0, 0, 255), + vint4( 0, 255, 0, 255), + vint4( 0, 0, 255, 255), + }; + + size_t texel_index = texel_y * info.block_x + texel_x; + + int style { 0 }; + if (!info.is_constant_block) + { + uint8_t partition = info.partition_assignment[texel_index]; + uint8_t cem = info.color_endpoint_modes[partition]; + + switch (cem) + { + // Direct - two absolute endpoints + case 0: + case 1: + case 2: + case 3: + case 4: + case 8: + case 11: + case 12: + case 14: + case 15: + style = 1; + break; + // Offset - one absolute plus delta + case 5: + case 9: + case 13: + style = 2; + break; + // Scale - one absolute plus scale + case 6: + case 7: + case 10: + style = 3; + break; + // Shouldn't happen ... + default: + style = 0; + break; + } + } + + return colors[style]; + }; + + print_diagnostic_image(context, image, *diag_image, texel_func7); + fname = stem + "_diag_cem_style.png"; + store_ncimage(diag_image, fname.c_str(), false); + + // ---- ---- ---- ---- Color endpoint mode: Style ---- ---- ---- ---- + auto texel_func8 = [](astcenc_block_info& info, size_t texel_x, size_t texel_y) { + (void)texel_x; + (void)texel_y; + + size_t texel_index = texel_y * info.block_x + texel_x; + + int style { 0 }; + if (!info.is_constant_block) + { + uint8_t partition = info.partition_assignment[texel_index]; + uint8_t cem = info.color_endpoint_modes[partition]; + + switch (cem) + { + // LDR blocks + case 0: + case 1: + case 4: + case 5: + case 6: + case 8: + case 9: + case 10: + case 12: + case 13: + style = 128; + break; + // HDR blocks + default: + style = 155; + break; + } + } + + return vint4(style, style, style, 255); + }; + + print_diagnostic_image(context, image, *diag_image, texel_func8); + fname = stem + "_diag_cem_hdr.png"; + store_ncimage(diag_image, fname.c_str(), false); + + free_image(diag_image); +} + #if QUALITY_CONTROL constexpr double MAX_PSNR = 99.9; constexpr double MAX_VALUE = 255; @@ -1397,7 +1942,7 @@ bool CheckQuality(int32_t* mseIn[RGBA_COM], int blockNum, int blockXYZ) * * @return 0 on success, non-zero otherwise. */ -int main( +int astcenc_main( int argc, char **argv ) { @@ -1429,19 +1974,18 @@ int main( break; } - std::string input_filename = argc >= 3 ? argv[2] : ""; std::string output_filename = argc >= 4 ? argv[3] : ""; if (input_filename.empty()) { - printf("ERROR: Input file not specified\n"); + print_error("ERROR: Input file not specified\n"); return 1; } if (output_filename.empty()) { - printf("ERROR: Output file not specified\n"); + print_error("ERROR: Output file not specified\n"); return 1; } @@ -1481,7 +2025,7 @@ int main( } else { - printf("ERROR: Unknown compressed input file type\n"); + print_error("ERROR: Unknown compressed input file type\n"); return 1; } } @@ -1495,7 +2039,7 @@ int main( } // Initialize cli_config_options with default values - cli_config_options cli_config { 0, 1, false, false, -10, 10, + cli_config_options cli_config { 0, 1, 1, false, false, false, -10, 10, { ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A }, { ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A } }; @@ -1505,16 +2049,46 @@ int main( return 1; } + // Enable progress callback if not in silent mode and using a terminal + #if defined(_WIN32) + int stdoutfno = _fileno(stdout); + #else + int stdoutfno = STDOUT_FILENO; + #endif + + if ((!cli_config.silentmode) && isatty(stdoutfno)) + { + config.progress_callback = progress_emitter; + } + astcenc_image* image_uncomp_in = nullptr ; unsigned int image_uncomp_in_component_count = 0; bool image_uncomp_in_is_hdr = false; astcenc_image* image_decomp_out = nullptr; + // Determine decompression output bitness, if limited by file type + int out_bitness = 0; + if (operation & ASTCENC_STAGE_DECOMPRESS) + { + out_bitness = get_output_filename_enforced_bitness(output_filename.c_str()); + if (out_bitness == 0) + { + bool is_hdr = (config.profile == ASTCENC_PRF_HDR) || + (config.profile == ASTCENC_PRF_HDR_RGB_LDR_A); + out_bitness = is_hdr ? 16 : 8; + } + + // If decompressed output is unorm8 then force the decode_unorm8 heuristics for compression + if (out_bitness == 8) + { + config.flags |= ASTCENC_FLG_USE_DECODE_UNORM8; + } + } + // TODO: Handle RAII resources so they get freed when out of scope astcenc_error codec_status; astcenc_context* codec_context; - // Preflight - check we have valid extensions for storing a file if (operation & ASTCENC_STAGE_ST_NCOMP) { @@ -1523,7 +2097,7 @@ int main( { const char *eptr = strrchr(output_filename.c_str(), '.'); eptr = eptr ? eptr : ""; - printf("ERROR: Unknown uncompressed output file type '%s'\n", eptr); + print_error("ERROR: Unknown uncompressed output file type '%s'\n", eptr); return 1; } } @@ -1540,7 +2114,7 @@ int main( { const char *eptr = strrchr(output_filename.c_str(), '.'); eptr = eptr ? eptr : ""; - printf("ERROR: Unknown compressed output file type '%s'\n", eptr); + print_error("ERROR: Unknown compressed output file type '%s'\n", eptr); return 1; } } @@ -1548,7 +2122,7 @@ int main( codec_status = astcenc_context_alloc(&config, cli_config.thread_count, &codec_context); if (codec_status != ASTCENC_SUCCESS) { - printf("ERROR: Codec context alloc failed: %s\n", astcenc_get_error_string(codec_status)); + print_error("ERROR: Codec context alloc failed: %s\n", astcenc_get_error_string(codec_status)); return 1; } @@ -1560,7 +2134,7 @@ int main( image_uncomp_in_is_hdr, image_uncomp_in_component_count); if (!image_uncomp_in) { - printf ("ERROR: Failed to load uncompressed image file\n"); + print_error("ERROR: Failed to load uncompressed image file\n"); return 1; } @@ -1575,7 +2149,7 @@ int main( image_uncomp_in->dim_z); if (!image_pp) { - printf ("ERROR: Failed to allocate preprocessed image\n"); + print_error("ERROR: Failed to allocate preprocessed image\n"); return 1; } @@ -1615,8 +2189,6 @@ int main( } } - double start_coding_time = get_time(); - double image_size = 0.0; if (image_uncomp_in) { @@ -1632,6 +2204,8 @@ int main( } // Compress an image + double best_compression_time = 100000.0; + double total_compression_time = 0.0; if (operation & ASTCENC_STAGE_COMPRESS) { print_astcenc_config(cli_config, config); @@ -1665,24 +2239,47 @@ int main( #endif // Only launch worker threads for multi-threaded use - it makes basic // single-threaded profiling and debugging a little less convoluted - if (cli_config.thread_count > 1) + double start_compression_time = get_time(); + for (unsigned int i = 0; i < cli_config.repeat_count; i++) { - launch_threads(cli_config.thread_count, compression_workload_runner, &work); - } - else - { - work.error = astcenc_compress_image( - work.context, work.image, &work.swizzle, - work.data_out, work.data_len, + if (config.progress_callback) + { + printf("Compression\n"); + printf("===========\n"); + printf("\n"); + } + + double start_iter_time = get_time(); + if (cli_config.thread_count > 1) + { + launch_threads("Compression", cli_config.thread_count, compression_workload_runner, &work); + } + else + { + work.error = astcenc_compress_image( + work.context, work.image, &work.swizzle, + work.data_out, work.data_len, #if QUALITY_CONTROL - work.calQualityEnable, work.mse, + work.calQualityEnable, work.mse, #endif - 0); + 0); + } + + astcenc_compress_reset(codec_context); + + if (config.progress_callback) + { + printf("\n\n"); + } + + double iter_time = get_time() - start_iter_time; + best_compression_time = astc::min(iter_time, best_compression_time); } + total_compression_time = get_time() - start_compression_time; if (work.error != ASTCENC_SUCCESS) { - printf("ERROR: Codec compress failed: %s\n", astcenc_get_error_string(work.error)); + print_error("ERROR: Codec compress failed: %s\n", astcenc_get_error_string(work.error)); return 1; } #if QUALITY_CONTROL @@ -1708,15 +2305,10 @@ int main( } // Decompress an image + double best_decompression_time = 100000.0; + double total_decompression_time = 0.0; if (operation & ASTCENC_STAGE_DECOMPRESS) { - int out_bitness = get_output_filename_enforced_bitness(output_filename.c_str()); - if (out_bitness == 0) - { - bool is_hdr = (config.profile == ASTCENC_PRF_HDR) || (config.profile == ASTCENC_PRF_HDR_RGB_LDR_A); - out_bitness = is_hdr ? 16 : 8; - } - image_decomp_out = alloc_image( out_bitness, image_comp.dim_x, image_comp.dim_y, image_comp.dim_z); @@ -1730,27 +2322,42 @@ int main( // Only launch worker threads for multi-threaded use - it makes basic // single-threaded profiling and debugging a little less convoluted - if (cli_config.thread_count > 1) - { - launch_threads(cli_config.thread_count, decompression_workload_runner, &work); - } - else + double start_decompression_time = get_time(); + for (unsigned int i = 0; i < cli_config.repeat_count; i++) { - work.error = astcenc_decompress_image( - work.context, work.data, work.data_len, - work.image_out, &work.swizzle, 0); + double start_iter_time = get_time(); + if (cli_config.thread_count > 1) + { + launch_threads("Decompression", cli_config.thread_count, decompression_workload_runner, &work); + } + else + { + work.error = astcenc_decompress_image( + work.context, work.data, work.data_len, + work.image_out, &work.swizzle, 0); + } + + astcenc_decompress_reset(codec_context); + + double iter_time = get_time() - start_iter_time; + best_decompression_time = astc::min(iter_time, best_decompression_time); } + total_decompression_time = get_time() - start_decompression_time; if (work.error != ASTCENC_SUCCESS) { - printf("ERROR: Codec decompress failed: %s\n", astcenc_get_error_string(codec_status)); + print_error("ERROR: Codec decompress failed: %s\n", astcenc_get_error_string(codec_status)); return 1; } } - double end_coding_time = get_time(); +#if defined(_WIN32) + bool is_null = output_filename == "NUL" || output_filename == "nul"; +#else + bool is_null = output_filename == "/dev/null"; +#endif - // Print metrics in comparison mode + // Print metrics in comparison mode if (operation & ASTCENC_STAGE_COMPARE) { bool is_normal_map = config.flags & ASTCENC_FLG_MAP_NORMAL; @@ -1768,7 +2375,7 @@ int main( error = store_cimage(image_comp, output_filename.c_str()); if (error) { - printf ("ERROR: Failed to store compressed image\n"); + print_error("ERROR: Failed to store compressed image\n"); return 1; } } @@ -1778,20 +2385,15 @@ int main( error = store_ktx_compressed_image(image_comp, output_filename.c_str(), srgb); if (error) { - printf ("ERROR: Failed to store compressed image\n"); + print_error("ERROR: Failed to store compressed image\n"); return 1; } } else { -#if defined(_WIN32) - bool is_null = output_filename == "NUL" || output_filename == "nul"; -#else - bool is_null = output_filename == "/dev/null"; -#endif if (!is_null) { - printf("ERROR: Unknown compressed output file type\n"); + print_error("ERROR: Unknown compressed output file type\n"); return 1; } } @@ -1800,24 +2402,24 @@ int main( // Store decompressed image if (operation & ASTCENC_STAGE_ST_NCOMP) { -#if defined(_WIN32) - bool is_null = output_filename == "NUL" || output_filename == "nul"; -#else - bool is_null = output_filename == "/dev/null"; -#endif - if (!is_null) { bool store_result = store_ncimage(image_decomp_out, output_filename.c_str(), cli_config.y_flip); if (!store_result) { - printf("ERROR: Failed to write output image %s\n", output_filename.c_str()); + print_error("ERROR: Failed to write output image %s\n", output_filename.c_str()); return 1; } } } + // Store diagnostic images + if (cli_config.diagnostic_images && !is_null) + { + print_diagnostic_images(codec_context, image_comp, output_filename); + } + free_image(image_uncomp_in); free_image(image_decomp_out); astcenc_context_free(codec_context); @@ -1827,14 +2429,30 @@ int main( if ((operation & ASTCENC_STAGE_COMPARE) || (!cli_config.silentmode)) { double end_time = get_time(); - double tex_rate = image_size / (end_coding_time - start_coding_time); - tex_rate = tex_rate / 1000000.0; + + double repeats = static_cast(cli_config.repeat_count); + double avg_compression_time = total_compression_time / repeats; + double avg_decompression_time = total_decompression_time / repeats; + double total_time = (end_time - start_time) - ((repeats - 1.0) * avg_compression_time) - ((repeats - 1.0) * avg_decompression_time); printf("Performance metrics\n"); printf("===================\n\n"); - printf(" Total time: %8.4f s\n", end_time - start_time); - printf(" Coding time: %8.4f s\n", end_coding_time - start_coding_time); - printf(" Coding rate: %8.4f MT/s\n", tex_rate); + printf(" Total time: %8.4f s\n", total_time); + + if (operation & ASTCENC_STAGE_COMPRESS) + { + double compression_rate = image_size / (best_compression_time * 1000000.0); + + printf(" Coding time: %8.4f s\n", best_compression_time); + printf(" Coding rate: %8.4f MT/s\n", compression_rate); + } + + if (operation & ASTCENC_STAGE_DECOMPRESS) + { + double decompression_rate = image_size / (best_decompression_time * 1000000.0); + printf(" Decoding time: %8.4f s\n", best_decompression_time); + printf(" Decoding rate: %8.4f MT/s\n", decompression_rate); + } } return 0; diff --git a/Source/astcenccli_toplevel_help.cpp b/Source/astcenccli_toplevel_help.cpp index 2ce0d10181035c92cec18420aea8931064615c34..a21750be971d9077c517166b652de6c463af8f12 100644 --- a/Source/astcenccli_toplevel_help.cpp +++ b/Source/astcenccli_toplevel_help.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2011-2022 Arm Limited +// Copyright 2011-2023 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -25,7 +25,7 @@ /** @brief The version header. */ static const char *astcenc_copyright_string = R"(astcenc v%s, %u-bit %s%s%s -Copyright 2011-%s Arm Limited, all rights reserved +Copyright (c) 2011-%s Arm Limited. All rights reserved. )"; /** @brief The short-form help text. */ @@ -138,14 +138,15 @@ COMPRESSION The quality level configures the quality-performance tradeoff for the compressor; more complete searches of the search space improve image quality at the expense of compression time. The quality level - can be set to any value between 0 (fastest) and 100 (thorough), or - to a fixed quality preset: + can be set to any value between 0 (fastest) and 100 (exhaustive), + or to a fixed quality preset: - -fastest (equivalent to quality = 0) - -fast (equivalent to quality = 10) - -medium (equivalent to quality = 60) - -thorough (equivalent to quality = 98) - -exhaustive (equivalent to quality = 100) + -fastest (equivalent to quality = 0) + -fast (equivalent to quality = 10) + -medium (equivalent to quality = 60) + -thorough (equivalent to quality = 98) + -verythorough (equivalent to quality = 99) + -exhaustive (equivalent to quality = 100) For compression of production content we recommend using a quality level equivalent to -medium or higher. @@ -158,11 +159,17 @@ COMPRESSION to consider for common usage, based on the type of image data being compressed. - -mask - The input texture is a mask texture with unrelated data stored - in the various color components, so enable error heuristics that - aim to improve quality by minimizing the effect of error - cross-talk across the color components. + -decode_unorm8 + Indicate that an LDR compressed texture will be used with + the decode_unorm8 extension behavior, instead of the default + decode_unorm16 decompression. + + Matching the decode mode used during compression to the mode + used at runtime will improve image quality as the compressor + can ensure that rounding goes the right way. + + This mode is used automatically if you decompress to an 8-bit + per component output image format. -normal The input texture is a three component linear LDR normal map @@ -175,6 +182,9 @@ COMPRESSION nml.xy = nml.xy * 2.0 - 1.0; // Unpack to [-1,1] nml.z = sqrt(1 - dot(nml.xy, nml.xy)); // Compute Z + Alternative component swizzles can be set with -esw and -dsw + parameters. + -rgbm The input texture is an RGBM encoded texture, storing values HDR values between 0 and in an LDR container format with a @@ -193,8 +203,8 @@ COMPRESSION typically lowers the measured PSNR score. Perceptual methods are currently only available for normal maps and RGB color data. - -array - Loads an array of 2D image slices to use as a 3D image. + -zdim + Load a sequence of 2D image slices to use as a 3D image. The input filename given is used is decorated with the postfix "_" to find the file to load. For example, an input named "input.png" would load as input_0.png, input_1.png, etc. @@ -270,53 +280,71 @@ ADVANCED COMPRESSION Higher numbers give better quality, as more complex blocks can be encoded, but will increase search time. Preset defaults are: - -fastest : 2 - -fast : 3 - -medium : 4 - -thorough : 4 - -exhaustive : 4 - - -partitionindexlimit - Test block partition indices for each partition count. - Higher numbers give better quality, however large values give - diminishing returns especially for smaller block sizes. Preset - defaults are: - - -fastest : 8 - -fast : 12 - -medium : 26 - -thorough : 76 - -exhaustive : 1024 + -fastest : 2 + -fast : 3 + -medium : 4 + -thorough : 4 + -verythorough : 4 + -exhaustive : 4 + + -[2|3|4]partitionindexlimit + Estimate errors for block partition indices for this + partition count. Higher numbers give better quality, however + large values give diminishing returns especially for smaller + block sizes. Preset defaults are: + + -fastest : 10 | 6 | 4 + -fast : 18 | 10 | 8 + -medium : 34 | 28 | 16 + -thorough : 82 | 60 | 30 + -verythorough : 256 | 128 | 64 + -exhaustive : 512 | 512 | 512 + + -[2|3|4]partitioncandidatelimit + Calculate errors for block partition indices for this + partition count. Higher numbers give better quality, however + large values give diminishing returns especially for smaller + block sizes. Preset defaults are: + + -fastest : 2 | 2 | 2 + -fast : 2 | 2 | 2 + -medium : 2 | 2 | 2 + -thorough : 3 | 2 | 2 + -verythorough : 20 | 14 | 8 + -exhaustive : 32 | 32 | 32 -blockmodelimit Test block modes below usage centile in an empirically determined distribution of block mode frequency. This option is ineffective for 3D textures. Preset defaults are: - -fastest : 40 - -fast : 55 - -medium : 76 - -thorough : 93 - -exhaustive : 100 + -fastest : 43 + -fast : 55 + -medium : 77 + -thorough : 94 + -verythorough : 98 + -exhaustive : 100 - -refinementlimit - Iterate only refinement iterations on colors and + -refinementlimit + Iterate refinement iterations on colors and weights. Minimum value is 1. Preset defaults are: - -fastest : 2 - -fast : 3 - -medium : 3 - -thorough : 4 - -exhaustive : 4 + -fastest : 2 + -fast : 3 + -medium : 3 + -thorough : 4 + -verythorough : 4 + -exhaustive : 4 - -candidatelimit - Trial only candidate encodings for each block mode: + -candidatelimit + Trial candidate encodings for each block mode: - -fastest : 2 - -fast : 3 - -medium : 3 - -thorough : 4 - -exhaustive : 4 + -fastest : 2 + -fast : 3 + -medium : 3 + -thorough : 4 + -verythorough : 6 + -exhaustive : 8 -dblimit Stop compression work on a block as soon as the PSNR of the @@ -324,37 +352,26 @@ ADVANCED COMPRESSION ineffective for HDR textures. Preset defaults, where N is the number of texels in a block, are: - -fastest : MAX(63-19*log10(N), 85-35*log10(N)) - -fast : MAX(63-19*log10(N), 85-35*log10(N)) - -medium : MAX(70-19*log10(N), 95-35*log10(N)) - -thorough : MAX(77-19*log10(N), 105-35*log10(N)) - -exhaustive : 999 + -fastest : MAX(63-19*log10(N), 85-35*log10(N)) + -fast : MAX(63-19*log10(N), 85-35*log10(N)) + -medium : MAX(70-19*log10(N), 95-35*log10(N)) + -thorough : MAX(77-19*log10(N), 105-35*log10(N)) + -verythorough : 999 + -exhaustive : 999 - -2partitionlimitfactor + -[2|3]partitionlimitfactor Stop compression work on a block after only testing blocks with - up to two partitions and one plane of weights, unless the two + up to 2/3 partitions and one plane of weights, unless the 2/3 partition error term is lower than the error term from encoding - with one partition by more than the specified factor. Preset + with 1/2 partitions by more than the specified factor. Preset defaults are: - -fastest : 1.0 - -fast : 1.0 - -medium : 1.2 - -thorough : 2.5 - -exhaustive : 10.0 - - -3partitionlimitfactor - Stop compression work on a block after only testing blocks with - up to three partitions and one plane of weights, unless the three - partition error term is lower than the error term from encoding - with two partitions by more than the specified factor. Preset - defaults are: - - -fastest : 1.00 - -fast : 1.10 - -medium : 1.25 - -thorough : 1.25 - -exhaustive : 10.00 + -fastest : 1.00 | 1.00 + -fast : 1.00 | 1.00 + -medium : 1.10 | 1.05 + -thorough : 1.35 | 1.15 + -verythrorough : 1.60 | 1.40 + -exhaustive : 2.00 | 2.00 -2planelimitcorrelation Stop compression after testing only one plane of weights, unless @@ -362,53 +379,57 @@ ADVANCED COMPRESSION components is below this factor. This option is ineffective for normal maps. Preset defaults are: - -fastest : 0.50 - -fast : 0.65 - -medium : 0.85 - -thorough : 0.95 - -exhaustive : 0.99 - - -lowweightmodelimit - Use a simpler weight search for weight counts less than or - equal to this threshold. Preset defaults are bitrate dependent: - - -fastest : 25 - -fast : 20 - -medium : 16 - -thorough : 12 - -exhaustive : 0 - + -fastest : 0.50 + -fast : 0.65 + -medium : 0.85 + -thorough : 0.95 + -verythorough : 0.98 + -exhaustive : 0.99 +)" +// This split in the literals is needed for Visual Studio; the compiler +// will concatenate these two strings together ... +R"( Other options ------------- -esw - Swizzle the color components before compression. The swizzle is - specified using a 4-character string, which defines the output - format ordering. The characters may be taken from the set - [rgba01], selecting either input color components or a literal - zero or one. For example to swap the RG components, and replace - alpha with 1, the swizzle 'grb1' should be used. + Specify an encoding swizzle to reorder the color components + before compression. The swizzle is specified using a four + character string, which defines the format ordering used by + the compressor. - The input swizzle takes place before any compression, and all - error weighting applied using the -cw option is applied to the - post-swizzle component ordering. + The characters may be taken from the set [rgba01], selecting + either input color components or a literal zero or one. For + example to swap the RG components, and replace alpha with 1, + the swizzle 'grb1' should be used. By default all 4 post-swizzle components are included in the - error metrics during compression. When using -esw to map two + compression error metrics. When using -esw to map two component data to the L+A endpoint (e.g. -esw rrrg) the luminance data stored in the RGB components will be weighted 3 times more strongly than the alpha component. This can be - corrected using the -cw option to zero the weights of unused - components; e.g. using -cw 1 0 0 1. + corrected using the -ssw option to specify which components + will be sampled at runtime e.g. -ssw ra. + + -ssw + Specify a sampling swizzle to identify which color components + are actually read by the application shader program. For example, + using -ssw ra tells the compressor that the green and blue error + does not matter because the data is not actually read. + + The sampling swizzle is based on the channel ordering after the + -esw transform has been applied. Note -ssw exposes the same + functionality as -cw, but in a more user-friendly form. -dsw - Swizzle the color components after decompression. The swizzle is - specified using the same method as the -esw option, with support - for an additional "z" character. This is used to specify that - the compressed data stores an X+Y normal map, and that the Z - output component should be reconstructed from the two components - stored in the data. For the typical ASTC normal encoding, which - uses an 'rrrg' compression swizzle, you should specify an 'raz1' + Specify a decompression swizzle used to reorder the color + components after decompression. The swizzle is specified using + the same method as the -esw option, with support for an extra + "z" character. This is used to specify that the compressed data + stores an X+Y normal map, and that the Z output component + should be reconstructed from the two components stored in the + data. For the typical ASTC normal encoding, which uses an + 'rrrg' compression swizzle, you should specify an 'raz1' swizzle for decompression. -yflip @@ -527,7 +548,7 @@ QUICK REFERENCE astcenc {-tl|-ts|-th|-tH} [options] Mode -*l = linear LDR, -*s = sRGB LDR, -*h = HDR RGB/LDR A, -*H = HDR. - Quality = -fastest/-fast/-medium/-thorough/-exhaustive/a float [0-100]. + Quality = -fastest/-fast/-medium/-thorough/-verythorough/-exhaustive/a float [0-100]. )"; /* See header for documentation. */ diff --git a/Source/cmake_core.cmake b/Source/cmake_core.cmake index 067ab192d6f7a1cd38d445393951308efd7fde3b..3c85acc1ff43b7104a04e5c25691780cfe3353ba 100644 --- a/Source/cmake_core.cmake +++ b/Source/cmake_core.cmake @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ---------------------------------------------------------------------------- -# Copyright 2020-2022 Arm Limited +# Copyright 2020-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -15,18 +15,32 @@ # under the License. # ---------------------------------------------------------------------------- -if(${UNIVERSAL_BUILD}) - set(ASTC_TARGET astc${CODEC}) -else() - set(ASTC_TARGET astc${CODEC}-${ISA_SIMD}) -endif() +set(ASTCENC_TARGET astc${ASTCENC_CODEC}-${ASTCENC_ISA_SIMD}) -project(${ASTC_TARGET}) +project(${ASTCENC_TARGET}) -set(GNU_LIKE "GNU,Clang,AppleClang") -set(CLANG_LIKE "Clang,AppleClang") +# On CMake 3.25 or older CXX_COMPILER_FRONTEND_VARIANT is not always set +if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "") + set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "${CMAKE_CXX_COMPILER_ID}") +endif() -add_library(${ASTC_TARGET}-static +# Compiler accepts MSVC-style command line options +set(is_msvc_fe "$") +# Compiler accepts GNU-style command line options +set(is_gnu_fe1 "$") +# Compiler accepts AppleClang-style command line options, which is also GNU-style +set(is_gnu_fe2 "$") +# Compiler accepts GNU-style command line options +set(is_gnu_fe "$") + +# Compiler is Visual Studio cl.exe +set(is_msvccl "$>") +# Compiler is Visual Studio clangcl.exe +set(is_clangcl "$>") +# Compiler is upstream clang with the standard frontend +set(is_clang "$>") + +add_library(${ASTCENC_TARGET}-static STATIC astcenc_averages_and_directions.cpp astcenc_block_sizes.cpp @@ -46,19 +60,55 @@ add_library(${ASTC_TARGET}-static astcenc_partition_tables.cpp astcenc_percentile_tables.cpp astcenc_pick_best_endpoint_format.cpp - astcenc_platform_isa_detection.cpp astcenc_quantization.cpp astcenc_symbolic_physical.cpp astcenc_weight_align.cpp astcenc_weight_quant_xfer_tables.cpp) -target_include_directories(${ASTC_TARGET}-static +target_include_directories(${ASTCENC_TARGET}-static PUBLIC $ $) -if(${CLI}) - add_executable(${ASTC_TARGET} +if(${ASTCENC_SHAREDLIB}) + add_library(${ASTCENC_TARGET}-shared + SHARED + astcenc_averages_and_directions.cpp + astcenc_block_sizes.cpp + astcenc_color_quantize.cpp + astcenc_color_unquantize.cpp + astcenc_compress_symbolic.cpp + astcenc_compute_variance.cpp + astcenc_decompress_symbolic.cpp + astcenc_diagnostic_trace.cpp + astcenc_entry.cpp + astcenc_find_best_partitioning.cpp + astcenc_ideal_endpoints_and_weights.cpp + astcenc_image.cpp + astcenc_integer_sequence.cpp + astcenc_mathlib.cpp + astcenc_mathlib_softfloat.cpp + astcenc_partition_tables.cpp + astcenc_percentile_tables.cpp + astcenc_pick_best_endpoint_format.cpp + astcenc_quantization.cpp + astcenc_symbolic_physical.cpp + astcenc_weight_align.cpp + astcenc_weight_quant_xfer_tables.cpp) + + target_include_directories(${ASTCENC_TARGET}-shared + PUBLIC + $ + $) +endif() + +if(${ASTCENC_CLI}) + # Veneer is compiled without any extended ISA so we can safely do + # ISA compatability checks without triggering a SIGILL + add_library(${ASTCENC_TARGET}-veneer + astcenccli_entry.cpp) + + add_executable(${ASTCENC_TARGET} astcenccli_error_metrics.cpp astcenccli_image.cpp astcenccli_image_external.cpp @@ -67,220 +117,313 @@ if(${CLI}) astcenccli_toplevel.cpp astcenccli_toplevel_help.cpp) - target_link_libraries(${ASTC_TARGET} + target_link_libraries(${ASTCENC_TARGET} PRIVATE - ${ASTC_TARGET}-static) + ${ASTCENC_TARGET}-veneer + ${ASTCENC_TARGET}-static) endif() -macro(astcenc_set_properties NAME) +macro(astcenc_set_properties ASTCENC_TARGET_NAME ASTCENC_IS_VENEER) - target_compile_features(${NAME} + target_compile_features(${ASTCENC_TARGET_NAME} PRIVATE cxx_std_14) - target_compile_definitions(${NAME} + target_compile_definitions(${ASTCENC_TARGET_NAME} PRIVATE - # MSVC defines - $<$:_CRT_SECURE_NO_WARNINGS>) + $<${is_msvc_fe}:_CRT_SECURE_NO_WARNINGS>) - if(${DECOMPRESSOR}) - target_compile_definitions(${NAME} + if(${ASTCENC_DECOMPRESSOR}) + target_compile_definitions(${ASTCENC_TARGET_NAME} PRIVATE ASTCENC_DECOMPRESS_ONLY) endif() - if(${BLOCK_MAX_TEXELS}) - target_compile_definitions(${NAME} + if(${ASTCENC_BLOCK_MAX_TEXELS}) + target_compile_definitions(${ASTCENC_TARGET_NAME} PRIVATE - ASTCENC_BLOCK_MAX_TEXELS=${BLOCK_MAX_TEXELS}) + ASTCENC_BLOCK_MAX_TEXELS=${ASTCENC_BLOCK_MAX_TEXELS}) endif() - if(${DIAGNOSTICS}) - target_compile_definitions(${NAME} + if(${ASTCENC_DIAGNOSTICS}) + target_compile_definitions(${ASTCENC_TARGET_NAME} PUBLIC ASTCENC_DIAGNOSTICS) endif() - target_compile_options(${NAME} + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE # Use pthreads on Linux/macOS $<$:-pthread> # MSVC compiler defines - $<$:/EHsc> - $<$:/fp:strict> + $<${is_msvc_fe}:/EHsc> + $<${is_msvccl}:/wd4324> # G++ and Clang++ compiler defines - $<$>:-Wall> - $<$>:-Wextra> - $<$>:-Wpedantic> - $<$>:-Werror> - $<$>:-Wshadow> - $<$>:-Wdouble-promotion> + $<${is_gnu_fe}:-Wall> + $<${is_gnu_fe}:-Wextra> + $<${is_gnu_fe}:-Wpedantic> + $<${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 - $<$>:-Wno-unknown-warning-option> - $<$>:-Wno-c++98-compat-pedantic> - $<$>:-Wno-c++98-c++11-compat-pedantic> - $<$>:-Wno-float-equal> - $<$>:-Wno-deprecated-declarations> - $<$>:-Wno-atomic-implicit-seq-cst> + $<${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-deprecated-declarations> + $<${is_gnu_fe}:-Wno-atomic-implicit-seq-cst> # Clang 10 also throws up warnings we need to investigate (ours) - $<$>:-Wno-cast-align> - $<$>:-Wno-sign-conversion> - $<$>:-Wno-implicit-int-conversion> - $<$>:-Wno-shift-sign-overflow> - $<$>:-Wno-format-nonliteral> - $<$>:-Wno-reserved-identifier> - $<$>:-Wno-cast-function-type> + $<${is_gnu_fe}:-Wno-cast-align> + $<${is_gnu_fe}:-Wno-sign-conversion> + $<${is_gnu_fe}:-Wno-implicit-int-conversion> + $<${is_gnu_fe}:-Wno-shift-sign-overflow> + $<${is_gnu_fe}:-Wno-format-nonliteral> + $<${is_gnu_fe}:-Wno-reserved-identifier> + $<${is_gnu_fe}:-Wno-cast-function-type> - $<$:-Wdocumentation>) + # Force DWARF4 for Valgrind profiling + $<$,${is_clang}>:-gdwarf-4> - target_link_options(${NAME} + # Disable non-portable Windows.h warning (fixing it fails builds on MinGW) + $<$,${is_clang}>:-Wno-nonportable-system-include-path>) + + target_link_options(${ASTCENC_TARGET_NAME} PRIVATE # Use pthreads on Linux/macOS $<$:-pthread>) - if(${ASAN}) - target_compile_options(${NAME} + if(${ASTCENC_ASAN}) + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE - $<$:-fsanitize=address>) + $<${is_clang}:-fsanitize=address>) - target_link_options(${NAME} + target_link_options(${ASTCENC_TARGET_NAME} PRIVATE - $<$:-fsanitize=address>) + $<${is_clang}:-fsanitize=address>) endif() - if(${NO_INVARIANCE}) - target_compile_definitions(${NAME} - PRIVATE - ASTCENC_NO_INVARIANCE=1) + if(NOT ${ASTCENC_INVARIANCE}) + target_compile_definitions(${ASTCENC_TARGET_NAME} + PRIVATE + ASTCENC_NO_INVARIANCE=1) + + # For Visual Studio prior to 2022 (compiler < 19.30) /fp:precise + # For Visual Studio 2022 (compiler >= 19.30) /fp:precise and /fp:contract + + # For Visual Studio 2022 ClangCL seems to have accidentally enabled contraction by default, + # so behaves differently to CL.exe. Use the -Xclang argument to workaround and allow access + # GNU-style switch to control contraction on the assumption this gets fixed and disabled. + # Note ClangCL does not accept /fp:contract as an argument as of v15.0.7. + target_compile_options(${ASTCENC_TARGET_NAME} + PRIVATE + $<${is_msvccl}:/fp:precise> + $<${is_clangcl}:/fp:precise> + $<$,19.30>>:/fp:contract> + $<$,14.0.0>>:-Xclang -ffp-contract=fast> + $<$,10.0.0>>:-ffp-model=precise> + $<${is_gnu_fe}:-ffp-contract=fast>) + else() + # For Visual Studio prior to 2022 (compiler < 19.30) /fp:strict + # For Visual Studio 2022 (compiler >= 19.30) /fp:precise + + # For Visual Studio 2022 ClangCL seems to have accidentally enabled contraction by default, + # so behaves differently to CL.exe. Use the -Xclang argument to workaround and allow access + # GNU-style switch to control contraction and force disable. + target_compile_options(${ASTCENC_TARGET_NAME} + PRIVATE + $<$,19.30>>:/fp:strict> + $<$,19.30>>:/fp:precise> + $<${is_clangcl}:/fp:precise> + $<$,14.0.0>>:-Xclang -ffp-contract=off> + $<$,10.0.0>>:-ffp-model=precise> + $<${is_gnu_fe}:-ffp-contract=off>) endif() - if(${CLI}) + if(${ASTCENC_CLI}) # Enable LTO on release builds - set_property(TARGET ${NAME} + set_property(TARGET ${ASTCENC_TARGET_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION_RELEASE True) # Use a static runtime on MSVC builds (ignored on non-MSVC compilers) - set_property(TARGET ${NAME} + set_property(TARGET ${ASTCENC_TARGET_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") endif() # Set up configuration for SIMD ISA builds - if(${ISA_SIMD} MATCHES "none") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${NAME} + if(${ASTCENC_ISA_SIMD} MATCHES "none") + target_compile_definitions(${ASTCENC_TARGET_NAME} + PRIVATE + ASTCENC_NEON=0 + ASTCENC_SSE=0 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) + + elseif(${ASTCENC_ISA_SIMD} MATCHES "neon") + target_compile_definitions(${ASTCENC_TARGET_NAME} + PRIVATE + ASTCENC_NEON=1 + ASTCENC_SSE=0 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) + + # Workaround MSVC codegen bug for NEON builds on VS 2022 17.2 or older + # https://developercommunity.visualstudio.com/t/inlining-turns-constant-into-register-operand-for/1394798 + if((CMAKE_CXX_COMPILER_ID MATCHES "MSVC") AND (MSVC_VERSION LESS 1933)) + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=0 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) + $<${is_msvccl}:/d2ssa-cfg-sink->) endif() - elseif(${ISA_SIMD} MATCHES "neon") - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${NAME} - PRIVATE - ASTCENC_NEON=1 - ASTCENC_SSE=0 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) - endif() + elseif(${ASTCENC_ISA_SIMD} MATCHES "sse2") + target_compile_definitions(${ASTCENC_TARGET_NAME} + PRIVATE + ASTCENC_NEON=0 + ASTCENC_SSE=20 + ASTCENC_AVX=0 + ASTCENC_POPCNT=0 + ASTCENC_F16C=0) + + # Force SSE2 on AppleClang (normally SSE4.1 is the default) + target_compile_options(${ASTCENC_TARGET_NAME} + PRIVATE + $<${is_clangcl}:-msse2> + $<${is_gnu_fe}:-msse2> + $<${is_gnu_fe}:-mno-sse4.1> + $<${is_gnu_fe}:-Wno-unused-command-line-argument>) - elseif((${ISA_SIMD} MATCHES "sse2") OR (${UNIVERSAL_BUILD} AND ${ISA_SSE2})) - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${NAME} + elseif(${ASTCENC_ISA_SIMD} MATCHES "sse4.1") + target_compile_definitions(${ASTCENC_TARGET_NAME} + PRIVATE + ASTCENC_NEON=0 + ASTCENC_SSE=41 + ASTCENC_AVX=0 + ASTCENC_POPCNT=1 + ASTCENC_F16C=0) + + if (${ASTCENC_IS_VENEER}) + # Force SSE2 on AppleClang (normally SSE4.1 is the default) + target_compile_options(${ASTCENC_TARGET_NAME} + PRIVATE + $<${is_gnu_fe}:-msse2> + $<${is_gnu_fe}:-mno-sse4.1> + $<${is_gnu_fe}:-Wno-unused-command-line-argument>) + else() + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=20 - ASTCENC_AVX=0 - ASTCENC_POPCNT=0 - ASTCENC_F16C=0) + $<${is_clangcl}:-msse4.1 -mpopcnt> + $<${is_gnu_fe}:-msse4.1 -mpopcnt> + $<${is_gnu_fe}:-Wno-unused-command-line-argument>) endif() - # These settings are needed on AppleClang as SSE4.1 is on by default - # Suppress unused argument for macOS universal build behavior - target_compile_options(${NAME} + elseif(${ASTCENC_ISA_SIMD} MATCHES "avx2") + target_compile_definitions(${ASTCENC_TARGET_NAME} PRIVATE - $<$:-msse2> - $<$:-mno-sse4.1> - $<$:-Wno-unused-command-line-argument>) - - elseif((${ISA_SIMD} MATCHES "sse4.1") OR (${UNIVERSAL_BUILD} AND ${ISA_SSE41})) - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${NAME} + ASTCENC_NEON=0 + ASTCENC_SSE=41 + ASTCENC_AVX=2 + ASTCENC_POPCNT=1 + ASTCENC_F16C=1) + + if (${ASTCENC_IS_VENEER}) + # Force SSE2 on AppleClang (normally SSE4.1 is the default) + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=41 - ASTCENC_AVX=0 - ASTCENC_POPCNT=1 - ASTCENC_F16C=0) + $<${is_gnu_fe}:-msse2> + $<${is_gnu_fe}:-mno-sse4.1> + $<${is_gnu_fe}:-Wno-unused-command-line-argument>) + else() + target_compile_options(${ASTCENC_TARGET_NAME} + PRIVATE + $<${is_msvc_fe}:/arch:AVX2> + $<${is_clangcl}:-mavx2 -mpopcnt -mf16c> + $<${is_gnu_fe}:-mavx2 -mpopcnt -mf16c> + $<${is_gnu_fe}:-Wno-unused-command-line-argument>) endif() - # Suppress unused argument for macOS universal build behavior - target_compile_options(${NAME} - PRIVATE - $<$>:-msse4.1 -mpopcnt> - $<$:-Wno-unused-command-line-argument>) - - elseif((${ISA_SIMD} MATCHES "avx2") OR (${UNIVERSAL_BUILD} AND ${ISA_AVX2})) - if(NOT ${UNIVERSAL_BUILD}) - target_compile_definitions(${NAME} + # Non-invariant builds enable us to loosen the compiler constraints on + # floating point, but this is only worth doing on CPUs with AVX2 because + # this implies we can also enable the FMA instruction set extensions + # which significantly improve performance. Note that this DOES reduce + # image quality by up to 0.2 dB (normally much less), but buys an + # average of 10-15% performance improvement ... + if((NOT ${ASTCENC_INVARIANCE}) AND (NOT ${ASTCENC_IS_VENEER})) + target_compile_options(${ASTCENC_TARGET_NAME} PRIVATE - ASTCENC_NEON=0 - ASTCENC_SSE=41 - ASTCENC_AVX=2 - ASTCENC_POPCNT=1 - ASTCENC_F16C=1) + $<${is_gnu_fe}:-mfma>) endif() - # Suppress unused argument for macOS universal build behavior - target_compile_options(${NAME} - PRIVATE - $<$>:-mavx2 -mpopcnt -mf16c> - $<$:/arch:AVX2> - $<$:-Wno-unused-command-line-argument>) - endif() endmacro() -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - string(CONCAT EXTERNAL_CXX_FLAGS - " $<$>: -fno-strict-aliasing>" - " $<$>: -Wno-unused-parameter>" - " $<$>: -Wno-old-style-cast>" - " $<$>: -Wno-double-promotion>" - " $<$>: -Wno-zero-as-null-pointer-constant>" - " $<$>: -Wno-disabled-macro-expansion>" - " $<$>: -Wno-reserved-id-macro>" - " $<$>: -Wno-extra-semi-stmt>" - " $<$>: -Wno-implicit-fallthrough>" - " $<$>: -Wno-tautological-type-limit-compare>" - " $<$>: -Wno-cast-qual>" - " $<$>: -Wno-reserved-identifier>" - " $<$: -Wno-missing-prototypes>" - " $<$>: -Wno-suggest-override>" - " $<$>: -Wno-used-but-marked-unused>" - " $<$>: -Wno-noexcept-type>" - " $<$>: -Wno-comma>" - " $<$>: -Wno-c99-extensions>") - - set_source_files_properties(astcenccli_image_external.cpp - PROPERTIES - COMPILE_FLAGS ${EXTERNAL_CXX_FLAGS}) +string(CONCAT EXTERNAL_CXX_FLAGS + " $<${is_gnu_fe}: -fno-strict-aliasing>" + " $<${is_gnu_fe}: -Wno-unused-parameter>" + " $<${is_gnu_fe}: -Wno-old-style-cast>" + " $<${is_gnu_fe}: -Wno-double-promotion>" + " $<${is_gnu_fe}: -Wno-zero-as-null-pointer-constant>" + " $<${is_gnu_fe}: -Wno-disabled-macro-expansion>" + " $<${is_gnu_fe}: -Wno-reserved-id-macro>" + " $<${is_gnu_fe}: -Wno-extra-semi-stmt>" + " $<${is_gnu_fe}: -Wno-implicit-fallthrough>" + " $<${is_gnu_fe}: -Wno-tautological-type-limit-compare>" + " $<${is_gnu_fe}: -Wno-cast-qual>" + " $<${is_gnu_fe}: -Wno-reserved-identifier>" + " $<${is_clang}: -Wno-missing-prototypes>" + " $<${is_gnu_fe}: -Wno-missing-field-initializers>" + " $<${is_gnu_fe}: -Wno-suggest-override>" + " $<${is_gnu_fe}: -Wno-used-but-marked-unused>" + " $<${is_gnu_fe}: -Wno-noexcept-type>" + " $<${is_gnu_fe}: -Wno-comma>" + " $<${is_gnu_fe}: -Wno-c99-extensions>") + +set_source_files_properties(astcenccli_image_external.cpp + PROPERTIES + COMPILE_FLAGS ${EXTERNAL_CXX_FLAGS}) + +astcenc_set_properties(${ASTCENC_TARGET}-static OFF) + +target_compile_options(${ASTCENC_TARGET}-static + PRIVATE + $<${is_msvc_fe}:/W4>) + +if(${ASTCENC_SHAREDLIB}) + astcenc_set_properties(${ASTCENC_TARGET}-shared OFF) + + target_compile_definitions(${ASTCENC_TARGET}-shared + PRIVATE + ASTCENC_DYNAMIC_LIBRARY=1) + + target_compile_options(${ASTCENC_TARGET}-shared + PRIVATE + $<${is_gnu_fe}:-fvisibility=hidden> + $<${is_msvc_fe}:/W4>) + + if(NOT ${ASTCENC_UNIVERSAL_BUILD}) + install(TARGETS ${ASTCENC_TARGET}-shared) + endif() endif() -astcenc_set_properties(${ASTC_TARGET}-static) +if(${ASTCENC_CLI}) + astcenc_set_properties(${ASTCENC_TARGET}-veneer ON) + astcenc_set_properties(${ASTCENC_TARGET} OFF) -if(${CLI}) - astcenc_set_properties(${ASTC_TARGET}) + target_compile_options(${ASTCENC_TARGET} + PRIVATE + $<${is_msvc_fe}:/W3>) + + target_compile_options(${ASTCENC_TARGET}-veneer + PRIVATE + $<${is_msvc_fe}:/W3>) string(TIMESTAMP astcencoder_YEAR "%Y") @@ -289,9 +432,11 @@ if(${CLI}) astcenccli_version.h ESCAPE_QUOTES @ONLY) - target_include_directories(${ASTC_TARGET} + target_include_directories(${ASTCENC_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - install(TARGETS ${ASTC_TARGET} DESTINATION ${PACKAGE_ROOT}) + if(NOT ${ASTCENC_UNIVERSAL_BUILD}) + install(TARGETS ${ASTCENC_TARGET}) + endif() endif() diff --git a/Source/stb_image.h b/Source/stb_image.h index 0f8459a7998d5ffd87d313e3f6d16e2b45b6e697..5e807a0a6e7cdbfbbf48dff5f5d3f3693c2bc851 100644 --- a/Source/stb_image.h +++ b/Source/stb_image.h @@ -1,4 +1,4 @@ -/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb +/* stb_image - v2.28 - public domain image loader - http://nothings.org/stb no warranty implied; use at your own risk Do this: @@ -48,6 +48,7 @@ LICENSE RECENT REVISION HISTORY: + 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes 2.26 (2020-07-13) many minor fixes 2.25 (2020-02-02) fix warnings @@ -108,7 +109,7 @@ RECENT REVISION HISTORY: Cass Everitt Ryamond Barbiero github:grim210 Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus - Josh Tobin Matthew Gregan github:poppolopoppo + Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo Julian Raschke Gregory Mullen Christian Floisand github:darealshinji Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 Brad Weinberger Matvey Cherevko github:mosra @@ -140,7 +141,7 @@ RECENT REVISION HISTORY: // // ... x = width, y = height, n = # 8-bit components per pixel ... // // ... replace '0' with '1'..'4' to force that many components per pixel // // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) +// stbi_image_free(data); // // Standard parameters: // int *x -- outputs image width in pixels @@ -635,7 +636,7 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch #endif #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__SYMBIAN32__) typedef unsigned short stbi__uint16; typedef signed short stbi__int16; typedef unsigned int stbi__uint32; @@ -1032,7 +1033,7 @@ static int stbi__mad3sizes_valid(int a, int b, int c, int add) } // returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) { return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && @@ -1055,7 +1056,7 @@ static void *stbi__malloc_mad3(int a, int b, int c, int add) return stbi__malloc(a*b*c + add); } -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) { if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; @@ -1063,6 +1064,23 @@ static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) } #endif +// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow. +static int stbi__addints_valid(int a, int b) +{ + if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow + if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0. + return a <= INT_MAX - b; +} + +// returns 1 if the product of two signed shorts is valid, 0 on overflow. +static int stbi__mul2shorts_valid(short a, short b) +{ + if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow + if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid + if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN + return a >= SHRT_MIN / b; +} + // stbi__err - error // stbi__errpf - error returning pointer to float // stbi__errpuc - error returning pointer to unsigned char @@ -1985,9 +2003,12 @@ static int stbi__build_huffman(stbi__huffman *h, int *count) int i,j,k=0; unsigned int code; // build size list for each symbol (from JPEG spec) - for (i=0; i < 16; ++i) - for (j=0; j < count[i]; ++j) + for (i=0; i < 16; ++i) { + for (j=0; j < count[i]; ++j) { h->size[k++] = (stbi_uc) (i+1); + if(k >= 257) return stbi__err("bad size list","Corrupt JPEG"); + } + } h->size[k] = 0; // compute actual symbols (from jpeg spec) @@ -2112,6 +2133,8 @@ stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) // convert the huffman code to the symbol id c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + if(c < 0 || c >= 256) // symbol id out of bounds! + return -1; STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); // convert the id to a symbol @@ -2130,6 +2153,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n) unsigned int k; int sgn; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) k = stbi_lrot(j->code_buffer, n); @@ -2144,6 +2168,7 @@ stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) { unsigned int k; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing k = stbi_lrot(j->code_buffer, n); j->code_buffer = k & ~stbi__bmask[n]; k &= stbi__bmask[n]; @@ -2155,6 +2180,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) { unsigned int k; if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing k = j->code_buffer; j->code_buffer <<= 1; --j->code_bits; @@ -2192,8 +2218,10 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman memset(data,0,64*sizeof(data[0])); diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG"); dc = j->img_comp[b].dc_pred + diff; j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); data[0] = (short) (dc * dequant[0]); // decode AC components, see JPEG spec @@ -2207,6 +2235,7 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman if (r) { // fast-AC path k += (r >> 4) & 15; // run s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); j->code_buffer <<= s; j->code_bits -= s; // decode into unzigzag'd location @@ -2246,8 +2275,10 @@ static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__ if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); diff = t ? stbi__extend_receive(j, t) : 0; + if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG"); dc = j->img_comp[b].dc_pred + diff; j->img_comp[b].dc_pred = dc; + if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); data[0] = (short) (dc * (1 << j->succ_low)); } else { // refinement scan for DC coefficient @@ -2282,6 +2313,7 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__ if (r) { // fast-AC path k += (r >> 4) & 15; // run s = r & 15; // combined length + if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); j->code_buffer <<= s; j->code_bits -= s; zig = stbi__jpeg_dezigzag[k++]; @@ -3102,6 +3134,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m) sizes[i] = stbi__get8(z->s); n += sizes[i]; } + if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values! L -= 17; if (tc == 0) { if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; @@ -3267,6 +3300,13 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan) if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; } + // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios + // and I've never seen a non-corrupted JPEG file actually use them + for (i=0; i < s->img_n; ++i) { + if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG"); + if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG"); + } + // compute interleaved mcu info z->img_h_max = h_max; z->img_v_max = v_max; @@ -3344,6 +3384,28 @@ static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) return 1; } +static int stbi__skip_jpeg_junk_at_end(stbi__jpeg *j) +{ + // some JPEGs have junk at end, skip over it but if we find what looks + // like a valid marker, resume there + while (!stbi__at_eof(j->s)) { + int x = stbi__get8(j->s); + while (x == 255) { // might be a marker + if (stbi__at_eof(j->s)) return STBI__MARKER_none; + x = stbi__get8(j->s); + if (x != 0x00 && x != 0xff) { + // not a stuffed zero or lead-in to another marker, looks + // like an actual marker, return it + return x; + } + // stuffed zero has x=0 now which ends the loop, meaning we go + // back to regular scan loop. + // repeated 0xff keeps trying to read the next byte of the marker. + } + } + return STBI__MARKER_none; +} + // decode image to YCbCr format static int stbi__decode_jpeg_image(stbi__jpeg *j) { @@ -3360,25 +3422,22 @@ static int stbi__decode_jpeg_image(stbi__jpeg *j) if (!stbi__process_scan_header(j)) return 0; if (!stbi__parse_entropy_coded_data(j)) return 0; if (j->marker == STBI__MARKER_none ) { - // handle 0s at the end of image data from IP Kamera 9060 - while (!stbi__at_eof(j->s)) { - int x = stbi__get8(j->s); - if (x == 255) { - j->marker = stbi__get8(j->s); - break; - } - } + j->marker = stbi__skip_jpeg_junk_at_end(j); // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 } + m = stbi__get_marker(j); + if (STBI__RESTART(m)) + m = stbi__get_marker(j); } else if (stbi__DNL(m)) { int Ld = stbi__get16be(j->s); stbi__uint32 NL = stbi__get16be(j->s); if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); + m = stbi__get_marker(j); } else { - if (!stbi__process_marker(j, m)) return 0; + if (!stbi__process_marker(j, m)) return 1; + m = stbi__get_marker(j); } - m = stbi__get_marker(j); } if (j->progressive) stbi__jpeg_finish(j); @@ -3969,6 +4028,7 @@ static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int re unsigned char* result; stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); if (!j) return stbi__errpuc("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); STBI_NOTUSED(ri); j->s = s; stbi__setup_jpeg(j); @@ -3982,6 +4042,7 @@ static int stbi__jpeg_test(stbi__context *s) int r; stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); j->s = s; stbi__setup_jpeg(j); r = stbi__decode_jpeg_header(j, STBI__SCAN_type); @@ -4007,6 +4068,7 @@ static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) int result; stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); if (!j) return stbi__err("outofmem", "Out of memory"); + memset(j, 0, sizeof(stbi__jpeg)); j->s = s; result = stbi__jpeg_info_raw(j, x, y, comp); STBI_FREE(j); @@ -4249,11 +4311,12 @@ static int stbi__parse_huffman_block(stbi__zbuf *a) a->zout = zout; return 1; } + if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data z -= 257; len = stbi__zlength_base[z]; if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data dist = stbi__zdist_base[z]; if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); @@ -4948,7 +5011,7 @@ STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; -STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) +STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) { stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; stbi__unpremultiply_on_load_set = 1; @@ -5057,14 +5120,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) if (!pal_img_n) { s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - if (scan == STBI__SCAN_header) return 1; } else { // if paletted, then pal_n is our final components, and // img_n is # components to decompress/filter. s->img_n = 1; if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); - // if SCAN_header, have to scan to see if we have a tRNS } + // even with SCAN_header, have to scan to see if we have a tRNS break; } @@ -5096,6 +5158,8 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); has_trans = 1; + // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. + if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } if (z->depth == 16) { for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is } else { @@ -5108,7 +5172,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) case STBI__PNG_TYPE('I','D','A','T'): { if (first) return stbi__err("first not IHDR", "Corrupt PNG"); if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); - if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if (scan == STBI__SCAN_header) { + // header scan definitely stops at first IDAT + if (pal_img_n) + s->img_n = pal_img_n; + return 1; + } + if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes"); if ((int)(ioff + c.length) < (int)ioff) return 0; if (ioff + c.length > idata_limit) { stbi__uint32 idata_limit_old = idata_limit; @@ -5491,8 +5561,22 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req psize = (info.offset - info.extra_read - info.hsz) >> 2; } if (psize == 0) { - if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) { - return stbi__errpuc("bad offset", "Corrupt BMP"); + // accept some number of extra bytes after the header, but if the offset points either to before + // the header ends or implies a large amount of extra data, reject the file as malformed + int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original); + int header_limit = 1024; // max we actually read is below 256 bytes currently. + int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size. + if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) { + return stbi__errpuc("bad header", "Corrupt BMP"); + } + // we established that bytes_read_so_far is positive and sensible. + // the first half of this test rejects offsets that are either too small positives, or + // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn + // ensures the number computed in the second half of the test can't overflow. + if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) { + return stbi__errpuc("bad offset", "Corrupt BMP"); + } else { + stbi__skip(s, info.offset - bytes_read_so_far); } } @@ -7180,12 +7264,12 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re // Run value = stbi__get8(s); count -= 128; - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } for (z = 0; z < count; ++z) scanline[i++ * 4 + k] = value; } else { // Dump - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } + if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } for (z = 0; z < count; ++z) scanline[i++ * 4 + k] = stbi__get8(s); } @@ -7439,10 +7523,17 @@ static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); if (!out) return stbi__errpuc("outofmem", "Out of memory"); - stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8)); + if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) { + STBI_FREE(out); + return stbi__errpuc("bad PNM", "PNM file truncated"); + } if (req_comp && req_comp != s->img_n) { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (ri->bits_per_channel == 16) { + out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y); + } else { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + } if (out == NULL) return out; // stbi__convert_format frees input on failure } return out; @@ -7479,6 +7570,8 @@ static int stbi__pnm_getinteger(stbi__context *s, char *c) while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { value = value*10 + (*c - '0'); *c = (char) stbi__get8(s); + if((value > 214748364) || (value == 214748364 && *c > '7')) + return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int"); } return value; @@ -7509,9 +7602,13 @@ static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) stbi__pnm_skip_whitespace(s, &c); *x = stbi__pnm_getinteger(s, &c); // read width + if(*x == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); stbi__pnm_skip_whitespace(s, &c); *y = stbi__pnm_getinteger(s, &c); // read height + if (*y == 0) + return stbi__err("invalid width", "PPM image header had zero or overflowing width"); stbi__pnm_skip_whitespace(s, &c); maxv = stbi__pnm_getinteger(s, &c); // read max value diff --git a/Source/stb_image_write.h b/Source/stb_image_write.h index 314e162a64b5c03349ab850eef49b6e654bc38c4..e4b32ed1bc32ef9c962acbf47a9d10af01939e08 100644 --- a/Source/stb_image_write.h +++ b/Source/stb_image_write.h @@ -511,7 +511,7 @@ static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, c STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; stbi__start_write_callbacks(&s, func, context); return stbi_write_bmp_core(&s, x, y, comp, data); } @@ -519,7 +519,7 @@ STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, #ifndef STBI_WRITE_NO_STDIO STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; if (stbi__start_write_file(&s,filename)) { int r = stbi_write_bmp_core(&s, x, y, comp, data); stbi__end_write_file(&s); @@ -610,7 +610,7 @@ static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, v STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; stbi__start_write_callbacks(&s, func, context); return stbi_write_tga_core(&s, x, y, comp, (void *) data); } @@ -618,7 +618,7 @@ STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, #ifndef STBI_WRITE_NO_STDIO STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; if (stbi__start_write_file(&s,filename)) { int r = stbi_write_tga_core(&s, x, y, comp, (void *) data); stbi__end_write_file(&s); @@ -786,14 +786,14 @@ static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, f STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; stbi__start_write_callbacks(&s, func, context); return stbi_write_hdr_core(&s, x, y, comp, (float *) data); } STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; if (stbi__start_write_file(&s,filename)) { int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data); stbi__end_write_file(&s); @@ -1606,7 +1606,7 @@ static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, in STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; stbi__start_write_callbacks(&s, func, context); return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality); } @@ -1615,7 +1615,7 @@ STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, #ifndef STBI_WRITE_NO_STDIO STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality) { - stbi__write_context s {}; + stbi__write_context s = { 0 }; if (stbi__start_write_file(&s,filename)) { int r = stbi_write_jpg_core(&s, x, y, comp, data, quality); stbi__end_write_file(&s); diff --git a/Source/wuffs-v0.3.c b/Source/wuffs-v0.3.c index 11db2587a54c6119f4ff72379009ecf47f73ee32..76aea8de481bfa928eba2031f2ac7ff707509ce3 100644 --- a/Source/wuffs-v0.3.c +++ b/Source/wuffs-v0.3.c @@ -21987,15 +21987,25 @@ wuffs_adler32__hasher__up_arm_neon( } v_p.len = 0; } + + static const uint16x4_t table_0 {32, 31, 30, 29}; + static const uint16x4_t table_1 {28, 27, 26, 25}; + static const uint16x4_t table_2 {24, 23, 22, 21}; + static const uint16x4_t table_3 {20, 19, 18, 17}; + static const uint16x4_t table_4 {16, 15, 14, 13}; + static const uint16x4_t table_5 {12, 11, 10, 9}; + static const uint16x4_t table_6 { 8, 7, 6, 5}; + static const uint16x4_t table_7 { 4, 3, 2, 1}; + v_v2 = vshlq_n_u32(v_v2, 5); - v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col0), ((uint16x4_t){32, 31, 30, 29})); - v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col0), ((uint16x4_t){28, 27, 26, 25})); - v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col1), ((uint16x4_t){24, 23, 22, 21})); - v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col1), ((uint16x4_t){20, 19, 18, 17})); - v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col2), ((uint16x4_t){16, 15, 14, 13})); - v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col2), ((uint16x4_t){12, 11, 10, 9})); - v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col3), ((uint16x4_t){8, 7, 6, 5})); - v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col3), ((uint16x4_t){4, 3, 2, 1})); + v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col0), table_0); + v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col0), table_1); + v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col1), table_2); + v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col1), table_3); + v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col2), table_4); + v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col2), table_5); + v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col3), table_6); + v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col3), table_7); v_sum1 = vpadd_u32(vget_low_u32(v_v1), vget_high_u32(v_v1)); v_sum2 = vpadd_u32(vget_low_u32(v_v2), vget_high_u32(v_v2)); v_sum12 = vpadd_u32(v_sum1, v_sum2); diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index e7bc1f369f6b352870522d77fb7161b018246a7d..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.4642,0.9206,0.1086,5.4306 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6113,0.9023,0.1042,5.6594 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1249,0.9088,0.1151,5.1237 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.8620,0.9039,0.1064,5.5433 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4006,0.9604,0.1386,4.2548 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4855,0.9261,0.1123,5.2511 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8798,0.9130,0.1129,5.2252 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5073,0.9110,0.1164,5.0690 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9690,0.9134,0.1130,5.2194 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8563,0.9531,0.1314,4.4902 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9117,0.9368,0.1226,4.8125 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9417,0.9174,0.1235,4.7743 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6901,0.9159,0.1247,4.7282 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6034,0.9219,0.1237,4.7695 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4690,0.9657,0.1410,4.1836 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6259,1.0036,0.1842,3.2028 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.0949,0.9746,0.1730,3.4098 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4004,0.9796,0.1780,3.3143 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5218,0.9778,0.1735,3.3987 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6552,1.0249,0.1933,3.0509 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2083,1.0440,0.2153,2.7398 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1174,1.0073,0.1992,2.9616 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3098,1.0129,0.2058,2.8664 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7317,1.0167,0.2065,2.8566 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0473,1.0679,0.2263,2.6068 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index 23c1756776cfff5c13b95dc3f3f01af2904082f0..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2326,0.8834,0.0732,8.0546 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2416,0.8664,0.0739,7.9788 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4153,0.8676,0.0738,7.9926 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.6138,0.8715,0.0738,7.9920 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.0126,0.9023,0.0794,7.4294 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3165,0.8916,0.0804,7.3356 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4653,0.8779,0.0810,7.2802 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0821,0.8755,0.0807,7.3127 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7249,0.8807,0.0825,7.1537 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.4955,0.9102,0.0845,6.9824 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8196,0.8892,0.0779,7.5716 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6921,0.8750,0.0797,7.4031 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4519,0.8730,0.0779,7.5736 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3978,0.8744,0.0797,7.3992 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3170,0.9022,0.0810,7.2811 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5303,0.9379,0.1203,4.9045 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8147,0.9207,0.1202,4.9074 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1762,0.9168,0.1183,4.9860 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3622,0.9242,0.1215,4.8552 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.5936,0.9590,0.1270,4.6442 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1316,0.9686,0.1448,4.0723 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6209,0.9452,0.1410,4.1826 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0262,0.9435,0.1409,4.1869 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6170,0.9515,0.1447,4.0759 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0061,0.9935,0.1550,3.8064 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index 4d5d22d3bd65f059c590c4f03b7196f6b45fd1ab..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6813,1.0152,0.1984,2.9722 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9798,0.9898,0.1927,3.0610 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5307,1.0064,0.2162,2.7282 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2443,0.9997,0.1979,2.9801 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.7736,1.0887,0.2683,2.1981 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5886,1.0282,0.2159,2.7315 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2735,1.0275,0.2244,2.6287 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0266,1.0367,0.2354,2.5060 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1990,1.0237,0.2220,2.6565 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0853,1.1085,0.2788,2.1153 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9799,1.0462,0.2313,2.5503 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3967,1.0207,0.2245,2.6272 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2283,1.0421,0.2421,2.4367 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7624,1.0325,0.2280,2.5873 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6249,1.1214,0.2926,2.0159 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7193,1.1333,0.3106,1.8989 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5399,1.0800,0.2739,2.1533 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,1.1059,0.3027,1.9487 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6493,1.1016,0.2954,1.9965 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7364,1.1932,0.3560,1.6567 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2550,1.2301,0.3959,1.4897 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3419,1.1312,0.3167,1.8626 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5225,1.1784,0.3665,1.6095 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8200,1.1691,0.3549,1.6619 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0791,1.2708,0.4258,1.3853 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index e682b84e9a340ad89edbccaf44cc00e20968a993..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8140,1.2786,0.4654,1.2672 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3108,1.2803,0.4840,1.2185 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0416,1.2881,0.4957,1.1898 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4415,1.2576,0.4593,1.2841 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9172,1.3825,0.5584,1.0563 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6414,1.3319,0.5165,1.1419 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.5164,1.3635,0.5626,1.0484 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4423,1.3605,0.5630,1.0477 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3342,1.3238,0.5249,1.1236 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2127,1.4354,0.6116,0.9644 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0206,1.4166,0.6002,0.9827 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.5914,1.4251,0.6261,0.9421 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5720,1.4318,0.6347,0.9293 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8656,1.4023,0.6044,0.9758 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7315,1.5346,0.7063,0.8351 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7638,1.5949,0.7743,0.7618 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7385,1.5035,0.6977,0.8454 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0389,1.5403,0.7381,0.7991 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7390,1.5266,0.7178,0.8218 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8113,1.7122,0.8752,0.6739 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2896,1.7554,0.9179,0.6426 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5190,1.5453,0.7246,0.8140 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7063,1.6414,0.8256,0.7145 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8774,1.6395,0.8212,0.7183 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1152,1.8808,1.0319,0.5716 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index 7f7fcfcf266e58c87728f6fe18966d487667ac5b..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.4642,0.9467,0.1363,4.3277 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6113,0.9284,0.1309,4.5048 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1249,0.9385,0.1436,4.1086 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.8620,0.9319,0.1331,4.4325 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4006,0.9953,0.1724,3.4211 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4855,0.9690,0.1534,3.8461 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8798,0.9525,0.1534,3.8443 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5073,0.9539,0.1578,3.7371 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9690,0.9547,0.1531,3.8532 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8563,1.0047,0.1788,3.2995 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9117,0.9980,0.1808,3.2631 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9417,0.9821,0.1812,3.2554 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6901,0.9781,0.1823,3.2348 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6034,0.9832,0.1806,3.2657 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4690,1.0337,0.2048,2.8804 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6259,1.0986,0.2734,2.1570 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.0949,1.0655,0.2576,2.2900 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4004,1.0731,0.2682,2.1989 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5218,1.0685,0.2607,2.2623 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6552,1.1252,0.2871,2.0544 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2083,1.1537,0.3238,1.8215 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1174,1.1093,0.2999,1.9665 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3098,1.1162,0.3092,1.9078 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7317,1.1237,0.3094,1.9064 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0473,1.1800,0.3385,1.7423 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index 5edf0b26c91f178c26619eb42ba30e680066ef1e..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2326,0.9060,0.0936,6.3045 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2416,0.8912,0.0937,6.2929 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4153,0.8881,0.0941,6.2703 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.6138,0.8931,0.0942,6.2615 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.0126,0.9247,0.1013,5.8225 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3165,0.9240,0.1109,5.3166 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4653,0.9099,0.1119,5.2715 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0821,0.9071,0.1110,5.3134 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7249,0.9123,0.1121,5.2598 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.4955,0.9404,0.1154,5.1095 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8196,0.9275,0.1130,5.2215 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6921,0.9147,0.1153,5.1166 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4519,0.9091,0.1130,5.2177 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3978,0.9152,0.1149,5.1337 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3170,0.9432,0.1167,5.0546 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5303,0.9951,0.1753,3.3650 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8147,0.9780,0.1750,3.3697 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1762,0.9739,0.1732,3.4059 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3622,0.9824,0.1776,3.3203 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.5936,1.0191,0.1866,3.1608 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1316,1.0419,0.2144,2.7516 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6209,1.0192,0.2113,2.7921 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0262,1.0160,0.2102,2.8064 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6170,1.0268,0.2166,2.7231 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0061,1.0702,0.2301,2.5638 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index 64dbf42e9aea1050786a3619702899fdf93ff669..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6813,1.0841,0.2661,2.2164 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9798,1.0610,0.2612,2.2584 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5307,1.0883,0.2923,2.0177 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2443,1.0682,0.2673,2.2069 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.7736,1.1871,0.3598,1.6392 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5886,1.1287,0.3134,1.8818 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2735,1.1319,0.3276,1.8003 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0266,1.1436,0.3455,1.7071 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1990,1.1306,0.3256,1.8118 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0853,1.2347,0.4070,1.4490 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9799,1.1702,0.3495,1.6877 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3967,1.1431,0.3414,1.7275 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2283,1.1688,0.3681,1.6022 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7624,1.1525,0.3465,1.7024 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6249,1.2719,0.4421,1.3342 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7193,1.3044,0.4816,1.2246 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5399,1.2323,0.4252,1.3872 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,1.2743,0.4709,1.2526 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6493,1.2624,0.4562,1.2929 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7364,1.3818,0.5486,1.0752 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2550,1.4356,0.6055,0.9742 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3419,1.3001,0.4875,1.2099 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5225,1.3711,0.5605,1.0523 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8200,1.3601,0.5422,1.0878 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0791,1.4984,0.6513,0.9057 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index 46fe1165eba7acab2126147e07f2a7dc3d1e28a9..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8140,1.4350,0.6193,0.9524 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3108,1.4526,0.6532,0.9030 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0416,1.4670,0.6700,0.8804 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4415,1.4204,0.6200,0.9514 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9172,1.5700,0.7472,0.7894 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6414,1.5601,0.7446,0.7922 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.5164,1.6150,0.8121,0.7263 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4423,1.6092,0.8127,0.7257 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3342,1.5609,0.7556,0.7806 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2127,1.7099,0.8809,0.6696 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0206,1.7151,0.8957,0.6585 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.5914,1.7311,0.9290,0.6349 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5720,1.7488,0.9474,0.6226 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8656,1.7043,0.9018,0.6541 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7315,1.8778,1.0479,0.5629 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7638,2.0126,1.1857,0.4975 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7385,1.8810,1.0719,0.5502 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0389,1.9360,1.1320,0.5210 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7390,1.9138,1.1054,0.5336 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8113,2.1880,1.3469,0.4379 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2896,2.2359,1.3992,0.4215 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5190,1.9326,1.1153,0.5289 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7063,2.0784,1.2631,0.4670 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8774,2.0728,1.2533,0.4706 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1152,2.4112,1.5651,0.3769 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index fd65f8c791829c32f2bb2da6b55184ccce0c2335..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.4642,0.9349,0.1215,4.8552 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6113,0.9154,0.1171,5.0354 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1249,0.9239,0.1284,4.5924 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.8620,0.9187,0.1184,4.9800 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4006,0.9803,0.1542,3.8248 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4855,0.9477,0.1327,4.4461 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8798,0.9348,0.1335,4.4189 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5073,0.9350,0.1373,4.2959 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9690,0.9350,0.1330,4.4341 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8563,0.9812,0.1558,3.7849 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9117,0.9740,0.1576,3.7418 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9417,0.9586,0.1579,3.7349 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6901,0.9566,0.1589,3.7111 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6034,0.9586,0.1571,3.7548 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4690,1.0069,0.1779,3.3146 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6259,1.0635,0.2402,2.4553 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.0949,1.0317,0.2274,2.5933 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4004,1.0395,0.2340,2.5210 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5218,1.0347,0.2271,2.5977 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6552,1.0872,0.2511,2.3487 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2083,1.1156,0.2853,2.0673 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1174,1.0738,0.2647,2.2281 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3098,1.0843,0.2727,2.1627 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7317,1.0871,0.2721,2.1680 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0473,1.1433,0.2984,1.9766 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 7c28cf2e7031df3e82adae1d14e472076dae23c8..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2326,0.8925,0.0828,7.1221 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2416,0.8796,0.0829,7.1145 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4153,0.8771,0.0830,7.1040 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.6138,0.8800,0.0830,7.1094 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.0126,0.9129,0.0899,6.5637 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3165,0.9087,0.0957,6.1635 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4653,0.8948,0.0965,6.1136 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0821,0.8909,0.0962,6.1328 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7249,0.8958,0.0964,6.1191 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.4955,0.9245,0.0994,5.9329 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8196,0.9113,0.0982,6.0056 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6921,0.8973,0.1003,5.8804 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4519,0.8922,0.0987,5.9764 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3978,0.8989,0.0997,5.9157 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3170,0.9262,0.1018,5.7928 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5303,0.9712,0.1539,3.8330 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8147,0.9563,0.1535,3.8420 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1762,0.9496,0.1499,3.9360 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3622,0.9614,0.1556,3.7901 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.5936,0.9963,0.1630,3.6182 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1316,1.0145,0.1901,3.1022 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6209,0.9923,0.1861,3.1699 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0262,0.9907,0.1852,3.1845 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6170,0.9988,0.1919,3.0730 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0061,1.0422,0.2040,2.8913 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 790827039dd97ae8c5a9ad95cb43861c78860725..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6813,1.0485,0.2338,2.5226 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9798,1.0310,0.2281,2.5855 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5307,1.0563,0.2549,2.3139 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2443,1.0411,0.2330,2.5316 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.7736,1.1405,0.3145,1.8756 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5886,1.0881,0.2695,2.1888 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2735,1.0834,0.2816,2.0946 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0266,1.0971,0.2964,1.9901 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1990,1.0846,0.2788,2.1152 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0853,1.1794,0.3502,1.6841 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9799,1.1205,0.3011,1.9590 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3967,1.0966,0.2921,2.0192 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2283,1.1184,0.3173,1.8590 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7624,1.1048,0.2979,1.9796 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6249,1.2150,0.3838,1.5369 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7193,1.2415,0.4217,1.3986 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5399,1.1818,0.3740,1.5773 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,1.2190,0.4116,1.4330 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6493,1.2074,0.4001,1.4742 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7364,1.3194,0.4816,1.2247 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2550,1.3714,0.5360,1.1005 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3419,1.2455,0.4300,1.3717 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5225,1.3058,0.4948,1.1920 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8200,1.2958,0.4783,1.2333 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0791,1.4251,0.5758,1.0243 diff --git a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 3d7af9037fa81b6f7ea0dc95eaf5602318995252..0000000000000000000000000000000000000000 --- a/Test/Images/HDRIHaven/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,26 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8140,1.3668,0.5496,1.0731 -HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3108,1.3742,0.5744,1.0268 -HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0416,1.3844,0.5893,1.0009 -HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4415,1.3448,0.5442,1.0839 -HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9172,1.4844,0.6601,0.8936 -HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6414,1.4673,0.6500,0.9074 -HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.5164,1.5132,0.7083,0.8327 -HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4423,1.5122,0.7090,0.8319 -HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3342,1.4652,0.6606,0.8928 -HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2127,1.5933,0.7676,0.7684 -HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0206,1.5996,0.7801,0.7561 -HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.5914,1.6176,0.8131,0.7254 -HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5720,1.6268,0.8284,0.7120 -HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8656,1.5934,0.7870,0.7494 -HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7315,1.7475,0.9170,0.6432 -HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7638,1.8698,1.0465,0.5636 -HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7385,1.7500,0.9440,0.6248 -HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0389,1.8071,1.0011,0.5892 -HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7390,1.7833,0.9732,0.6061 -HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8113,2.0260,1.1907,0.4954 -HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2896,2.0752,1.2384,0.4763 -HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5190,1.8057,0.9886,0.5966 -HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7063,1.9364,1.1189,0.5272 -HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8774,1.9304,1.1109,0.5310 -HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1152,2.2427,1.3917,0.4238 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..31933a31528e94d79ff4e4ee738bf7f3e89e3e95 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5183,0.8421,0.0887,6.6478 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6496,0.8315,0.0853,6.9175 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1806,0.8445,0.0956,6.1696 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9442,0.8358,0.0867,6.7996 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4810,0.8674,0.1186,4.9726 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4914,0.8318,0.0778,7.5826 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8696,0.8303,0.0787,7.4941 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5304,0.8328,0.0826,7.1426 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9886,0.8293,0.0781,7.5523 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8769,0.8495,0.0978,6.0323 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9125,0.8253,0.0767,7.6866 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9501,0.8287,0.0809,7.2888 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6974,0.8499,0.0871,6.7739 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6096,0.8252,0.0809,7.2903 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4848,0.8409,0.0923,6.3909 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6322,0.8621,0.1121,5.2605 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2324,0.8611,0.1112,5.3048 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4874,0.8599,0.1111,5.3100 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5558,0.8643,0.1140,5.1743 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6748,0.8745,0.1243,4.7461 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2132,0.8974,0.1455,4.0527 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1310,0.8895,0.1391,4.2388 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3229,0.8925,0.1410,4.1844 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7302,0.8993,0.1480,3.9848 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0516,0.9102,0.1587,3.7176 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7d23a381ed5ada807af4a15647a97b17d29c240b --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2906,0.8061,0.0538,10.9559 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2770,0.8041,0.0556,10.6034 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4522,0.8038,0.0559,10.5527 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7385,0.8043,0.0549,10.7346 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1353,0.8130,0.0635,9.2887 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3714,0.8049,0.0532,11.0825 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4977,0.8028,0.0541,10.9037 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0897,0.8034,0.0539,10.9509 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7504,0.8038,0.0534,11.0363 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5270,0.8122,0.0598,9.8646 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8240,0.7991,0.0517,11.4146 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6977,0.7964,0.0511,11.5344 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4615,0.7980,0.0524,11.2538 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3650,0.7951,0.0508,11.6073 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3399,0.8016,0.0561,10.5226 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5378,0.8291,0.0778,7.5804 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8222,0.8210,0.0724,8.1516 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1845,0.8287,0.0744,7.9285 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3350,0.8249,0.0738,7.9934 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6111,0.8318,0.0847,6.9658 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1334,0.8493,0.0981,6.0141 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6166,0.8403,0.0915,6.4462 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0114,0.8417,0.0935,6.3050 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6068,0.8478,0.0977,6.0370 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0090,0.8590,0.1085,5.4348 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..57645e51d9cb51a4a848928aa5f78b0ffb3d42fa --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6967,0.8917,0.1381,4.2706 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9872,0.8862,0.1381,4.2711 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5481,0.9086,0.1568,3.7610 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2746,0.8945,0.1438,4.1016 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8015,0.9469,0.1920,3.0717 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5897,0.8797,0.1264,4.6671 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2586,0.8937,0.1397,4.2232 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0351,0.8985,0.1443,4.0874 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.2103,0.8891,0.1370,4.3048 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0865,0.9240,0.1690,3.4898 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9740,0.8824,0.1327,4.4450 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3897,0.8941,0.1464,4.0275 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2248,0.9014,0.1505,3.9200 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7613,0.8937,0.1465,4.0265 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6388,0.9206,0.1685,3.5003 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7174,0.9347,0.1818,3.2437 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5395,0.9313,0.1833,3.2180 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,0.9488,0.1945,3.0318 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6514,0.9423,0.1897,3.1099 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7425,0.9624,0.2081,2.8345 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2551,1.0001,0.2434,2.4234 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3460,0.9773,0.2264,2.6047 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5142,1.0026,0.2488,2.3702 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8241,0.9929,0.2404,2.4538 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0771,1.0092,0.2552,2.3115 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..25e75a040e8966179bc7e8a62ef69a074f2ebc20 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8226,1.0510,0.2972,1.9845 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3071,1.0638,0.3161,1.8661 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0457,1.0919,0.3383,1.7434 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4455,1.0613,0.3117,1.8920 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9306,1.1433,0.3936,1.4987 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6472,1.0421,0.2851,2.0687 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4971,1.0836,0.3321,1.7760 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4390,1.0780,0.3304,1.7854 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3310,1.0575,0.3077,1.9169 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2247,1.1193,0.3701,1.5936 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0267,1.0532,0.3053,1.9322 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6037,1.1076,0.3576,1.6492 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5645,1.0999,0.3515,1.6779 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8686,1.0829,0.3357,1.7569 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7460,1.1268,0.3798,1.5528 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7716,1.1755,0.4190,1.4076 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7436,1.1967,0.4434,1.3303 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0304,1.2071,0.4571,1.2905 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7463,1.1927,0.4419,1.3346 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8190,1.2341,0.4767,1.2373 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2963,1.3386,0.5790,1.0187 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5470,1.2630,0.5098,1.1569 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7151,1.3345,0.5789,1.0188 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8836,1.3195,0.5665,1.0412 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1188,1.3807,0.6215,0.9491 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..d2d63fc6efb767b1b73fefc83a91b38e517e25cb --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5183,0.8977,0.1136,5.1909 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6496,0.8914,0.1097,5.3777 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1806,0.9059,0.1224,4.8195 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9442,0.8956,0.1116,5.2860 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4810,0.9369,0.1510,3.9056 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4914,0.8935,0.1075,5.4888 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8696,0.8904,0.1081,5.4540 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5304,0.8972,0.1136,5.1936 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9886,0.8909,0.1073,5.4969 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8769,0.9189,0.1341,4.3987 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9125,0.8985,0.1130,5.2191 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9501,0.9012,0.1192,4.9491 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6974,0.9037,0.1202,4.9071 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6096,0.9013,0.1179,5.0030 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4848,0.9190,0.1341,4.3973 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6322,0.9551,0.1705,3.4595 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2324,0.9568,0.1737,3.3965 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4874,0.9558,0.1712,3.4451 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5558,0.9571,0.1754,3.3625 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6748,0.9743,0.1891,3.1189 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2132,1.0035,0.2159,2.7315 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1310,0.9935,0.2095,2.8159 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3229,0.9974,0.2112,2.7923 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7302,1.0055,0.2209,2.6707 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0516,1.0217,0.2356,2.5036 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ba87b428f4dd3478699577c3d50364da11e5cc8e --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2906,0.8542,0.0694,8.5015 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2770,0.8533,0.0721,8.1804 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4522,0.8534,0.0722,8.1682 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7385,0.8547,0.0714,8.2651 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1353,0.8659,0.0817,7.2185 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3714,0.8568,0.0744,7.9233 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4977,0.8567,0.0752,7.8485 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0897,0.8561,0.0748,7.8864 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7504,0.8567,0.0740,7.9697 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5270,0.8660,0.0828,7.1238 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8240,0.8601,0.0772,7.6419 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6977,0.8557,0.0762,7.7444 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4615,0.8602,0.0778,7.5834 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3650,0.8566,0.0751,7.8532 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3399,0.8670,0.0832,7.0880 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5378,0.9024,0.1177,5.0108 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8222,0.8925,0.1111,5.3085 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1845,0.8973,0.1128,5.2291 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3350,0.8956,0.1121,5.2622 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6111,0.9129,0.1283,4.5972 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1334,0.9332,0.1461,4.0371 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6166,0.9214,0.1369,4.3098 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0114,0.9244,0.1399,4.2166 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6068,0.9291,0.1452,4.0633 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0090,0.9473,0.1609,3.6648 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..be730d5f51f8b0228db5f1ac9291a85ffcd5bd38 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6967,0.9688,0.1804,3.2692 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9872,0.9690,0.1843,3.2001 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5481,0.9919,0.2064,2.8580 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2746,0.9747,0.1915,3.0806 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8015,1.0371,0.2509,2.3508 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5897,0.9682,0.1812,3.2544 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2586,0.9877,0.2020,2.9206 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0351,0.9964,0.2064,2.8574 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.2103,0.9845,0.1963,3.0051 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0865,1.0287,0.2410,2.4476 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9740,0.9863,0.1994,2.9584 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3897,1.0056,0.2225,2.6511 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2248,1.0112,0.2255,2.6151 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7613,1.0062,0.2219,2.6583 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6388,1.0355,0.2497,2.3621 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7174,1.0714,0.2815,2.0953 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5395,1.0739,0.2891,2.0405 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,1.0919,0.3016,1.9554 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6514,1.0799,0.2937,2.0080 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7425,1.1059,0.3198,1.8444 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2551,1.1544,0.3623,1.6280 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3460,1.1298,0.3406,1.7318 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5142,1.1642,0.3728,1.5820 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8241,1.1478,0.3600,1.6385 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0771,1.1683,0.3769,1.5650 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f756bc5e9bfe6b10d162a81841cddbee94b204ac --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8226,1.1860,0.3930,1.5008 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3071,1.2120,0.4245,1.3895 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0457,1.2394,0.4491,1.3134 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4455,1.2033,0.4194,1.4065 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9306,1.3087,0.5183,1.1380 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6472,1.1900,0.4010,1.4708 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4971,1.2626,0.4771,1.2364 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4390,1.2636,0.4679,1.2605 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3310,1.2250,0.4385,1.3451 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2247,1.3242,0.5194,1.1355 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0267,1.2729,0.4619,1.2770 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6037,1.3264,0.5368,1.0988 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5645,1.3113,0.5218,1.1304 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8686,1.2886,0.4997,1.1803 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7460,1.3489,0.5572,1.0585 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7716,1.4315,0.6375,0.9253 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7436,1.4856,0.6960,0.8475 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0304,1.4995,0.7046,0.8371 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7463,1.4690,0.6816,0.8654 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8190,1.5179,0.7243,0.8144 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2963,1.6495,0.8518,0.6925 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5470,1.5601,0.7638,0.7723 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7151,1.6553,0.8607,0.6853 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8836,1.6401,0.8407,0.7016 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1188,1.7103,0.9121,0.6467 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..490602811400d23d87f19d9f21c736545189190e --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5183,0.8375,0.0976,6.0429 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6496,0.8309,0.0941,6.2678 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1806,0.8434,0.1052,5.6072 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9442,0.8347,0.0959,6.1512 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4810,0.8707,0.1303,4.5283 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4914,0.8287,0.0893,6.6069 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8696,0.8280,0.0901,6.5438 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5304,0.8346,0.0943,6.2538 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9886,0.8277,0.0898,6.5657 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8769,0.8531,0.1117,5.2783 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9125,0.8354,0.0936,6.2988 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9501,0.8363,0.0984,5.9934 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6974,0.8382,0.0996,5.9244 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6096,0.8361,0.0983,6.0003 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4848,0.8533,0.1115,5.2893 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6322,0.8826,0.1423,4.1464 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2324,0.8836,0.1443,4.0874 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4874,0.8802,0.1419,4.1555 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5558,0.8856,0.1463,4.0306 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6748,0.8974,0.1580,3.7333 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2132,0.9334,0.1896,3.1109 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1310,0.9244,0.1842,3.2016 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3229,0.9278,0.1864,3.1645 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7302,0.9367,0.1941,3.0392 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0516,0.9506,0.2068,2.8518 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7120f00c818cba15d08e5bb11055c6f12a86648d --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2906,0.7990,0.0592,9.9612 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2770,0.7989,0.0614,9.6041 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4522,0.7976,0.0616,9.5813 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7385,0.7971,0.0609,9.6894 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1353,0.8086,0.0701,8.4083 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3714,0.8009,0.0614,9.6050 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4977,0.7990,0.0622,9.4774 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0897,0.7989,0.0620,9.5133 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7504,0.7988,0.0615,9.5983 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5270,0.8071,0.0688,8.5710 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8240,0.8015,0.0634,9.3057 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6977,0.7987,0.0623,9.4600 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4615,0.7996,0.0639,9.2372 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3650,0.7977,0.0621,9.5027 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3399,0.8063,0.0685,8.6155 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5378,0.8373,0.0977,6.0388 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8222,0.8319,0.0919,6.4150 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1845,0.8320,0.0935,6.3063 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3350,0.8313,0.0925,6.3766 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6111,0.8468,0.1060,5.5621 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1334,0.8697,0.1281,4.6052 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6166,0.8571,0.1199,4.9173 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0114,0.8608,0.1225,4.8147 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6068,0.8653,0.1269,4.6491 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0090,0.8808,0.1412,4.1757 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..4dfa1b4db3405d808396315b0c3264921054d277 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6967,0.8957,0.1550,3.8046 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9872,0.8975,0.1566,3.7654 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5481,0.9174,0.1758,3.3543 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2746,0.9025,0.1628,3.6220 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8015,0.9585,0.2149,2.7447 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5897,0.8930,0.1487,3.9676 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2586,0.9060,0.1659,3.5557 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0351,0.9125,0.1703,3.4632 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.2103,0.9046,0.1621,3.6391 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0865,0.9448,0.1991,2.9627 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9740,0.9065,0.1633,3.6112 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3897,0.9236,0.1812,3.2545 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2248,0.9248,0.1852,3.1844 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7613,0.9188,0.1815,3.2495 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6388,0.9486,0.2071,2.8486 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7174,0.9762,0.2337,2.5237 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5395,0.9840,0.2405,2.4521 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7977,0.9928,0.2513,2.3470 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6514,0.9896,0.2459,2.3984 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7425,1.0085,0.2658,2.2190 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2551,1.0664,0.3183,1.8532 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3460,1.0430,0.2996,1.9688 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5142,1.0712,0.3277,1.7998 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8241,1.0608,0.3158,1.8676 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0771,1.0782,0.3310,1.7820 diff --git a/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6087f70c323c0c959740081f80ac0f9874dab02f --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8226,1.0813,0.3362,1.7544 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.3071,1.0993,0.3600,1.6382 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0457,1.1243,0.3837,1.5372 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4455,1.0970,0.3554,1.6594 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9306,1.1874,0.4438,1.3289 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6472,1.0771,0.3339,1.7664 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4971,1.1350,0.3937,1.4982 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4390,1.1311,0.3896,1.5139 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3310,1.1028,0.3635,1.6227 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2247,1.1745,0.4337,1.3599 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0267,1.1158,0.3735,1.5791 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6037,1.1794,0.4390,1.3435 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5645,1.1736,0.4312,1.3680 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8686,1.1539,0.4120,1.4316 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7460,1.2102,0.4646,1.2695 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7716,1.2802,0.5371,1.0981 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7436,1.3283,0.5809,1.0154 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0304,1.3364,0.5920,0.9963 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7463,1.3139,0.5701,1.0346 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8190,1.3580,0.6114,0.9647 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2963,1.4986,0.7526,0.7837 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5470,1.4191,0.6744,0.8747 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7151,1.5040,0.7604,0.7757 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8836,1.4908,0.7417,0.7953 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1188,1.5523,0.8051,0.7327 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..88896f22817c7c32e2c4c68c4a87c133f27f5e2a --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5079,0.8407,0.0886,6.6551 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6274,0.8317,0.0845,6.9837 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1770,0.8462,0.0950,6.2057 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9296,0.8367,0.0861,6.8505 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4914,0.8665,0.1184,4.9802 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4794,0.8293,0.0776,7.6039 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8484,0.8294,0.0779,7.5674 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5278,0.8328,0.0818,7.2112 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9680,0.8298,0.0776,7.6040 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8894,0.8484,0.0974,6.0580 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9079,0.8256,0.0760,7.7585 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9405,0.8255,0.0801,7.3633 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6946,0.8277,0.0812,7.2660 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6017,0.8275,0.0798,7.3903 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4862,0.8389,0.0912,6.4670 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6288,0.8625,0.1105,5.3399 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2302,0.8600,0.1106,5.3329 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4837,0.8614,0.1104,5.3449 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5502,0.8610,0.1128,5.2296 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6749,0.8747,0.1227,4.8062 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2114,0.8978,0.1443,4.0866 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1351,0.8862,0.1386,4.2547 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3187,0.8901,0.1399,4.2174 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7270,0.8968,0.1463,4.0312 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0489,0.9081,0.1586,3.7186 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..3f35047609fc6bb9377efe8ced845eae3a398167 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2760,0.8027,0.0538,10.9551 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2550,0.8030,0.0553,10.6751 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4452,0.8022,0.0559,10.5591 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7224,0.8045,0.0548,10.7670 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1407,0.8133,0.0636,9.2786 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3592,0.8036,0.0534,11.0475 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4640,0.8012,0.0538,10.9604 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0910,0.8041,0.0538,10.9618 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7259,0.8014,0.0534,11.0390 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5353,0.8093,0.0596,9.8987 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8191,0.7985,0.0513,11.4868 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6923,0.7937,0.0508,11.6103 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4640,0.7996,0.0522,11.2948 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3619,0.8100,0.0502,11.7523 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3392,0.8060,0.0557,10.5967 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5337,0.8270,0.0772,7.6431 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8184,0.8209,0.0718,8.2180 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1809,0.8225,0.0737,7.9988 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3296,0.8234,0.0730,8.0765 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6107,0.8346,0.0840,7.0225 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1314,0.8497,0.0976,6.0440 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6193,0.8403,0.0908,6.4988 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0086,0.8423,0.0930,6.3440 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6060,0.8440,0.0964,6.1166 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0070,0.8576,0.1074,5.4922 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..a19e87ca8be5b516cd09d2c7709bd37777fe3313 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6791,0.8908,0.1364,4.3245 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9716,0.8870,0.1358,4.3420 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5447,0.9043,0.1536,3.8388 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2529,0.8923,0.1415,4.1680 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8078,0.9392,0.1896,3.1113 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5769,0.8788,0.1251,4.7150 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2436,0.8902,0.1380,4.2738 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0279,0.8964,0.1425,4.1404 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1830,0.8885,0.1347,4.3794 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0947,0.9251,0.1678,3.5152 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9671,0.8798,0.1300,4.5365 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3855,0.8945,0.1440,4.0955 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2270,0.8975,0.1482,3.9788 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7541,0.8969,0.1440,4.0947 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6367,0.9198,0.1673,3.5261 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7154,0.9334,0.1807,3.2644 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5329,0.9345,0.1812,3.2550 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7962,0.9437,0.1925,3.0646 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6495,0.9419,0.1880,3.1373 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7421,0.9625,0.2052,2.8739 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2539,0.9964,0.2424,2.4337 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3575,0.9781,0.2239,2.6339 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5160,1.0009,0.2458,2.3997 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8203,0.9940,0.2390,2.4678 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0748,1.0084,0.2519,2.3416 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ccfdc318d1dc8afe6673dc6f6a7551df87464208 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8052,1.0573,0.2937,2.0084 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.2886,1.0596,0.3084,1.9126 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0376,1.0820,0.3303,1.7858 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4310,1.0554,0.3057,1.9295 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9371,1.1396,0.3857,1.5291 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6368,1.0324,0.2805,2.1026 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4796,1.0785,0.3275,1.8012 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4337,1.0743,0.3258,1.8106 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3096,1.0587,0.3027,1.9487 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2314,1.1146,0.3659,1.6120 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0234,1.0523,0.3021,1.9521 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6006,1.0991,0.3517,1.6769 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5616,1.0966,0.3478,1.6961 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8595,1.0803,0.3307,1.7836 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7461,1.1269,0.3760,1.5687 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7688,1.1695,0.4141,1.4243 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7406,1.1961,0.4387,1.3445 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0276,1.2079,0.4543,1.2984 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7391,1.1857,0.4344,1.3578 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8188,1.2270,0.4709,1.2525 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2935,1.3289,0.5749,1.0260 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5420,1.2611,0.5044,1.1693 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7156,1.3290,0.5730,1.0294 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8817,1.3140,0.5596,1.0540 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1183,1.3736,0.6150,0.9591 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..3a149349396678f8246bce7c826f6b5e77f6c0bb --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5079,0.9019,0.1132,5.2103 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6274,0.8911,0.1088,5.4209 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1770,0.9042,0.1213,4.8614 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9296,0.8923,0.1106,5.3336 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4914,0.9355,0.1501,3.9290 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4794,0.8922,0.1069,5.5164 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8484,0.8899,0.1072,5.5029 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5278,0.8980,0.1125,5.2438 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9680,0.8906,0.1069,5.5157 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8894,0.9188,0.1333,4.4242 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9079,0.8991,0.1118,5.2773 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9405,0.9004,0.1181,4.9942 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6946,0.9023,0.1187,4.9680 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6017,0.9001,0.1170,5.0402 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4862,0.9182,0.1330,4.4346 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6288,0.9538,0.1692,3.4866 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2302,0.9556,0.1724,3.4207 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4837,0.9546,0.1700,3.4697 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5502,0.9584,0.1738,3.3945 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6749,0.9728,0.1886,3.1270 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2114,1.0019,0.2152,2.7407 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1351,0.9937,0.2092,2.8195 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3187,0.9982,0.2110,2.7948 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7270,1.0055,0.2197,2.6849 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0489,1.0235,0.2359,2.5004 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e7b60accc4f410c4a5aa7b58bb4ae8e70c946c04 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2760,0.8535,0.0691,8.5310 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2550,0.8518,0.0715,8.2477 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4452,0.8544,0.0716,8.2336 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7224,0.8539,0.0708,8.3274 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1407,0.8657,0.0816,7.2289 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3592,0.8589,0.0740,7.9726 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4640,0.8560,0.0746,7.9083 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0910,0.8569,0.0742,7.9440 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7259,0.8555,0.0736,8.0098 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5353,0.8658,0.0823,7.1673 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8191,0.8585,0.0765,7.7061 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6923,0.8564,0.0756,7.7991 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4640,0.8595,0.0772,7.6429 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3619,0.8553,0.0743,7.9338 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3392,0.8655,0.0826,7.1382 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5337,0.9028,0.1172,5.0329 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8184,0.8944,0.1101,5.3561 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1809,0.8958,0.1122,5.2584 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3296,0.8931,0.1109,5.3191 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6107,0.9134,0.1266,4.6599 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1314,0.9338,0.1454,4.0568 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6193,0.9193,0.1362,4.3316 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0086,0.9252,0.1390,4.2430 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6060,0.9294,0.1445,4.0830 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0070,0.9474,0.1605,3.6756 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e9b6b4d0b95b60207296a2c0b27641de6fcc53c1 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6791,0.9706,0.1779,3.3152 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9716,0.9672,0.1814,3.2524 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5447,0.9915,0.2027,2.9098 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2529,0.9719,0.1886,3.1274 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8078,1.0364,0.2494,2.3649 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5769,0.9657,0.1788,3.2981 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2436,0.9875,0.1988,2.9676 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0279,0.9947,0.2036,2.8976 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1830,0.9804,0.1948,3.0272 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0947,1.0286,0.2386,2.4723 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9671,0.9818,0.1973,2.9889 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3855,1.0069,0.2191,2.6917 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2270,1.0112,0.2236,2.6377 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7541,1.0041,0.2178,2.7084 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6367,1.0342,0.2490,2.3691 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7154,1.0699,0.2798,2.1079 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5329,1.0737,0.2845,2.0730 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7962,1.0883,0.3001,1.9654 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6495,1.0785,0.2914,2.0240 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7421,1.1056,0.3165,1.8637 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2539,1.1522,0.3611,1.6334 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3575,1.1291,0.3396,1.7368 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5160,1.1609,0.3714,1.5881 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8203,1.1494,0.3583,1.6462 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0748,1.1699,0.3765,1.5667 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..fc0c7a2538f596f3b7d64e656e9aba4ae2c09d78 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8052,1.1680,0.3845,1.5341 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.2886,1.1961,0.4145,1.4230 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0376,1.2213,0.4400,1.3405 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4310,1.1932,0.4117,1.4328 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9371,1.2916,0.5090,1.1589 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6368,1.1790,0.3956,1.4910 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4796,1.2493,0.4682,1.2597 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4337,1.2465,0.4633,1.2732 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3096,1.2139,0.4325,1.3637 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2314,1.3500,0.5283,1.1165 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0234,1.2270,0.4458,1.3232 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6006,1.3058,0.5271,1.1189 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5616,1.2977,0.5154,1.1444 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8595,1.2725,0.4921,1.1987 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7461,1.3343,0.5514,1.0698 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7688,1.4164,0.6310,0.9348 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7406,1.4783,0.6898,0.8551 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0276,1.4825,0.6993,0.8435 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7391,1.4567,0.6721,0.8775 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8188,1.5004,0.7152,0.8247 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2935,1.6361,0.8456,0.6975 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5420,1.5447,0.7590,0.7771 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7156,1.6424,0.8543,0.6904 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8817,1.6191,0.8321,0.7089 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1183,1.6916,0.9037,0.6527 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..72e50f5758cedbd8b332bf599d78c59fa6060ff4 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5079,0.8457,0.0978,6.0320 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6274,0.8312,0.0932,6.3275 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1770,0.8442,0.1043,5.6576 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9296,0.8348,0.0950,6.2116 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4914,0.8706,0.1296,4.5510 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4794,0.8310,0.0890,6.6272 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8484,0.8288,0.0896,6.5799 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5278,0.8365,0.0941,6.2671 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9680,0.8306,0.0893,6.6031 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8894,0.8544,0.1111,5.3097 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9079,0.8336,0.0927,6.3623 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9405,0.8358,0.0975,6.0466 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6946,0.8359,0.0990,5.9563 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6017,0.8358,0.0971,6.0753 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4862,0.8529,0.1106,5.3320 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6288,0.8844,0.1419,4.1578 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2302,0.8840,0.1441,4.0939 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4837,0.8825,0.1424,4.1420 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5502,0.8869,0.1465,4.0271 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6749,0.8981,0.1576,3.7424 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2114,0.9343,0.1903,3.0993 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1351,0.9263,0.1852,3.1856 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3187,0.9270,0.1872,3.1501 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7270,0.9351,0.1942,3.0371 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0489,0.9499,0.2081,2.8345 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..b5a54ddf58c4ce44e36a2056aa5d5c9b22c82a34 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2760,0.7996,0.0590,10.0045 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2550,0.7967,0.0610,9.6644 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4452,0.7992,0.0613,9.6263 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7224,0.7984,0.0604,9.7585 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1407,0.8092,0.0700,8.4290 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3592,0.8006,0.0611,9.6577 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4640,0.8004,0.0619,9.5299 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0910,0.7997,0.0615,9.5860 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7259,0.7991,0.0612,9.6431 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5353,0.8082,0.0685,8.6083 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8191,0.8023,0.0631,9.3509 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6923,0.7991,0.0619,9.5322 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4640,0.8017,0.0635,9.2842 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3619,0.7970,0.0615,9.5961 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3392,0.8084,0.0682,8.6516 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5337,0.8360,0.0974,6.0584 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8184,0.8303,0.0914,6.4521 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1809,0.8320,0.0936,6.3015 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3296,0.8307,0.0924,6.3825 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6107,0.8464,0.1058,5.5724 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1314,0.8714,0.1288,4.5792 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6193,0.8605,0.1211,4.8692 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0086,0.8637,0.1227,4.8066 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6060,0.8670,0.1281,4.6059 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0070,0.8840,0.1420,4.1531 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7c298f9d58b44e71464fddd1611ca6dcf67d46e7 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6791,0.8997,0.1529,3.8574 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9716,0.8938,0.1543,3.8214 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5447,0.9155,0.1733,3.4034 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2529,0.9006,0.1607,3.6702 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8078,0.9585,0.2138,2.7584 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5769,0.8973,0.1477,3.9931 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2436,0.9087,0.1636,3.6048 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0279,0.9116,0.1680,3.5100 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1830,0.9023,0.1603,3.6805 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0947,0.9426,0.1981,2.9778 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9671,0.9067,0.1624,3.6319 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3855,0.9219,0.1804,3.2697 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2270,0.9258,0.1830,3.2235 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7541,0.9189,0.1793,3.2903 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6367,0.9469,0.2048,2.8805 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7154,0.9796,0.2342,2.5189 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5329,0.9837,0.2401,2.4566 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7962,0.9970,0.2508,2.3519 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6495,0.9866,0.2446,2.4111 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7421,1.0097,0.2658,2.2192 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2539,1.0647,0.3198,1.8446 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3575,1.0460,0.3009,1.9604 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5160,1.0729,0.3289,1.7931 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8203,1.0576,0.3170,1.8605 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0748,1.0818,0.3334,1.7693 diff --git a/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..da811bb15efde4fa3153ada1e77b4347d3b4932d --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8052,1.0786,0.3292,1.7916 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.2886,1.0905,0.3522,1.6749 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0376,1.1171,0.3752,1.5721 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4310,1.0893,0.3493,1.6886 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9371,1.1804,0.4371,1.3494 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6368,1.0729,0.3290,1.7926 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4796,1.1250,0.3890,1.5162 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4337,1.1292,0.3852,1.5313 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3096,1.0993,0.3559,1.6574 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2314,1.1739,0.4282,1.3775 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0234,1.1155,0.3727,1.5827 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6006,1.1793,0.4357,1.3539 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5616,1.1686,0.4286,1.3761 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8595,1.1499,0.4082,1.4448 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7461,1.2053,0.4604,1.2812 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7688,1.2883,0.5394,1.0935 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7406,1.3215,0.5810,1.0152 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0276,1.3374,0.5928,0.9950 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7391,1.3119,0.5683,1.0380 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8188,1.3614,0.6139,0.9608 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2935,1.5051,0.7522,0.7842 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5420,1.4190,0.6740,0.8751 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7156,1.5078,0.7612,0.7749 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8817,1.4883,0.7420,0.7949 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1183,1.5556,0.8036,0.7339 diff --git a/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..025e99d4fc69dfe4bbed75e9d8f4dd0cae0b52d6 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.5079,0.8396,0.0896,6.5794 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.6274,0.8331,0.0852,6.9227 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.1770,0.8468,0.0958,6.1568 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.9296,0.8359,0.0868,6.7923 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.4914,0.8719,0.1195,4.9371 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.4794,0.8296,0.0782,7.5383 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.8484,0.8304,0.0785,7.5144 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.5278,0.8347,0.0827,7.1361 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.9680,0.8281,0.0784,7.5199 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.8894,0.8479,0.0983,5.9994 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9079,0.8267,0.0762,7.7395 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.9405,0.8279,0.0803,7.3473 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.6946,0.8308,0.0815,7.2355 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.6017,0.8292,0.0799,7.3775 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.4862,0.8422,0.0920,6.4083 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.6288,0.8606,0.1109,5.3177 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.2302,0.8621,0.1108,5.3224 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.4837,0.8619,0.1104,5.3407 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.5502,0.8643,0.1133,5.2069 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6749,0.8751,0.1232,4.7861 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2114,0.8965,0.1444,4.0839 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.1351,0.8903,0.1385,4.2579 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.3187,0.8909,0.1413,4.1733 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.7270,0.8951,0.1471,4.0086 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0489,0.9084,0.1587,3.7169 diff --git a/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..91d2c261c764aacb9fdfda1f739341cc6e10aea1 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.2760,0.8075,0.0542,10.8787 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.2550,0.8081,0.0558,10.5610 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,48.4452,0.8029,0.0563,10.4707 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,51.7224,0.8057,0.0557,10.5982 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.1407,0.8163,0.0643,9.1734 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.3592,0.8054,0.0542,10.8898 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,51.4640,0.8068,0.0547,10.7886 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,45.0910,0.8044,0.0543,10.8533 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,48.7259,0.8063,0.0540,10.9134 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,30.5353,0.8136,0.0603,9.7805 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.8191,0.8026,0.0517,11.4181 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,48.6923,0.8008,0.0511,11.5375 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,42.4640,0.7975,0.0523,11.2760 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.3619,0.7960,0.0509,11.5786 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.3392,0.8043,0.0560,10.5235 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.5337,0.8293,0.0775,7.6095 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,44.8184,0.8228,0.0718,8.2121 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.1809,0.8227,0.0738,7.9898 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.3296,0.8230,0.0733,8.0426 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.6107,0.8371,0.0842,7.0060 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.1314,0.8518,0.0984,5.9950 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,40.6193,0.8424,0.0912,6.4648 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.0086,0.8432,0.0933,6.3249 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.6060,0.8470,0.0973,6.0591 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0070,0.8621,0.1082,5.4494 diff --git a/Test/Images/HDRIHaven/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..584cc7228c0cd609cfbcc050014544a4b44c7890 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.6791,0.8959,0.1369,4.3097 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,55.9716,0.8895,0.1368,4.3116 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,49.5447,0.9042,0.1537,3.8377 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.2529,0.8932,0.1427,4.1321 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.8078,0.9405,0.1906,3.0946 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.5769,0.8758,0.1258,4.6900 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.2436,0.8908,0.1383,4.2648 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.0279,0.8939,0.1436,4.1068 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.1830,0.8882,0.1354,4.3555 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.0947,0.9208,0.1685,3.5010 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,37.9671,0.8810,0.1305,4.5182 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.3855,0.8895,0.1446,4.0786 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.2270,0.8974,0.1485,3.9706 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.7541,0.8941,0.1444,4.0844 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.6367,0.9151,0.1666,3.5410 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7154,0.9311,0.1806,3.2656 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.5329,0.9341,0.1805,3.2686 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,39.7962,0.9492,0.1925,3.0637 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.6495,0.9352,0.1874,3.1474 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.7421,0.9606,0.2063,2.8585 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2539,0.9959,0.2422,2.4353 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.3575,0.9777,0.2243,2.6298 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.5160,1.0010,0.2480,2.3782 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8203,0.9906,0.2381,2.4769 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.0748,1.0052,0.2529,2.3321 diff --git a/Test/Images/HDRIHaven/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..24ad49c47b281e6329e22ef1ff2ca28b4ea9e369 --- /dev/null +++ b/Test/Images/HDRIHaven/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,26 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +HDRIHaven,4x4,hdr-rgb-arboretum.hdr,45.8052,1.0508,0.2933,2.0110 +HDRIHaven,4x4,hdr-rgb-bellparkpier.hdr,56.2886,1.0551,0.3098,1.9041 +HDRIHaven,4x4,hdr-rgb-canarywharf.hdr,50.0376,1.0821,0.3315,1.7793 +HDRIHaven,4x4,hdr-rgb-eveningroad.hdr,52.4310,1.0545,0.3060,1.9274 +HDRIHaven,4x4,hdr-rgb-riverwalk.hdr,34.9371,1.1360,0.3868,1.5248 +HDRIHaven,5x5,hdr-rgb-arboretum.hdr,41.6368,1.0331,0.2820,2.0914 +HDRIHaven,5x5,hdr-rgb-bellparkpier.hdr,52.4796,1.0777,0.3283,1.7967 +HDRIHaven,5x5,hdr-rgb-canarywharf.hdr,46.4337,1.0727,0.3253,1.8129 +HDRIHaven,5x5,hdr-rgb-eveningroad.hdr,49.3096,1.0524,0.3027,1.9486 +HDRIHaven,5x5,hdr-rgb-riverwalk.hdr,31.2314,1.1149,0.3652,1.6149 +HDRIHaven,6x6,hdr-rgb-arboretum.hdr,38.0234,1.0530,0.3009,1.9599 +HDRIHaven,6x6,hdr-rgb-bellparkpier.hdr,49.6006,1.1000,0.3525,1.6735 +HDRIHaven,6x6,hdr-rgb-canarywharf.hdr,43.5616,1.0984,0.3477,1.6962 +HDRIHaven,6x6,hdr-rgb-eveningroad.hdr,46.8595,1.0786,0.3309,1.7824 +HDRIHaven,6x6,hdr-rgb-riverwalk.hdr,28.7461,1.1291,0.3767,1.5660 +HDRIHaven,8x8,hdr-rgb-arboretum.hdr,33.7688,1.1665,0.4144,1.4234 +HDRIHaven,8x8,hdr-rgb-bellparkpier.hdr,45.7406,1.1944,0.4401,1.3403 +HDRIHaven,8x8,hdr-rgb-canarywharf.hdr,40.0276,1.2074,0.4505,1.3093 +HDRIHaven,8x8,hdr-rgb-eveningroad.hdr,43.7391,1.1857,0.4370,1.3499 +HDRIHaven,8x8,hdr-rgb-riverwalk.hdr,25.8189,1.2248,0.4733,1.2463 +HDRIHaven,12x12,hdr-rgb-arboretum.hdr,30.2935,1.3326,0.5758,1.0244 +HDRIHaven,12x12,hdr-rgb-bellparkpier.hdr,41.5420,1.2580,0.5059,1.1658 +HDRIHaven,12x12,hdr-rgb-canarywharf.hdr,36.7156,1.3286,0.5744,1.0269 +HDRIHaven,12x12,hdr-rgb-eveningroad.hdr,40.8817,1.3204,0.5622,1.0491 +HDRIHaven,12x12,hdr-rgb-riverwalk.hdr,23.1183,1.3739,0.6153,0.9586 diff --git a/Test/Images/Khronos/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/Khronos/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index 1d46dce281b9af1c3aa9846f1004d9ad9e7abeb0..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.2943,0.0386,0.0147,71.4537 -Khronos,4x4,ldr-rgb-diffuse.png,52.5337,0.2415,0.0859,48.8158 -Khronos,4x4,ldr-rgb-emissive.png,58.5505,0.0416,0.0154,68.2937 -Khronos,4x4,ldr-rgb-metalrough.png,44.2748,0.0992,0.0575,18.2504 -Khronos,4x4,ldr-rgb-metalrough2.png,42.9160,0.5165,0.3468,12.0938 -Khronos,4x4,ldr-rgba-base.png,43.2384,0.1210,0.0716,14.6384 -Khronos,4x4,ldr-rgba-diffuse.png,43.8337,0.0992,0.0528,19.8488 -Khronos,4x4,ldr-rgba-specgloss.png,41.6515,0.1589,0.1065,9.8465 -Khronos,4x4,ldr-xy-normal1.png,44.9658,0.1682,0.0882,11.8946 -Khronos,4x4,ldr-xy-normal2.png,48.6954,0.4019,0.1394,30.0841 -Khronos,5x5,ldr-l-occlusion.png,54.3853,0.0378,0.0131,79.9107 -Khronos,5x5,ldr-rgb-diffuse.png,47.2206,0.2291,0.0734,57.1516 -Khronos,5x5,ldr-rgb-emissive.png,52.6484,0.0404,0.0133,78.5800 -Khronos,5x5,ldr-rgb-metalrough.png,39.8152,0.0886,0.0456,22.9809 -Khronos,5x5,ldr-rgb-metalrough2.png,37.8813,0.5293,0.3558,11.7871 -Khronos,5x5,ldr-rgba-base.png,38.8783,0.1061,0.0559,18.7530 -Khronos,5x5,ldr-rgba-diffuse.png,39.1281,0.1027,0.0555,18.8830 -Khronos,5x5,ldr-rgba-specgloss.png,38.3729,0.1246,0.0711,14.7450 -Khronos,5x5,ldr-xy-normal1.png,41.8817,0.1494,0.0680,15.4148 -Khronos,5x5,ldr-xy-normal2.png,46.1664,0.3829,0.1028,40.7974 -Khronos,6x6,ldr-l-occlusion.png,48.3853,0.0383,0.0129,81.5072 -Khronos,6x6,ldr-rgb-diffuse.png,43.2790,0.2424,0.0865,48.4902 -Khronos,6x6,ldr-rgb-emissive.png,49.1258,0.0399,0.0121,86.9042 -Khronos,6x6,ldr-rgb-metalrough.png,36.4555,0.0965,0.0541,19.3847 -Khronos,6x6,ldr-rgb-metalrough2.png,35.2939,0.5438,0.3699,11.3389 -Khronos,6x6,ldr-rgba-base.png,36.1037,0.1132,0.0626,16.7630 -Khronos,6x6,ldr-rgba-diffuse.png,36.0866,0.1146,0.0669,15.6714 -Khronos,6x6,ldr-rgba-specgloss.png,36.1059,0.1287,0.0750,13.9719 -Khronos,6x6,ldr-xy-normal1.png,39.6565,0.1452,0.0635,16.5031 -Khronos,6x6,ldr-xy-normal2.png,44.1113,0.3798,0.1007,41.6365 -Khronos,8x8,ldr-l-occlusion.png,43.9509,0.0416,0.0122,85.8775 -Khronos,8x8,ldr-rgb-diffuse.png,38.3579,0.2523,0.0949,44.1743 -Khronos,8x8,ldr-rgb-emissive.png,44.5417,0.0427,0.0109,95.8640 -Khronos,8x8,ldr-rgb-metalrough.png,32.3176,0.1158,0.0690,15.1899 -Khronos,8x8,ldr-rgb-metalrough2.png,32.1727,0.4674,0.2935,14.2886 -Khronos,8x8,ldr-rgba-base.png,32.3786,0.1234,0.0692,15.1452 -Khronos,8x8,ldr-rgba-diffuse.png,32.1163,0.1365,0.0846,12.3892 -Khronos,8x8,ldr-rgba-specgloss.png,32.9674,0.1355,0.0783,13.3935 -Khronos,8x8,ldr-xy-normal1.png,36.4984,0.1438,0.0576,18.2167 -Khronos,8x8,ldr-xy-normal2.png,40.6917,0.3854,0.1034,40.5509 -Khronos,12x12,ldr-l-occlusion.png,40.5785,0.0473,0.0110,95.1340 -Khronos,12x12,ldr-rgb-diffuse.png,33.3691,0.2326,0.0684,61.2780 -Khronos,12x12,ldr-rgb-emissive.png,39.4740,0.0486,0.0103,101.7949 -Khronos,12x12,ldr-rgb-metalrough.png,28.6341,0.0929,0.0384,27.2874 -Khronos,12x12,ldr-rgb-metalrough2.png,29.2524,0.3020,0.1227,34.1910 -Khronos,12x12,ldr-rgba-base.png,29.0205,0.1116,0.0513,20.4413 -Khronos,12x12,ldr-rgba-diffuse.png,28.6231,0.1177,0.0594,17.6626 -Khronos,12x12,ldr-rgba-specgloss.png,29.8092,0.1049,0.0419,25.0203 -Khronos,12x12,ldr-xy-normal1.png,32.7294,0.1286,0.0359,29.2147 -Khronos,12x12,ldr-xy-normal2.png,36.2128,0.3758,0.0876,47.8994 diff --git a/Test/Images/Khronos/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/Khronos/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index ad14980f8afb57bf066d18fa8823fb5da2dbade9..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.1811,0.0375,0.0144,72.7575 -Khronos,4x4,ldr-rgb-diffuse.png,52.3048,0.2331,0.0787,53.2643 -Khronos,4x4,ldr-rgb-emissive.png,57.9745,0.0387,0.0131,80.3076 -Khronos,4x4,ldr-rgb-metalrough.png,43.8757,0.0817,0.0407,25.7438 -Khronos,4x4,ldr-rgb-metalrough2.png,42.6172,0.3854,0.2183,19.2135 -Khronos,4x4,ldr-rgba-base.png,42.7808,0.0944,0.0460,22.8164 -Khronos,4x4,ldr-rgba-diffuse.png,43.2186,0.0815,0.0354,29.6065 -Khronos,4x4,ldr-rgba-specgloss.png,41.2397,0.1183,0.0669,15.6705 -Khronos,4x4,ldr-xy-normal1.png,44.7980,0.1331,0.0546,19.2216 -Khronos,4x4,ldr-xy-normal2.png,48.3359,0.3786,0.1093,38.3777 -Khronos,5x5,ldr-l-occlusion.png,53.9891,0.0370,0.0131,80.1963 -Khronos,5x5,ldr-rgb-diffuse.png,47.0472,0.2246,0.0715,58.6330 -Khronos,5x5,ldr-rgb-emissive.png,52.3396,0.0389,0.0127,82.5258 -Khronos,5x5,ldr-rgb-metalrough.png,39.2552,0.0759,0.0343,30.6072 -Khronos,5x5,ldr-rgb-metalrough2.png,37.2923,0.3998,0.2309,18.1682 -Khronos,5x5,ldr-rgba-base.png,38.0848,0.0889,0.0383,27.3894 -Khronos,5x5,ldr-rgba-diffuse.png,38.3579,0.0834,0.0363,28.8569 -Khronos,5x5,ldr-rgba-specgloss.png,37.9190,0.1015,0.0493,21.2658 -Khronos,5x5,ldr-xy-normal1.png,41.3049,0.1307,0.0495,21.2035 -Khronos,5x5,ldr-xy-normal2.png,45.6138,0.3686,0.0888,47.2310 -Khronos,6x6,ldr-l-occlusion.png,48.3038,0.0366,0.0122,85.7102 -Khronos,6x6,ldr-rgb-diffuse.png,43.2173,0.2309,0.0732,57.3132 -Khronos,6x6,ldr-rgb-emissive.png,48.9702,0.0376,0.0113,93.0587 -Khronos,6x6,ldr-rgb-metalrough.png,36.2530,0.0792,0.0372,28.1921 -Khronos,6x6,ldr-rgb-metalrough2.png,35.0960,0.3954,0.2243,18.6964 -Khronos,6x6,ldr-rgba-base.png,35.9357,0.0904,0.0405,25.8742 -Khronos,6x6,ldr-rgba-diffuse.png,35.9044,0.0883,0.0413,25.3634 -Khronos,6x6,ldr-rgba-specgloss.png,35.8773,0.1009,0.0485,21.6045 -Khronos,6x6,ldr-xy-normal1.png,38.8396,0.1267,0.0472,22.2335 -Khronos,6x6,ldr-xy-normal2.png,43.4426,0.3650,0.0851,49.2984 -Khronos,8x8,ldr-l-occlusion.png,43.4865,0.0385,0.0111,94.6529 -Khronos,8x8,ldr-rgb-diffuse.png,38.2787,0.2353,0.0790,53.0696 -Khronos,8x8,ldr-rgb-emissive.png,44.2565,0.0390,0.0092,114.1994 -Khronos,8x8,ldr-rgb-metalrough.png,32.2167,0.0934,0.0481,21.7935 -Khronos,8x8,ldr-rgb-metalrough2.png,32.0902,0.3822,0.2106,19.9168 -Khronos,8x8,ldr-rgba-base.png,32.2303,0.1004,0.0483,21.7285 -Khronos,8x8,ldr-rgba-diffuse.png,32.0058,0.1076,0.0577,18.1755 -Khronos,8x8,ldr-rgba-specgloss.png,32.8371,0.1099,0.0539,19.4595 -Khronos,8x8,ldr-xy-normal1.png,36.2071,0.1247,0.0412,25.4632 -Khronos,8x8,ldr-xy-normal2.png,40.2733,0.3631,0.0835,50.2096 -Khronos,12x12,ldr-l-occlusion.png,40.2271,0.0419,0.0100,104.7952 -Khronos,12x12,ldr-rgb-diffuse.png,33.3234,0.2198,0.0591,71.0259 -Khronos,12x12,ldr-rgb-emissive.png,39.2738,0.0428,0.0090,115.9180 -Khronos,12x12,ldr-rgb-metalrough.png,28.5929,0.0781,0.0289,36.2815 -Khronos,12x12,ldr-rgb-metalrough2.png,29.1679,0.2725,0.0972,43.1420 -Khronos,12x12,ldr-rgba-base.png,28.9701,0.0943,0.0376,27.8670 -Khronos,12x12,ldr-rgba-diffuse.png,28.5748,0.0977,0.0435,24.0964 -Khronos,12x12,ldr-rgba-specgloss.png,29.7683,0.0904,0.0313,33.4837 -Khronos,12x12,ldr-xy-normal1.png,32.6096,0.1176,0.0285,36.7871 -Khronos,12x12,ldr-xy-normal2.png,36.0023,0.3571,0.0737,56.9151 diff --git a/Test/Images/Khronos/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/Khronos/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index 606bd7de77a674a1e4314e9bb1b5ab272910202c..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,67.9245,0.0471,0.0224,46.7340 -Khronos,4x4,ldr-rgb-diffuse.png,54.0221,0.4039,0.2498,16.7923 -Khronos,4x4,ldr-rgb-emissive.png,59.8356,0.0507,0.0238,44.0951 -Khronos,4x4,ldr-rgb-metalrough.png,44.8439,0.2333,0.1912,5.4847 -Khronos,4x4,ldr-rgb-metalrough2.png,43.7387,1.4456,1.2744,3.2913 -Khronos,4x4,ldr-rgba-base.png,43.8181,0.2962,0.2473,4.2398 -Khronos,4x4,ldr-rgba-diffuse.png,44.2283,0.2173,0.1704,6.1535 -Khronos,4x4,ldr-rgba-specgloss.png,42.2924,0.3928,0.3399,3.0853 -Khronos,4x4,ldr-xy-normal1.png,46.4815,0.3525,0.2721,3.8542 -Khronos,4x4,ldr-xy-normal2.png,50.2696,0.8003,0.5465,7.6749 -Khronos,5x5,ldr-l-occlusion.png,57.1580,0.0505,0.0245,42.8584 -Khronos,5x5,ldr-rgb-diffuse.png,48.9900,0.4062,0.2519,16.6506 -Khronos,5x5,ldr-rgb-emissive.png,55.3732,0.0528,0.0241,43.5364 -Khronos,5x5,ldr-rgb-metalrough.png,40.2386,0.2521,0.2080,5.0420 -Khronos,5x5,ldr-rgb-metalrough2.png,39.0265,1.6811,1.5087,2.7801 -Khronos,5x5,ldr-rgba-base.png,39.3979,0.3260,0.2742,3.8247 -Khronos,5x5,ldr-rgba-diffuse.png,39.5646,0.2613,0.2127,4.9296 -Khronos,5x5,ldr-rgba-specgloss.png,38.7813,0.4196,0.3647,2.8752 -Khronos,5x5,ldr-xy-normal1.png,43.0494,0.3306,0.2483,4.2224 -Khronos,5x5,ldr-xy-normal2.png,47.2289,0.6889,0.4172,10.0542 -Khronos,6x6,ldr-l-occlusion.png,50.8663,0.0569,0.0305,34.4157 -Khronos,6x6,ldr-rgb-diffuse.png,44.9305,0.4123,0.2568,16.3318 -Khronos,6x6,ldr-rgb-emissive.png,51.5230,0.0516,0.0229,45.8474 -Khronos,6x6,ldr-rgb-metalrough.png,36.8282,0.2588,0.2148,4.8805 -Khronos,6x6,ldr-rgb-metalrough2.png,36.4385,1.6463,1.4733,2.8469 -Khronos,6x6,ldr-rgba-base.png,36.6372,0.2979,0.2463,4.2573 -Khronos,6x6,ldr-rgba-diffuse.png,36.4889,0.2786,0.2295,4.5690 -Khronos,6x6,ldr-rgba-specgloss.png,36.4896,0.4238,0.3685,2.8455 -Khronos,6x6,ldr-xy-normal1.png,40.6311,0.2807,0.1979,5.2993 -Khronos,6x6,ldr-xy-normal2.png,45.1540,0.5110,0.2285,18.3564 -Khronos,8x8,ldr-l-occlusion.png,45.4494,0.0654,0.0352,29.7704 -Khronos,8x8,ldr-rgb-diffuse.png,40.2397,0.5202,0.3586,11.6971 -Khronos,8x8,ldr-rgb-emissive.png,46.7056,0.0587,0.0261,40.2170 -Khronos,8x8,ldr-rgb-metalrough.png,32.6674,0.3371,0.2881,3.6396 -Khronos,8x8,ldr-rgb-metalrough2.png,33.1989,1.8101,1.6358,2.5641 -Khronos,8x8,ldr-rgba-base.png,33.0632,0.3187,0.2642,3.9686 -Khronos,8x8,ldr-rgba-diffuse.png,32.5747,0.3644,0.3118,3.3631 -Khronos,8x8,ldr-rgba-specgloss.png,33.4751,0.4471,0.3893,2.6934 -Khronos,8x8,ldr-xy-normal1.png,37.4171,0.3091,0.2215,4.7342 -Khronos,8x8,ldr-xy-normal2.png,42.0727,0.5276,0.2448,17.1344 -Khronos,12x12,ldr-l-occlusion.png,41.6742,0.0605,0.0220,47.7213 -Khronos,12x12,ldr-rgb-diffuse.png,35.7658,0.4717,0.3044,13.7780 -Khronos,12x12,ldr-rgb-emissive.png,41.3741,0.0694,0.0286,36.6788 -Khronos,12x12,ldr-rgb-metalrough.png,29.0892,0.3004,0.2445,4.2891 -Khronos,12x12,ldr-rgb-metalrough2.png,30.1599,1.1734,0.9917,4.2296 -Khronos,12x12,ldr-rgba-base.png,29.6109,0.3060,0.2439,4.2985 -Khronos,12x12,ldr-rgba-diffuse.png,29.0613,0.4114,0.3503,2.9933 -Khronos,12x12,ldr-rgba-specgloss.png,30.4743,0.3253,0.2578,4.0673 -Khronos,12x12,ldr-xy-normal1.png,33.4993,0.2788,0.1831,5.7260 -Khronos,12x12,ldr-xy-normal2.png,37.8161,0.5493,0.2584,16.2331 diff --git a/Test/Images/Khronos/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/Khronos/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index e22a0ef662f1c41cd0b179b2a9a805fb8651e8a4..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,70.5315,0.0890,0.0644,16.2895 -Khronos,4x4,ldr-rgb-diffuse.png,54.7187,1.8348,1.6789,2.4982 -Khronos,4x4,ldr-rgb-emissive.png,60.8411,0.0771,0.0500,20.9841 -Khronos,4x4,ldr-rgb-metalrough.png,44.9834,0.5172,0.4748,2.2086 -Khronos,4x4,ldr-rgb-metalrough2.png,44.0109,3.0104,2.8367,1.4786 -Khronos,4x4,ldr-rgba-base.png,44.0067,0.6797,0.6302,1.6639 -Khronos,4x4,ldr-rgba-diffuse.png,44.4135,0.4941,0.4464,2.3489 -Khronos,4x4,ldr-rgba-specgloss.png,42.4620,0.8713,0.8182,1.2816 -Khronos,4x4,ldr-xy-normal1.png,46.6816,1.0432,0.9630,1.0889 -Khronos,4x4,ldr-xy-normal2.png,50.5731,2.7388,2.4906,1.6841 -Khronos,5x5,ldr-l-occlusion.png,58.7308,0.1542,0.1278,8.2076 -Khronos,5x5,ldr-rgb-diffuse.png,49.7919,1.5934,1.4369,2.9189 -Khronos,5x5,ldr-rgb-emissive.png,56.1398,0.0879,0.0595,17.6142 -Khronos,5x5,ldr-rgb-metalrough.png,40.4561,0.6178,0.5739,1.8271 -Khronos,5x5,ldr-rgb-metalrough2.png,39.4939,3.5505,3.3775,1.2418 -Khronos,5x5,ldr-rgba-base.png,39.7539,0.7923,0.7392,1.4186 -Khronos,5x5,ldr-rgba-diffuse.png,39.8978,0.5850,0.5359,1.9565 -Khronos,5x5,ldr-rgba-specgloss.png,39.0262,0.9859,0.9311,1.1262 -Khronos,5x5,ldr-xy-normal1.png,43.4105,1.2222,1.1415,0.9186 -Khronos,5x5,ldr-xy-normal2.png,47.7893,3.5399,3.2755,1.2805 -Khronos,6x6,ldr-l-occlusion.png,52.2696,0.2047,0.1784,5.8767 -Khronos,6x6,ldr-rgb-diffuse.png,45.7745,1.4895,1.3304,3.1526 -Khronos,6x6,ldr-rgb-emissive.png,52.6625,0.0966,0.0679,15.4371 -Khronos,6x6,ldr-rgb-metalrough.png,37.0147,0.7595,0.7145,1.4676 -Khronos,6x6,ldr-rgb-metalrough2.png,36.7447,4.2513,4.0776,1.0286 -Khronos,6x6,ldr-rgba-base.png,36.8327,0.9392,0.8874,1.1816 -Khronos,6x6,ldr-rgba-diffuse.png,36.6564,0.7070,0.6575,1.5947 -Khronos,6x6,ldr-rgba-specgloss.png,36.6739,1.1431,1.0886,0.9632 -Khronos,6x6,ldr-xy-normal1.png,41.1133,1.0974,1.0155,1.0325 -Khronos,6x6,ldr-xy-normal2.png,45.8124,2.8938,2.6204,1.6007 -Khronos,8x8,ldr-l-occlusion.png,46.0393,0.2484,0.2170,4.8313 -Khronos,8x8,ldr-rgb-diffuse.png,40.8641,1.5870,1.4261,2.9412 -Khronos,8x8,ldr-rgb-emissive.png,47.6060,0.1006,0.0668,15.6956 -Khronos,8x8,ldr-rgb-metalrough.png,32.8279,0.9382,0.8883,1.1805 -Khronos,8x8,ldr-rgb-metalrough2.png,33.5845,5.2332,5.0573,0.8294 -Khronos,8x8,ldr-rgba-base.png,33.2523,1.1619,1.1053,0.9487 -Khronos,8x8,ldr-rgba-diffuse.png,32.7215,0.9205,0.8662,1.2106 -Khronos,8x8,ldr-rgba-specgloss.png,33.6278,1.4210,1.3596,0.7712 -Khronos,8x8,ldr-xy-normal1.png,37.7223,0.7286,0.6426,1.6319 -Khronos,8x8,ldr-xy-normal2.png,42.5159,1.3968,1.1160,3.7585 -Khronos,12x12,ldr-l-occlusion.png,42.4633,0.2079,0.1684,6.2280 -Khronos,12x12,ldr-rgb-diffuse.png,36.6027,1.7913,1.6187,2.5911 -Khronos,12x12,ldr-rgb-emissive.png,42.3476,0.1380,0.0939,11.1628 -Khronos,12x12,ldr-rgb-metalrough.png,29.2644,1.1208,1.0620,0.9873 -Khronos,12x12,ldr-rgb-metalrough2.png,30.7448,5.7565,5.5722,0.7527 -Khronos,12x12,ldr-rgba-base.png,29.9105,1.2119,1.1465,0.9146 -Khronos,12x12,ldr-rgba-diffuse.png,29.2512,1.1582,1.0952,0.9574 -Khronos,12x12,ldr-rgba-specgloss.png,30.6950,1.6220,1.5533,0.6751 -Khronos,12x12,ldr-xy-normal1.png,33.9598,0.7437,0.6468,1.6212 -Khronos,12x12,ldr-xy-normal2.png,38.4366,1.1253,0.8352,5.0220 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index 4222587389061d90267efd5a86f3506f85eaed55..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.2943,0.0433,0.0174,60.1623 -Khronos,4x4,ldr-rgb-diffuse.png,52.5337,0.2688,0.1110,37.7957 -Khronos,4x4,ldr-rgb-emissive.png,58.5505,0.0432,0.0148,70.7684 -Khronos,4x4,ldr-rgb-metalrough.png,44.2748,0.1163,0.0736,14.2373 -Khronos,4x4,ldr-rgb-metalrough2.png,42.9160,0.6176,0.4457,9.4114 -Khronos,4x4,ldr-rgba-base.png,43.2384,0.1418,0.0922,11.3775 -Khronos,4x4,ldr-rgba-diffuse.png,43.8337,0.1160,0.0681,15.3924 -Khronos,4x4,ldr-rgba-specgloss.png,41.6515,0.1904,0.1368,7.6640 -Khronos,4x4,ldr-xy-normal1.png,44.9658,0.1949,0.1137,9.2198 -Khronos,4x4,ldr-xy-normal2.png,48.6954,0.4516,0.1818,23.0719 -Khronos,5x5,ldr-l-occlusion.png,54.3853,0.0414,0.0142,74.0462 -Khronos,5x5,ldr-rgb-diffuse.png,47.2206,0.2468,0.0869,48.2626 -Khronos,5x5,ldr-rgb-emissive.png,52.6484,0.0423,0.0130,80.6345 -Khronos,5x5,ldr-rgb-metalrough.png,39.8152,0.1045,0.0612,17.1235 -Khronos,5x5,ldr-rgb-metalrough2.png,37.8813,0.6623,0.4883,8.5904 -Khronos,5x5,ldr-rgba-base.png,38.8783,0.1251,0.0738,14.2159 -Khronos,5x5,ldr-rgba-diffuse.png,39.1281,0.1216,0.0724,14.4781 -Khronos,5x5,ldr-rgba-specgloss.png,38.3729,0.1507,0.0960,10.9187 -Khronos,5x5,ldr-xy-normal1.png,41.8817,0.1733,0.0897,11.6877 -Khronos,5x5,ldr-xy-normal2.png,46.1664,0.4135,0.1290,32.5027 -Khronos,6x6,ldr-l-occlusion.png,48.3853,0.0427,0.0151,69.3458 -Khronos,6x6,ldr-rgb-diffuse.png,43.2790,0.2766,0.1161,36.1276 -Khronos,6x6,ldr-rgb-emissive.png,49.1258,0.0426,0.0130,80.8777 -Khronos,6x6,ldr-rgb-metalrough.png,36.4555,0.1213,0.0775,13.5237 -Khronos,6x6,ldr-rgb-metalrough2.png,35.2939,0.7031,0.5287,7.9328 -Khronos,6x6,ldr-rgba-base.png,36.1037,0.1404,0.0888,11.8119 -Khronos,6x6,ldr-rgba-diffuse.png,36.0866,0.1435,0.0943,11.1160 -Khronos,6x6,ldr-rgba-specgloss.png,36.1059,0.1627,0.1076,9.7480 -Khronos,6x6,ldr-xy-normal1.png,39.6565,0.1726,0.0885,11.8487 -Khronos,6x6,ldr-xy-normal2.png,44.1113,0.4143,0.1308,32.0729 -Khronos,8x8,ldr-l-occlusion.png,43.9509,0.0469,0.0157,66.6401 -Khronos,8x8,ldr-rgb-diffuse.png,38.3579,0.2976,0.1371,30.6031 -Khronos,8x8,ldr-rgb-emissive.png,44.5417,0.0471,0.0134,78.3630 -Khronos,8x8,ldr-rgb-metalrough.png,32.3176,0.1517,0.1036,10.1257 -Khronos,8x8,ldr-rgb-metalrough2.png,32.1727,0.6083,0.4304,9.7461 -Khronos,8x8,ldr-rgba-base.png,32.3786,0.1574,0.1023,10.2521 -Khronos,8x8,ldr-rgba-diffuse.png,32.1163,0.1786,0.1255,8.3526 -Khronos,8x8,ldr-rgba-specgloss.png,32.9674,0.1749,0.1161,9.0284 -Khronos,8x8,ldr-xy-normal1.png,36.4984,0.1726,0.0846,12.4013 -Khronos,8x8,ldr-xy-normal2.png,40.6917,0.4408,0.1508,27.8198 -Khronos,12x12,ldr-l-occlusion.png,40.5785,0.0524,0.0144,73.0306 -Khronos,12x12,ldr-rgb-diffuse.png,33.3691,0.2643,0.0977,42.9217 -Khronos,12x12,ldr-rgb-emissive.png,39.4740,0.0531,0.0124,84.2844 -Khronos,12x12,ldr-rgb-metalrough.png,28.6341,0.1106,0.0565,18.5717 -Khronos,12x12,ldr-rgb-metalrough2.png,29.2524,0.3622,0.1777,23.6053 -Khronos,12x12,ldr-rgba-base.png,29.0205,0.1365,0.0758,13.8340 -Khronos,12x12,ldr-rgba-diffuse.png,28.6231,0.1462,0.0870,12.0523 -Khronos,12x12,ldr-rgba-specgloss.png,29.8092,0.1255,0.0606,17.2955 -Khronos,12x12,ldr-xy-normal1.png,32.7294,0.1484,0.0526,19.9429 -Khronos,12x12,ldr-xy-normal2.png,36.2128,0.4227,0.1276,32.8798 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index 1cfe65941edd059eca2801b296e87ab3239806cf..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.1811,0.0406,0.0150,69.9513 -Khronos,4x4,ldr-rgb-diffuse.png,52.3048,0.2564,0.0993,42.2591 -Khronos,4x4,ldr-rgb-emissive.png,57.9745,0.0422,0.0143,73.1216 -Khronos,4x4,ldr-rgb-metalrough.png,43.8757,0.0951,0.0531,19.7628 -Khronos,4x4,ldr-rgb-metalrough2.png,42.6172,0.4577,0.2873,14.5977 -Khronos,4x4,ldr-rgba-base.png,42.7808,0.1094,0.0601,17.4353 -Khronos,4x4,ldr-rgba-diffuse.png,43.2186,0.0931,0.0456,22.9775 -Khronos,4x4,ldr-rgba-specgloss.png,41.2397,0.1395,0.0868,12.0841 -Khronos,4x4,ldr-xy-normal1.png,44.7980,0.1512,0.0710,14.7739 -Khronos,4x4,ldr-xy-normal2.png,48.3359,0.4176,0.1445,29.0215 -Khronos,5x5,ldr-l-occlusion.png,53.9891,0.0404,0.0141,74.2048 -Khronos,5x5,ldr-rgb-diffuse.png,47.0472,0.2413,0.0828,50.6314 -Khronos,5x5,ldr-rgb-emissive.png,52.3396,0.0414,0.0133,78.7094 -Khronos,5x5,ldr-rgb-metalrough.png,39.2552,0.0880,0.0454,23.1153 -Khronos,5x5,ldr-rgb-metalrough2.png,37.2923,0.4893,0.3160,13.2714 -Khronos,5x5,ldr-rgba-base.png,38.0848,0.1018,0.0518,20.2447 -Khronos,5x5,ldr-rgba-diffuse.png,38.3579,0.0965,0.0492,21.3273 -Khronos,5x5,ldr-rgba-specgloss.png,37.9190,0.1199,0.0670,15.6588 -Khronos,5x5,ldr-xy-normal1.png,41.3049,0.1469,0.0644,16.2853 -Khronos,5x5,ldr-xy-normal2.png,45.6138,0.3923,0.1107,37.8807 -Khronos,6x6,ldr-l-occlusion.png,48.3038,0.0407,0.0140,74.7065 -Khronos,6x6,ldr-rgb-diffuse.png,43.2173,0.2575,0.0996,42.1288 -Khronos,6x6,ldr-rgb-emissive.png,48.9702,0.0404,0.0116,90.5115 -Khronos,6x6,ldr-rgb-metalrough.png,36.2530,0.0952,0.0524,20.0041 -Khronos,6x6,ldr-rgb-metalrough2.png,35.0960,0.4903,0.3160,13.2712 -Khronos,6x6,ldr-rgba-base.png,35.9357,0.1064,0.0573,18.3083 -Khronos,6x6,ldr-rgba-diffuse.png,35.9044,0.1061,0.0580,18.0720 -Khronos,6x6,ldr-rgba-specgloss.png,35.8773,0.1223,0.0684,15.3375 -Khronos,6x6,ldr-xy-normal1.png,38.8396,0.1479,0.0652,16.0763 -Khronos,6x6,ldr-xy-normal2.png,43.4426,0.3881,0.1075,38.9998 -Khronos,8x8,ldr-l-occlusion.png,43.4865,0.0427,0.0133,78.6095 -Khronos,8x8,ldr-rgb-diffuse.png,38.2787,0.2716,0.1124,37.3189 -Khronos,8x8,ldr-rgb-emissive.png,44.2565,0.0428,0.0110,95.5080 -Khronos,8x8,ldr-rgb-metalrough.png,32.2167,0.1168,0.0707,14.8410 -Khronos,8x8,ldr-rgb-metalrough2.png,32.0902,0.4810,0.3045,13.7757 -Khronos,8x8,ldr-rgba-base.png,32.2303,0.1232,0.0695,15.0851 -Khronos,8x8,ldr-rgba-diffuse.png,32.0058,0.1357,0.0839,12.5018 -Khronos,8x8,ldr-rgba-specgloss.png,32.8371,0.1350,0.0778,13.4737 -Khronos,8x8,ldr-xy-normal1.png,36.2071,0.1467,0.0596,17.5847 -Khronos,8x8,ldr-xy-normal2.png,40.2733,0.4062,0.1196,35.0677 -Khronos,12x12,ldr-l-occlusion.png,40.2271,0.0467,0.0132,79.4086 -Khronos,12x12,ldr-rgb-diffuse.png,33.3234,0.2477,0.0846,49.5557 -Khronos,12x12,ldr-rgb-emissive.png,39.2738,0.0467,0.0105,100.2747 -Khronos,12x12,ldr-rgb-metalrough.png,28.5929,0.0923,0.0422,24.8195 -Khronos,12x12,ldr-rgb-metalrough2.png,29.1679,0.3209,0.1408,29.7986 -Khronos,12x12,ldr-rgba-base.png,28.9701,0.1127,0.0549,19.1018 -Khronos,12x12,ldr-rgba-diffuse.png,28.5748,0.1192,0.0633,16.5730 -Khronos,12x12,ldr-rgba-specgloss.png,29.7683,0.1046,0.0448,23.4214 -Khronos,12x12,ldr-xy-normal1.png,32.6096,0.1328,0.0417,25.1710 -Khronos,12x12,ldr-xy-normal2.png,36.0023,0.3974,0.1054,39.7786 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index 8130bbf8a38d2afe1da243524e036ea393030fe0..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,67.9245,0.0559,0.0290,36.1168 -Khronos,4x4,ldr-rgb-diffuse.png,54.0221,0.5109,0.3524,11.9030 -Khronos,4x4,ldr-rgb-emissive.png,59.8356,0.0577,0.0283,37.0402 -Khronos,4x4,ldr-rgb-metalrough.png,44.8439,0.3091,0.2651,3.9550 -Khronos,4x4,ldr-rgb-metalrough2.png,43.7387,1.9253,1.7504,2.3962 -Khronos,4x4,ldr-rgba-base.png,43.8181,0.3896,0.3391,3.0919 -Khronos,4x4,ldr-rgba-diffuse.png,44.2283,0.2815,0.2329,4.5024 -Khronos,4x4,ldr-rgba-specgloss.png,42.2924,0.5203,0.4661,2.2496 -Khronos,4x4,ldr-xy-normal1.png,46.4815,0.4465,0.3657,2.8675 -Khronos,4x4,ldr-xy-normal2.png,50.2696,1.0112,0.7526,5.5728 -Khronos,5x5,ldr-l-occlusion.png,57.1580,0.0593,0.0312,33.6232 -Khronos,5x5,ldr-rgb-diffuse.png,48.9900,0.5235,0.3637,11.5331 -Khronos,5x5,ldr-rgb-emissive.png,55.3732,0.0613,0.0307,34.1946 -Khronos,5x5,ldr-rgb-metalrough.png,40.2386,0.3521,0.3067,3.4192 -Khronos,5x5,ldr-rgb-metalrough2.png,39.0265,2.3999,2.2243,1.8857 -Khronos,5x5,ldr-rgba-base.png,39.3979,0.4565,0.4029,2.6028 -Khronos,5x5,ldr-rgba-diffuse.png,39.5646,0.3627,0.3122,3.3589 -Khronos,5x5,ldr-rgba-specgloss.png,38.7813,0.5897,0.5342,1.9628 -Khronos,5x5,ldr-xy-normal1.png,43.0494,0.4409,0.3575,2.9331 -Khronos,5x5,ldr-xy-normal2.png,47.2289,0.8760,0.6006,6.9841 -Khronos,6x6,ldr-l-occlusion.png,50.8663,0.0714,0.0423,24.8048 -Khronos,6x6,ldr-rgb-diffuse.png,44.9305,0.5407,0.3803,11.0301 -Khronos,6x6,ldr-rgb-emissive.png,51.5230,0.0613,0.0302,34.7350 -Khronos,6x6,ldr-rgb-metalrough.png,36.8282,0.3705,0.3245,3.2312 -Khronos,6x6,ldr-rgb-metalrough2.png,36.4385,2.3842,2.2069,1.9006 -Khronos,6x6,ldr-rgba-base.png,36.6372,0.4265,0.3735,2.8072 -Khronos,6x6,ldr-rgba-diffuse.png,36.4889,0.3953,0.3437,3.0505 -Khronos,6x6,ldr-rgba-specgloss.png,36.4896,0.6061,0.5502,1.9058 -Khronos,6x6,ldr-xy-normal1.png,40.6311,0.3764,0.2912,3.6012 -Khronos,6x6,ldr-xy-normal2.png,45.1540,0.6099,0.3252,12.8980 -Khronos,8x8,ldr-l-occlusion.png,45.4494,0.0846,0.0524,19.9996 -Khronos,8x8,ldr-rgb-diffuse.png,40.2397,0.7274,0.5646,7.4283 -Khronos,8x8,ldr-rgb-emissive.png,46.7056,0.0725,0.0374,28.0421 -Khronos,8x8,ldr-rgb-metalrough.png,32.6674,0.4987,0.4489,2.3361 -Khronos,8x8,ldr-rgb-metalrough2.png,33.1989,2.7002,2.5186,1.6654 -Khronos,8x8,ldr-rgba-base.png,33.0632,0.4653,0.4085,2.5671 -Khronos,8x8,ldr-rgba-diffuse.png,32.5747,0.5347,0.4814,2.1780 -Khronos,8x8,ldr-rgba-specgloss.png,33.4751,0.6588,0.5997,1.7484 -Khronos,8x8,ldr-xy-normal1.png,37.4171,0.4297,0.3402,3.0819 -Khronos,8x8,ldr-xy-normal2.png,42.0727,0.6618,0.3714,11.2922 -Khronos,12x12,ldr-l-occlusion.png,41.6742,0.0714,0.0315,33.2510 -Khronos,12x12,ldr-rgb-diffuse.png,35.7658,0.6473,0.4764,8.8044 -Khronos,12x12,ldr-rgb-emissive.png,41.3741,0.0836,0.0410,25.5501 -Khronos,12x12,ldr-rgb-metalrough.png,29.0892,0.4308,0.3730,2.8114 -Khronos,12x12,ldr-rgb-metalrough2.png,30.1599,1.7010,1.5141,2.7702 -Khronos,12x12,ldr-rgba-base.png,29.6109,0.4367,0.3722,2.8169 -Khronos,12x12,ldr-rgba-diffuse.png,29.0613,0.5935,0.5312,1.9740 -Khronos,12x12,ldr-rgba-specgloss.png,30.4743,0.4619,0.3937,2.6634 -Khronos,12x12,ldr-xy-normal1.png,33.4993,0.3781,0.2799,3.7467 -Khronos,12x12,ldr-xy-normal2.png,37.8161,0.6928,0.3942,10.6405 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index 4f767df7718bfdc48513cbaa78a894219063ba40..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,70.5315,0.1152,0.0879,11.9285 -Khronos,4x4,ldr-rgb-diffuse.png,54.7187,2.4752,2.3161,1.8110 -Khronos,4x4,ldr-rgb-emissive.png,60.8411,0.0932,0.0641,16.3633 -Khronos,4x4,ldr-rgb-metalrough.png,44.9834,0.6943,0.6493,1.6148 -Khronos,4x4,ldr-rgb-metalrough2.png,44.0109,4.0555,3.8794,1.0812 -Khronos,4x4,ldr-rgba-base.png,44.0067,0.9142,0.8609,1.2179 -Khronos,4x4,ldr-rgba-diffuse.png,44.4135,0.6521,0.6030,1.7390 -Khronos,4x4,ldr-rgba-specgloss.png,42.4620,1.1507,1.0960,0.9568 -Khronos,4x4,ldr-xy-normal1.png,46.6816,1.3263,1.2459,0.8416 -Khronos,4x4,ldr-xy-normal2.png,50.5731,3.5048,3.2499,1.2906 -Khronos,5x5,ldr-l-occlusion.png,58.7308,0.2119,0.1837,5.7078 -Khronos,5x5,ldr-rgb-diffuse.png,49.7919,2.2626,2.1019,1.9955 -Khronos,5x5,ldr-rgb-emissive.png,56.1398,0.1121,0.0813,12.9019 -Khronos,5x5,ldr-rgb-metalrough.png,40.4561,0.8844,0.8383,1.2508 -Khronos,5x5,ldr-rgb-metalrough2.png,39.4939,5.1171,4.9407,0.8489 -Khronos,5x5,ldr-rgba-base.png,39.7539,1.1256,1.0725,0.9777 -Khronos,5x5,ldr-rgba-diffuse.png,39.8978,0.8279,0.7771,1.3494 -Khronos,5x5,ldr-rgba-specgloss.png,39.0262,1.3952,1.3396,0.7827 -Khronos,5x5,ldr-xy-normal1.png,43.4105,1.6830,1.5991,0.6557 -Khronos,5x5,ldr-xy-normal2.png,47.7893,4.8954,4.6209,0.9077 -Khronos,6x6,ldr-l-occlusion.png,52.2696,0.2970,0.2679,3.9143 -Khronos,6x6,ldr-rgb-diffuse.png,45.7745,2.1797,2.0180,2.0785 -Khronos,6x6,ldr-rgb-emissive.png,52.6625,0.1261,0.0948,11.0630 -Khronos,6x6,ldr-rgb-metalrough.png,37.0147,1.1210,1.0745,0.9758 -Khronos,6x6,ldr-rgb-metalrough2.png,36.7447,6.2531,6.0746,0.6905 -Khronos,6x6,ldr-rgba-base.png,36.8327,1.3906,1.3371,0.7842 -Khronos,6x6,ldr-rgba-diffuse.png,36.6564,1.0332,0.9812,1.0686 -Khronos,6x6,ldr-rgba-specgloss.png,36.6739,1.6520,1.5960,0.6570 -Khronos,6x6,ldr-xy-normal1.png,41.1133,1.5640,1.4790,0.7090 -Khronos,6x6,ldr-xy-normal2.png,45.8124,4.1248,3.8481,1.0900 -Khronos,8x8,ldr-l-occlusion.png,46.0393,0.3707,0.3364,3.1174 -Khronos,8x8,ldr-rgb-diffuse.png,40.8641,2.4013,2.2367,1.8752 -Khronos,8x8,ldr-rgb-emissive.png,47.6060,0.1350,0.0975,10.7554 -Khronos,8x8,ldr-rgb-metalrough.png,32.8279,1.4264,1.3755,0.7623 -Khronos,8x8,ldr-rgb-metalrough2.png,33.5845,7.9530,7.7734,0.5396 -Khronos,8x8,ldr-rgba-base.png,33.2523,1.7583,1.7005,0.6166 -Khronos,8x8,ldr-rgba-diffuse.png,32.7215,1.3905,1.3338,0.7861 -Khronos,8x8,ldr-rgba-specgloss.png,33.6278,2.1263,2.0656,0.5076 -Khronos,8x8,ldr-xy-normal1.png,37.7223,1.0690,0.9792,1.0709 -Khronos,8x8,ldr-xy-normal2.png,42.5159,2.0313,1.7438,2.4052 -Khronos,12x12,ldr-l-occlusion.png,42.4633,0.2987,0.2550,4.1115 -Khronos,12x12,ldr-rgb-diffuse.png,36.6027,2.6774,2.5038,1.6752 -Khronos,12x12,ldr-rgb-emissive.png,42.3476,0.1853,0.1401,7.4844 -Khronos,12x12,ldr-rgb-metalrough.png,29.2644,1.6780,1.6177,0.6482 -Khronos,12x12,ldr-rgb-metalrough2.png,30.7448,8.6487,8.4606,0.4957 -Khronos,12x12,ldr-rgba-base.png,29.9105,1.8067,1.7395,0.6028 -Khronos,12x12,ldr-rgba-diffuse.png,29.2512,1.7249,1.6611,0.6313 -Khronos,12x12,ldr-rgba-specgloss.png,30.6950,2.4073,2.3382,0.4485 -Khronos,12x12,ldr-xy-normal1.png,33.9598,1.0843,0.9860,1.0635 -Khronos,12x12,ldr-xy-normal2.png,38.4366,1.5801,1.2855,3.2628 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index 0448eb10ce61ed017854e364d52e31f5b71a7f83..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.2943,0.0418,0.0164,64.1133 -Khronos,4x4,ldr-rgb-diffuse.png,52.5337,0.2551,0.1003,41.8067 -Khronos,4x4,ldr-rgb-emissive.png,58.5505,0.0431,0.0150,70.0683 -Khronos,4x4,ldr-rgb-metalrough.png,44.2748,0.1075,0.0652,16.0894 -Khronos,4x4,ldr-rgb-metalrough2.png,42.9160,0.5669,0.3952,10.6126 -Khronos,4x4,ldr-rgba-base.png,43.2384,0.1317,0.0820,12.7936 -Khronos,4x4,ldr-rgba-diffuse.png,43.8337,0.1084,0.0611,17.1669 -Khronos,4x4,ldr-rgba-specgloss.png,41.6515,0.1743,0.1218,8.6099 -Khronos,4x4,ldr-xy-normal1.png,44.9658,0.1830,0.1017,10.3109 -Khronos,4x4,ldr-xy-normal2.png,48.6954,0.4304,0.1643,25.5244 -Khronos,5x5,ldr-l-occlusion.png,54.3853,0.0399,0.0139,75.4485 -Khronos,5x5,ldr-rgb-diffuse.png,47.2206,0.2397,0.0823,50.9468 -Khronos,5x5,ldr-rgb-emissive.png,52.6484,0.0419,0.0135,77.9091 -Khronos,5x5,ldr-rgb-metalrough.png,39.8152,0.0980,0.0547,19.1847 -Khronos,5x5,ldr-rgb-metalrough2.png,37.8813,0.6004,0.4239,9.8950 -Khronos,5x5,ldr-rgba-base.png,38.8783,0.1158,0.0655,16.0044 -Khronos,5x5,ldr-rgba-diffuse.png,39.1281,0.1127,0.0648,16.1737 -Khronos,5x5,ldr-rgba-specgloss.png,38.3729,0.1378,0.0849,12.3471 -Khronos,5x5,ldr-xy-normal1.png,41.8817,0.1617,0.0789,13.2972 -Khronos,5x5,ldr-xy-normal2.png,46.1664,0.3947,0.1168,35.9144 -Khronos,6x6,ldr-l-occlusion.png,48.3853,0.0408,0.0141,74.1410 -Khronos,6x6,ldr-rgb-diffuse.png,43.2790,0.2633,0.1061,39.5182 -Khronos,6x6,ldr-rgb-emissive.png,49.1258,0.0415,0.0127,82.4407 -Khronos,6x6,ldr-rgb-metalrough.png,36.4555,0.1111,0.0679,15.4457 -Khronos,6x6,ldr-rgb-metalrough2.png,35.2939,0.6376,0.4623,9.0726 -Khronos,6x6,ldr-rgba-base.png,36.1037,0.1288,0.0779,13.4581 -Khronos,6x6,ldr-rgba-diffuse.png,36.0866,0.1315,0.0829,12.6490 -Khronos,6x6,ldr-rgba-specgloss.png,36.1059,0.1488,0.0941,11.1448 -Khronos,6x6,ldr-xy-normal1.png,39.6565,0.1600,0.0776,13.5120 -Khronos,6x6,ldr-xy-normal2.png,44.1113,0.3988,0.1177,35.6334 -Khronos,8x8,ldr-l-occlusion.png,43.9509,0.0443,0.0143,73.5841 -Khronos,8x8,ldr-rgb-diffuse.png,38.3579,0.2780,0.1203,34.8520 -Khronos,8x8,ldr-rgb-emissive.png,44.5417,0.0454,0.0125,84.0268 -Khronos,8x8,ldr-rgb-metalrough.png,32.3176,0.1369,0.0898,11.6707 -Khronos,8x8,ldr-rgb-metalrough2.png,32.1727,0.5558,0.3785,11.0828 -Khronos,8x8,ldr-rgba-base.png,32.3786,0.1442,0.0896,11.7087 -Khronos,8x8,ldr-rgba-diffuse.png,32.1163,0.1622,0.1093,9.5939 -Khronos,8x8,ldr-rgba-specgloss.png,32.9674,0.1597,0.1015,10.3265 -Khronos,8x8,ldr-xy-normal1.png,36.4984,0.1605,0.0741,14.1512 -Khronos,8x8,ldr-xy-normal2.png,40.6917,0.4154,0.1321,31.7491 -Khronos,12x12,ldr-l-occlusion.png,40.5785,0.0506,0.0134,78.1361 -Khronos,12x12,ldr-rgb-diffuse.png,33.3691,0.2510,0.0868,48.3125 -Khronos,12x12,ldr-rgb-emissive.png,39.4740,0.0517,0.0120,87.2576 -Khronos,12x12,ldr-rgb-metalrough.png,28.6341,0.1032,0.0499,21.0009 -Khronos,12x12,ldr-rgb-metalrough2.png,29.2524,0.3401,0.1578,26.5834 -Khronos,12x12,ldr-rgba-base.png,29.0205,0.1279,0.0674,15.5610 -Khronos,12x12,ldr-rgba-diffuse.png,28.6231,0.1356,0.0774,13.5421 -Khronos,12x12,ldr-rgba-specgloss.png,29.8092,0.1188,0.0540,19.4055 -Khronos,12x12,ldr-xy-normal1.png,32.7294,0.1408,0.0467,22.4423 -Khronos,12x12,ldr-xy-normal2.png,36.2128,0.4050,0.1128,37.1991 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 310f5b63a6496d1b5d38adcbeca55e3df8e46321..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,64.1811,0.0390,0.0145,72.1169 -Khronos,4x4,ldr-rgb-diffuse.png,52.3048,0.2421,0.0883,47.4781 -Khronos,4x4,ldr-rgb-emissive.png,57.9745,0.0410,0.0135,77.9146 -Khronos,4x4,ldr-rgb-metalrough.png,43.8757,0.0886,0.0470,22.3206 -Khronos,4x4,ldr-rgb-metalrough2.png,42.6172,0.4240,0.2524,16.6195 -Khronos,4x4,ldr-rgba-base.png,42.7808,0.1027,0.0537,19.5110 -Khronos,4x4,ldr-rgba-diffuse.png,43.2186,0.0884,0.0412,25.4397 -Khronos,4x4,ldr-rgba-specgloss.png,41.2397,0.1293,0.0767,13.6759 -Khronos,4x4,ldr-xy-normal1.png,44.7980,0.1420,0.0629,16.6673 -Khronos,4x4,ldr-xy-normal2.png,48.3359,0.3947,0.1277,32.8429 -Khronos,5x5,ldr-l-occlusion.png,53.9891,0.0390,0.0139,75.4369 -Khronos,5x5,ldr-rgb-diffuse.png,47.0472,0.2339,0.0767,54.6995 -Khronos,5x5,ldr-rgb-emissive.png,52.3396,0.0406,0.0126,83.3927 -Khronos,5x5,ldr-rgb-metalrough.png,39.2552,0.0830,0.0406,25.8282 -Khronos,5x5,ldr-rgb-metalrough2.png,37.2923,0.4472,0.2748,15.2658 -Khronos,5x5,ldr-rgba-base.png,38.0848,0.0952,0.0457,22.9443 -Khronos,5x5,ldr-rgba-diffuse.png,38.3579,0.0912,0.0437,23.9784 -Khronos,5x5,ldr-rgba-specgloss.png,37.9190,0.1117,0.0585,17.9232 -Khronos,5x5,ldr-xy-normal1.png,41.3049,0.1367,0.0564,18.5994 -Khronos,5x5,ldr-xy-normal2.png,45.6138,0.3779,0.1003,41.8306 -Khronos,6x6,ldr-l-occlusion.png,48.3038,0.0387,0.0133,78.7983 -Khronos,6x6,ldr-rgb-diffuse.png,43.2173,0.2492,0.0901,46.5734 -Khronos,6x6,ldr-rgb-emissive.png,48.9702,0.0394,0.0112,93.7490 -Khronos,6x6,ldr-rgb-metalrough.png,36.2530,0.0882,0.0460,22.7719 -Khronos,6x6,ldr-rgb-metalrough2.png,35.0960,0.4539,0.2791,15.0299 -Khronos,6x6,ldr-rgba-base.png,35.9357,0.1001,0.0505,20.7532 -Khronos,6x6,ldr-rgba-diffuse.png,35.9044,0.0990,0.0515,20.3801 -Khronos,6x6,ldr-rgba-specgloss.png,35.8773,0.1136,0.0599,17.5028 -Khronos,6x6,ldr-xy-normal1.png,38.8396,0.1378,0.0574,18.2704 -Khronos,6x6,ldr-xy-normal2.png,43.4426,0.3758,0.0973,43.1273 -Khronos,8x8,ldr-l-occlusion.png,43.4865,0.0405,0.0122,85.8222 -Khronos,8x8,ldr-rgb-diffuse.png,38.2787,0.2538,0.0988,42.4426 -Khronos,8x8,ldr-rgb-emissive.png,44.2565,0.0417,0.0105,99.6837 -Khronos,8x8,ldr-rgb-metalrough.png,32.2167,0.1073,0.0619,16.9330 -Khronos,8x8,ldr-rgb-metalrough2.png,32.0902,0.4417,0.2659,15.7752 -Khronos,8x8,ldr-rgba-base.png,32.2303,0.1141,0.0610,17.1942 -Khronos,8x8,ldr-rgba-diffuse.png,32.0058,0.1246,0.0737,14.2251 -Khronos,8x8,ldr-rgba-specgloss.png,32.8371,0.1246,0.0683,15.3592 -Khronos,8x8,ldr-xy-normal1.png,36.2071,0.1358,0.0524,20.0225 -Khronos,8x8,ldr-xy-normal2.png,40.2733,0.3867,0.1054,39.8104 -Khronos,12x12,ldr-l-occlusion.png,40.2271,0.0444,0.0116,90.6589 -Khronos,12x12,ldr-rgb-diffuse.png,33.3234,0.2338,0.0749,56.0279 -Khronos,12x12,ldr-rgb-emissive.png,39.2738,0.0455,0.0101,103.8721 -Khronos,12x12,ldr-rgb-metalrough.png,28.5929,0.0873,0.0374,28.0316 -Khronos,12x12,ldr-rgb-metalrough2.png,29.1679,0.3039,0.1251,33.5324 -Khronos,12x12,ldr-rgba-base.png,28.9701,0.1059,0.0490,21.4069 -Khronos,12x12,ldr-rgba-diffuse.png,28.5748,0.1109,0.0564,18.5957 -Khronos,12x12,ldr-rgba-specgloss.png,29.7683,0.0994,0.0398,26.3613 -Khronos,12x12,ldr-xy-normal1.png,32.6096,0.1254,0.0368,28.4575 -Khronos,12x12,ldr-xy-normal2.png,36.0023,0.3763,0.0930,45.0908 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 12f6ed2fc515cd3626ec82533db6492093a29b71..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,67.9245,0.0526,0.0268,39.1157 -Khronos,4x4,ldr-rgb-diffuse.png,54.0221,0.4617,0.3060,13.7058 -Khronos,4x4,ldr-rgb-emissive.png,59.8356,0.0549,0.0265,39.6406 -Khronos,4x4,ldr-rgb-metalrough.png,44.8439,0.2722,0.2285,4.5886 -Khronos,4x4,ldr-rgb-metalrough2.png,43.7387,1.6815,1.5116,2.7747 -Khronos,4x4,ldr-rgba-base.png,43.8181,0.3440,0.2944,3.5613 -Khronos,4x4,ldr-rgba-diffuse.png,44.2283,0.2512,0.2029,5.1672 -Khronos,4x4,ldr-rgba-specgloss.png,42.2924,0.4609,0.4074,2.5736 -Khronos,4x4,ldr-xy-normal1.png,46.4815,0.4048,0.3227,3.2499 -Khronos,4x4,ldr-xy-normal2.png,50.2696,0.9086,0.6548,6.4054 -Khronos,5x5,ldr-l-occlusion.png,57.1580,0.0560,0.0282,37.2167 -Khronos,5x5,ldr-rgb-diffuse.png,48.9900,0.4727,0.3157,13.2850 -Khronos,5x5,ldr-rgb-emissive.png,55.3732,0.0576,0.0279,37.6442 -Khronos,5x5,ldr-rgb-metalrough.png,40.2386,0.3073,0.2618,4.0051 -Khronos,5x5,ldr-rgb-metalrough2.png,39.0265,2.0781,1.9019,2.2053 -Khronos,5x5,ldr-rgba-base.png,39.3979,0.3988,0.3466,3.0253 -Khronos,5x5,ldr-rgba-diffuse.png,39.5646,0.3194,0.2694,3.8919 -Khronos,5x5,ldr-rgba-specgloss.png,38.7813,0.5136,0.4585,2.2868 -Khronos,5x5,ldr-xy-normal1.png,43.0494,0.3912,0.3093,3.3900 -Khronos,5x5,ldr-xy-normal2.png,47.2289,0.7928,0.5195,8.0732 -Khronos,6x6,ldr-l-occlusion.png,50.8663,0.0660,0.0380,27.6136 -Khronos,6x6,ldr-rgb-diffuse.png,44.9305,0.4927,0.3328,12.6049 -Khronos,6x6,ldr-rgb-emissive.png,51.5230,0.0579,0.0277,37.8493 -Khronos,6x6,ldr-rgb-metalrough.png,36.8282,0.3281,0.2831,3.7041 -Khronos,6x6,ldr-rgb-metalrough2.png,36.4385,2.0877,1.9101,2.1958 -Khronos,6x6,ldr-rgba-base.png,36.6372,0.3749,0.3223,3.2536 -Khronos,6x6,ldr-rgba-diffuse.png,36.4889,0.3492,0.2991,3.5056 -Khronos,6x6,ldr-rgba-specgloss.png,36.4896,0.5348,0.4795,2.1867 -Khronos,6x6,ldr-xy-normal1.png,40.6311,0.3377,0.2536,4.1351 -Khronos,6x6,ldr-xy-normal2.png,45.1540,0.5663,0.2863,14.6496 -Khronos,8x8,ldr-l-occlusion.png,45.4494,0.0777,0.0463,22.6240 -Khronos,8x8,ldr-rgb-diffuse.png,40.2397,0.6532,0.4935,8.4987 -Khronos,8x8,ldr-rgb-emissive.png,46.7056,0.0677,0.0334,31.4086 -Khronos,8x8,ldr-rgb-metalrough.png,32.6674,0.4406,0.3921,2.6742 -Khronos,8x8,ldr-rgb-metalrough2.png,33.1989,2.3871,2.2108,1.8972 -Khronos,8x8,ldr-rgba-base.png,33.0632,0.4168,0.3610,2.9048 -Khronos,8x8,ldr-rgba-diffuse.png,32.5747,0.4764,0.4215,2.4878 -Khronos,8x8,ldr-rgba-specgloss.png,33.4751,0.5866,0.5269,1.9903 -Khronos,8x8,ldr-xy-normal1.png,37.4171,0.3863,0.2968,3.5326 -Khronos,8x8,ldr-xy-normal2.png,42.0727,0.6099,0.3244,12.9311 -Khronos,12x12,ldr-l-occlusion.png,41.6742,0.0675,0.0285,36.7653 -Khronos,12x12,ldr-rgb-diffuse.png,35.7658,0.5883,0.4194,10.0015 -Khronos,12x12,ldr-rgb-emissive.png,41.3741,0.0790,0.0367,28.5380 -Khronos,12x12,ldr-rgb-metalrough.png,29.0892,0.3861,0.3300,3.1779 -Khronos,12x12,ldr-rgb-metalrough2.png,30.1599,1.5251,1.3372,3.1366 -Khronos,12x12,ldr-rgba-base.png,29.6109,0.3927,0.3275,3.2019 -Khronos,12x12,ldr-rgba-diffuse.png,29.0613,0.5317,0.4699,2.2313 -Khronos,12x12,ldr-rgba-specgloss.png,30.4743,0.4166,0.3493,3.0019 -Khronos,12x12,ldr-xy-normal1.png,33.4993,0.3454,0.2490,4.2108 -Khronos,12x12,ldr-xy-normal2.png,37.8161,0.6426,0.3499,11.9875 diff --git a/Test/Images/Khronos/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/Khronos/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 5b3374003cbfa68bb878b86c7e2e167d9d9cc38e..0000000000000000000000000000000000000000 --- a/Test/Images/Khronos/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,51 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Khronos,4x4,ldr-l-occlusion.png,70.5315,0.1035,0.0773,13.5691 -Khronos,4x4,ldr-rgb-diffuse.png,54.7187,2.1796,2.0238,2.0724 -Khronos,4x4,ldr-rgb-emissive.png,60.8411,0.0872,0.0585,17.9238 -Khronos,4x4,ldr-rgb-metalrough.png,44.9834,0.6117,0.5690,1.8429 -Khronos,4x4,ldr-rgb-metalrough2.png,44.0109,3.5575,3.3844,1.2393 -Khronos,4x4,ldr-rgba-base.png,44.0067,0.8048,0.7540,1.3906 -Khronos,4x4,ldr-rgba-diffuse.png,44.4135,0.5796,0.5311,1.9743 -Khronos,4x4,ldr-rgba-specgloss.png,42.4620,1.0263,0.9726,1.0781 -Khronos,4x4,ldr-xy-normal1.png,46.6816,1.1963,1.1171,0.9387 -Khronos,4x4,ldr-xy-normal2.png,50.5731,3.1594,2.9096,1.4415 -Khronos,5x5,ldr-l-occlusion.png,58.7308,0.1880,0.1604,6.5373 -Khronos,5x5,ldr-rgb-diffuse.png,49.7919,1.9859,1.8249,2.2983 -Khronos,5x5,ldr-rgb-emissive.png,56.1398,0.1012,0.0714,14.6841 -Khronos,5x5,ldr-rgb-metalrough.png,40.4561,0.7671,0.7222,1.4520 -Khronos,5x5,ldr-rgb-metalrough2.png,39.4939,4.4480,4.2712,0.9820 -Khronos,5x5,ldr-rgba-base.png,39.7539,0.9879,0.9353,1.1211 -Khronos,5x5,ldr-rgba-diffuse.png,39.8978,0.7282,0.6784,1.5456 -Khronos,5x5,ldr-rgba-specgloss.png,39.0262,1.2268,1.1715,0.8951 -Khronos,5x5,ldr-xy-normal1.png,43.4105,1.4933,1.4107,0.7433 -Khronos,5x5,ldr-xy-normal2.png,47.7893,4.3236,4.0619,1.0326 -Khronos,6x6,ldr-l-occlusion.png,52.2696,0.2620,0.2340,4.4813 -Khronos,6x6,ldr-rgb-diffuse.png,45.7745,1.9165,1.7569,2.3874 -Khronos,6x6,ldr-rgb-emissive.png,52.6625,0.1140,0.0835,12.5527 -Khronos,6x6,ldr-rgb-metalrough.png,37.0147,0.9830,0.9373,1.1187 -Khronos,6x6,ldr-rgb-metalrough2.png,36.7447,5.4681,5.2870,0.7933 -Khronos,6x6,ldr-rgba-base.png,36.8327,1.2103,1.1583,0.9053 -Khronos,6x6,ldr-rgba-diffuse.png,36.6564,0.9085,0.8582,1.2218 -Khronos,6x6,ldr-rgba-specgloss.png,36.6739,1.4683,1.4115,0.7429 -Khronos,6x6,ldr-xy-normal1.png,41.1133,1.3865,1.3025,0.8050 -Khronos,6x6,ldr-xy-normal2.png,45.8124,3.6665,3.3881,1.2380 -Khronos,8x8,ldr-l-occlusion.png,46.0393,0.3299,0.2963,3.5392 -Khronos,8x8,ldr-rgb-diffuse.png,40.8641,2.1190,1.9581,2.1420 -Khronos,8x8,ldr-rgb-emissive.png,47.6060,0.1228,0.0877,11.9625 -Khronos,8x8,ldr-rgb-metalrough.png,32.8279,1.2598,1.2097,0.8668 -Khronos,8x8,ldr-rgb-metalrough2.png,33.5845,7.0352,6.8538,0.6120 -Khronos,8x8,ldr-rgba-base.png,33.2523,1.5600,1.5035,0.6974 -Khronos,8x8,ldr-rgba-diffuse.png,32.7215,1.2334,1.1786,0.8897 -Khronos,8x8,ldr-rgba-specgloss.png,33.6278,1.8922,1.8310,0.5727 -Khronos,8x8,ldr-xy-normal1.png,37.7223,0.9534,0.8633,1.2145 -Khronos,8x8,ldr-xy-normal2.png,42.5159,1.8083,1.5287,2.7436 -Khronos,12x12,ldr-l-occlusion.png,42.4633,0.2682,0.2263,4.6326 -Khronos,12x12,ldr-rgb-diffuse.png,36.6027,2.3875,2.2137,1.8947 -Khronos,12x12,ldr-rgb-emissive.png,42.3476,0.1695,0.1248,8.4039 -Khronos,12x12,ldr-rgb-metalrough.png,29.2644,1.4912,1.4321,0.7322 -Khronos,12x12,ldr-rgb-metalrough2.png,30.7448,7.6917,7.5016,0.5591 -Khronos,12x12,ldr-rgba-base.png,29.9105,1.6103,1.5443,0.6790 -Khronos,12x12,ldr-rgba-diffuse.png,29.2512,1.5374,1.4741,0.7113 -Khronos,12x12,ldr-rgba-specgloss.png,30.6950,2.1464,2.0777,0.5047 -Khronos,12x12,ldr-xy-normal1.png,33.9598,0.9725,0.8733,1.2007 -Khronos,12x12,ldr-xy-normal2.png,38.4366,1.4302,1.1373,3.6878 diff --git a/Test/Images/Khronos/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/Khronos/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f575796ef7989355e1a78a626058af35def6de25 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0371,0.0070,150.1193 +Khronos,4x4,ldr-rgb-diffuse.png,52.8179,0.2035,0.0544,77.0884 +Khronos,4x4,ldr-rgb-emissive.png,58.5184,0.0390,0.0072,145.7755 +Khronos,4x4,ldr-rgb-metalrough.png,44.3627,0.0860,0.0454,23.1097 +Khronos,4x4,ldr-rgb-metalrough2.png,42.9750,0.4417,0.2885,14.5358 +Khronos,4x4,ldr-rgba-base.png,43.2965,0.1014,0.0571,18.3594 +Khronos,4x4,ldr-rgba-diffuse.png,43.9222,0.0843,0.0404,25.9735 +Khronos,4x4,ldr-rgba-specgloss.png,41.7049,0.1380,0.0911,11.5060 +Khronos,4x4,ldr-xy-normal1.png,44.9872,0.1372,0.0668,15.7066 +Khronos,4x4,ldr-xy-normal2.png,48.6837,0.3518,0.0984,42.6159 +Khronos,5x5,ldr-l-occlusion.png,54.3814,0.0356,0.0054,195.6600 +Khronos,5x5,ldr-rgb-diffuse.png,47.2236,0.1885,0.0418,100.3330 +Khronos,5x5,ldr-rgb-emissive.png,52.6635,0.0377,0.0054,194.4318 +Khronos,5x5,ldr-rgb-metalrough.png,39.9099,0.0743,0.0333,31.5324 +Khronos,5x5,ldr-rgb-metalrough2.png,37.9762,0.4251,0.2700,15.5370 +Khronos,5x5,ldr-rgba-base.png,38.9583,0.0846,0.0396,26.4946 +Khronos,5x5,ldr-rgba-diffuse.png,39.1885,0.0821,0.0381,27.5015 +Khronos,5x5,ldr-rgba-specgloss.png,38.4160,0.1006,0.0538,19.4783 +Khronos,5x5,ldr-xy-normal1.png,41.8334,0.1216,0.0504,20.7874 +Khronos,5x5,ldr-xy-normal2.png,46.1655,0.3323,0.0670,62.6444 +Khronos,6x6,ldr-l-occlusion.png,48.3862,0.0361,0.0062,168.3076 +Khronos,6x6,ldr-rgb-diffuse.png,43.2830,0.1942,0.0540,77.6766 +Khronos,6x6,ldr-rgb-emissive.png,49.1097,0.0368,0.0052,201.0260 +Khronos,6x6,ldr-rgb-metalrough.png,36.5415,0.0768,0.0375,27.9589 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3486,0.4062,0.2557,16.4062 +Khronos,6x6,ldr-rgba-base.png,36.1889,0.0859,0.0427,24.5775 +Khronos,6x6,ldr-rgba-diffuse.png,36.1527,0.0882,0.0450,23.2986 +Khronos,6x6,ldr-rgba-specgloss.png,36.1297,0.1008,0.0554,18.9120 +Khronos,6x6,ldr-xy-normal1.png,39.6460,0.1155,0.0452,23.2103 +Khronos,6x6,ldr-xy-normal2.png,44.1090,0.3196,0.0627,66.8660 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0346,0.0072,145.5536 +Khronos,8x8,ldr-rgb-diffuse.png,38.4150,0.1995,0.0701,59.8528 +Khronos,8x8,ldr-rgb-emissive.png,44.6847,0.0354,0.0062,169.1296 +Khronos,8x8,ldr-rgb-metalrough.png,32.3524,0.0859,0.0481,21.8144 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2210,0.3560,0.2166,19.3615 +Khronos,8x8,ldr-rgba-base.png,32.4716,0.0897,0.0465,22.5326 +Khronos,8x8,ldr-rgba-diffuse.png,32.1743,0.1002,0.0588,17.8350 +Khronos,8x8,ldr-rgba-specgloss.png,32.9565,0.1003,0.0555,18.9045 +Khronos,8x8,ldr-xy-normal1.png,36.5625,0.1082,0.0388,27.0162 +Khronos,8x8,ldr-xy-normal2.png,40.7934,0.3102,0.0693,60.5316 +Khronos,12x12,ldr-l-occlusion.png,40.5804,0.0364,0.0065,161.0239 +Khronos,12x12,ldr-rgb-diffuse.png,33.3731,0.1883,0.0514,81.5869 +Khronos,12x12,ldr-rgb-emissive.png,39.4844,0.0369,0.0054,192.7953 +Khronos,12x12,ldr-rgb-metalrough.png,28.6538,0.0683,0.0289,36.2439 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2618,0.2509,0.1032,40.6540 +Khronos,12x12,ldr-rgba-base.png,29.0434,0.0821,0.0377,27.7944 +Khronos,12x12,ldr-rgba-diffuse.png,28.6314,0.0877,0.0442,23.7283 +Khronos,12x12,ldr-rgba-specgloss.png,29.8201,0.0775,0.0321,32.6577 +Khronos,12x12,ldr-xy-normal1.png,32.7607,0.0971,0.0267,39.2287 +Khronos,12x12,ldr-xy-normal2.png,36.2418,0.3140,0.0622,67.4046 diff --git a/Test/Images/Khronos/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..5988eac8bb51c58d6afeddd8541dfc488d65ec4d --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0360,0.0067,156.0642 +Khronos,4x4,ldr-rgb-diffuse.png,52.5960,0.1928,0.0483,86.8154 +Khronos,4x4,ldr-rgb-emissive.png,57.9317,0.0375,0.0067,155.7547 +Khronos,4x4,ldr-rgb-metalrough.png,43.8926,0.0691,0.0296,35.3854 +Khronos,4x4,ldr-rgb-metalrough2.png,42.6922,0.3298,0.1794,23.3848 +Khronos,4x4,ldr-rgba-base.png,42.8654,0.0804,0.0359,29.2311 +Khronos,4x4,ldr-rgba-diffuse.png,43.3179,0.0688,0.0256,40.9410 +Khronos,4x4,ldr-rgba-specgloss.png,41.4002,0.1026,0.0566,18.5424 +Khronos,4x4,ldr-xy-normal1.png,44.8194,0.1136,0.0434,24.1341 +Khronos,4x4,ldr-xy-normal2.png,48.3518,0.3304,0.0768,54.5843 +Khronos,5x5,ldr-l-occlusion.png,54.2366,0.0351,0.0053,197.1334 +Khronos,5x5,ldr-rgb-diffuse.png,47.0653,0.1820,0.0391,107.3126 +Khronos,5x5,ldr-rgb-emissive.png,52.3476,0.0362,0.0049,214.3924 +Khronos,5x5,ldr-rgb-metalrough.png,39.4280,0.0635,0.0236,44.4126 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4660,0.3255,0.1730,24.2438 +Khronos,5x5,ldr-rgba-base.png,38.3323,0.0713,0.0272,38.5121 +Khronos,5x5,ldr-rgba-diffuse.png,38.5010,0.0680,0.0248,42.3105 +Khronos,5x5,ldr-rgba-specgloss.png,37.9482,0.0819,0.0360,29.1256 +Khronos,5x5,ldr-xy-normal1.png,41.4622,0.1048,0.0349,30.0177 +Khronos,5x5,ldr-xy-normal2.png,45.8286,0.3152,0.0568,73.8252 +Khronos,6x6,ldr-l-occlusion.png,48.3017,0.0345,0.0058,182.2949 +Khronos,6x6,ldr-rgb-diffuse.png,43.2322,0.1868,0.0468,89.6198 +Khronos,6x6,ldr-rgb-emissive.png,49.0036,0.0347,0.0046,229.7590 +Khronos,6x6,ldr-rgb-metalrough.png,36.3590,0.0646,0.0265,39.5554 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1574,0.3081,0.1591,26.3642 +Khronos,6x6,ldr-rgba-base.png,36.0142,0.0711,0.0286,36.6803 +Khronos,6x6,ldr-rgba-diffuse.png,35.9592,0.0705,0.0283,37.0091 +Khronos,6x6,ldr-rgba-specgloss.png,35.9090,0.0807,0.0358,29.2898 +Khronos,6x6,ldr-xy-normal1.png,39.2368,0.1007,0.0320,32.7631 +Khronos,6x6,ldr-xy-normal2.png,43.7398,0.3061,0.0518,81.0009 +Khronos,8x8,ldr-l-occlusion.png,43.5141,0.0338,0.0063,165.8076 +Khronos,8x8,ldr-rgb-diffuse.png,38.2796,0.1852,0.0572,73.2745 +Khronos,8x8,ldr-rgb-emissive.png,44.2626,0.0341,0.0049,213.2179 +Khronos,8x8,ldr-rgb-metalrough.png,32.2702,0.0732,0.0351,29.8357 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1173,0.2956,0.1571,26.6946 +Khronos,8x8,ldr-rgba-base.png,32.3492,0.0758,0.0340,30.7952 +Khronos,8x8,ldr-rgba-diffuse.png,32.0637,0.0829,0.0414,25.3078 +Khronos,8x8,ldr-rgba-specgloss.png,32.8589,0.0849,0.0405,25.8696 +Khronos,8x8,ldr-xy-normal1.png,36.3456,0.0972,0.0297,35.3353 +Khronos,8x8,ldr-xy-normal2.png,40.3507,0.2999,0.0582,72.0731 +Khronos,12x12,ldr-l-occlusion.png,40.2287,0.0349,0.0055,191.7697 +Khronos,12x12,ldr-rgb-diffuse.png,33.3235,0.1786,0.0426,98.4950 +Khronos,12x12,ldr-rgb-emissive.png,39.2827,0.0351,0.0043,246.1961 +Khronos,12x12,ldr-rgb-metalrough.png,28.6080,0.0609,0.0218,48.0204 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1699,0.2255,0.0782,53.6617 +Khronos,12x12,ldr-rgba-base.png,28.9860,0.0704,0.0277,37.8903 +Khronos,12x12,ldr-rgba-diffuse.png,28.5784,0.0739,0.0317,33.0645 +Khronos,12x12,ldr-rgba-specgloss.png,29.7728,0.0689,0.0241,43.4409 +Khronos,12x12,ldr-xy-normal1.png,32.6323,0.0902,0.0204,51.4518 +Khronos,12x12,ldr-xy-normal2.png,36.0168,0.3018,0.0502,83.6154 diff --git a/Test/Images/Khronos/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/Khronos/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..8b9c4b6360f87ec47d555dc38c0e95fabb1e2c44 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.5687,0.0425,0.0117,89.4694 +Khronos,4x4,ldr-rgb-diffuse.png,54.2509,0.2965,0.1537,27.2964 +Khronos,4x4,ldr-rgb-emissive.png,59.8692,0.0455,0.0135,77.7755 +Khronos,4x4,ldr-rgb-metalrough.png,44.9162,0.1772,0.1370,7.6563 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8012,1.1020,0.9514,4.4085 +Khronos,4x4,ldr-rgba-base.png,43.8387,0.2194,0.1740,6.0251 +Khronos,4x4,ldr-rgba-diffuse.png,44.2480,0.1591,0.1142,9.1805 +Khronos,4x4,ldr-rgba-specgloss.png,42.3086,0.2922,0.2444,4.2902 +Khronos,4x4,ldr-xy-normal1.png,46.5096,0.2679,0.1988,5.2753 +Khronos,4x4,ldr-xy-normal2.png,50.2692,0.6291,0.3897,10.7634 +Khronos,5x5,ldr-l-occlusion.png,57.1506,0.0450,0.0131,80.1846 +Khronos,5x5,ldr-rgb-diffuse.png,49.0125,0.2911,0.1483,28.2778 +Khronos,5x5,ldr-rgb-emissive.png,55.4137,0.0459,0.0131,80.2578 +Khronos,5x5,ldr-rgb-metalrough.png,40.3176,0.1661,0.1243,8.4335 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1297,1.1231,0.9711,4.3190 +Khronos,5x5,ldr-rgba-base.png,39.4682,0.2094,0.1636,6.4078 +Khronos,5x5,ldr-rgba-diffuse.png,39.6061,0.1695,0.1245,8.4253 +Khronos,5x5,ldr-rgba-specgloss.png,38.7834,0.2662,0.2189,4.7905 +Khronos,5x5,ldr-xy-normal1.png,43.0303,0.2425,0.1719,6.0990 +Khronos,5x5,ldr-xy-normal2.png,47.2313,0.5466,0.2903,14.4473 +Khronos,6x6,ldr-l-occlusion.png,50.8594,0.0488,0.0184,56.9135 +Khronos,6x6,ldr-rgb-diffuse.png,44.9402,0.2967,0.1530,27.4216 +Khronos,6x6,ldr-rgb-emissive.png,51.5373,0.0460,0.0132,79.3413 +Khronos,6x6,ldr-rgb-metalrough.png,36.8816,0.1626,0.1218,8.6075 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5008,1.0432,0.8924,4.7001 +Khronos,6x6,ldr-rgba-base.png,36.6975,0.1885,0.1440,7.2806 +Khronos,6x6,ldr-rgba-diffuse.png,36.5302,0.1741,0.1299,8.0716 +Khronos,6x6,ldr-rgba-specgloss.png,36.4921,0.2527,0.2059,5.0926 +Khronos,6x6,ldr-xy-normal1.png,40.6408,0.2053,0.1348,7.7804 +Khronos,6x6,ldr-xy-normal2.png,45.1534,0.4106,0.1556,26.9638 +Khronos,8x8,ldr-l-occlusion.png,45.4584,0.0545,0.0257,40.8706 +Khronos,8x8,ldr-rgb-diffuse.png,40.2308,0.3655,0.2353,17.8269 +Khronos,8x8,ldr-rgb-emissive.png,46.6998,0.0480,0.0173,60.6117 +Khronos,8x8,ldr-rgb-metalrough.png,32.6999,0.2036,0.1645,6.3758 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2345,1.1435,1.0013,4.1888 +Khronos,8x8,ldr-rgba-base.png,33.0850,0.2094,0.1664,6.3023 +Khronos,8x8,ldr-rgba-diffuse.png,32.5888,0.2199,0.1769,5.9280 +Khronos,8x8,ldr-rgba-specgloss.png,33.4811,0.2785,0.2324,4.5116 +Khronos,8x8,ldr-xy-normal1.png,37.4281,0.2143,0.1423,7.3684 +Khronos,8x8,ldr-xy-normal2.png,42.0637,0.4116,0.1671,25.0961 +Khronos,12x12,ldr-l-occlusion.png,41.6347,0.0471,0.0149,70.2709 +Khronos,12x12,ldr-rgb-diffuse.png,35.7680,0.3823,0.2401,17.4677 +Khronos,12x12,ldr-rgb-emissive.png,41.4121,0.0537,0.0195,53.7343 +Khronos,12x12,ldr-rgb-metalrough.png,29.1213,0.1935,0.1513,6.9306 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1727,0.8369,0.6861,6.1130 +Khronos,12x12,ldr-rgba-base.png,29.6476,0.2015,0.1549,6.7688 +Khronos,12x12,ldr-rgba-diffuse.png,29.0758,0.2479,0.2025,5.1779 +Khronos,12x12,ldr-rgba-specgloss.png,30.4831,0.2300,0.1817,5.7696 +Khronos,12x12,ldr-xy-normal1.png,33.5197,0.1870,0.1127,9.3065 +Khronos,12x12,ldr-xy-normal2.png,37.8214,0.4292,0.1730,24.2417 diff --git a/Test/Images/Khronos/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..b0a926fb73b37c2f5d314231d5511e21ef8ec6bd --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.4255,0.0703,0.0393,26.6928 +Khronos,4x4,ldr-rgb-diffuse.png,54.7764,1.0447,0.9019,4.6506 +Khronos,4x4,ldr-rgb-emissive.png,60.8826,0.0620,0.0291,35.9903 +Khronos,4x4,ldr-rgb-metalrough.png,45.0480,0.3578,0.3161,3.3174 +Khronos,4x4,ldr-rgb-metalrough2.png,44.0818,2.2280,2.0757,2.0207 +Khronos,4x4,ldr-rgba-base.png,44.0332,0.4541,0.4087,2.5656 +Khronos,4x4,ldr-rgba-diffuse.png,44.4445,0.3137,0.2693,3.8944 +Khronos,4x4,ldr-rgba-specgloss.png,42.4764,0.5815,0.5333,1.9664 +Khronos,4x4,ldr-xy-normal1.png,46.6603,0.7324,0.6621,1.5837 +Khronos,4x4,ldr-xy-normal2.png,50.5464,1.8337,1.5966,2.6271 +Khronos,5x5,ldr-l-occlusion.png,58.7464,0.1079,0.0761,13.7820 +Khronos,5x5,ldr-rgb-diffuse.png,49.8233,0.9135,0.7696,5.4503 +Khronos,5x5,ldr-rgb-emissive.png,56.1632,0.0672,0.0336,31.2066 +Khronos,5x5,ldr-rgb-metalrough.png,40.5315,0.3661,0.3243,3.2338 +Khronos,5x5,ldr-rgb-metalrough2.png,39.5945,2.3561,2.2027,1.9042 +Khronos,5x5,ldr-rgba-base.png,39.8027,0.4739,0.4273,2.4542 +Khronos,5x5,ldr-rgba-diffuse.png,39.9365,0.3477,0.3026,3.4656 +Khronos,5x5,ldr-rgba-specgloss.png,39.0414,0.5838,0.5361,1.9559 +Khronos,5x5,ldr-xy-normal1.png,43.3853,0.8310,0.7608,1.3783 +Khronos,5x5,ldr-xy-normal2.png,47.7847,2.3680,2.1236,1.9751 +Khronos,6x6,ldr-l-occlusion.png,52.2712,0.1322,0.1011,10.3744 +Khronos,6x6,ldr-rgb-diffuse.png,45.7889,0.8833,0.7430,5.6450 +Khronos,6x6,ldr-rgb-emissive.png,52.6833,0.0703,0.0379,27.6816 +Khronos,6x6,ldr-rgb-metalrough.png,37.0684,0.4037,0.3632,2.8874 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8174,2.5307,2.3791,1.7630 +Khronos,6x6,ldr-rgba-base.png,36.9100,0.5088,0.4625,2.2673 +Khronos,6x6,ldr-rgba-diffuse.png,36.7066,0.3809,0.3367,3.1142 +Khronos,6x6,ldr-rgba-specgloss.png,36.6855,0.6095,0.5610,1.8690 +Khronos,6x6,ldr-xy-normal1.png,41.0976,0.7191,0.6479,1.6185 +Khronos,6x6,ldr-xy-normal2.png,45.7894,1.9277,1.6762,2.5023 +Khronos,8x8,ldr-l-occlusion.png,46.0363,0.1675,0.1372,7.6450 +Khronos,8x8,ldr-rgb-diffuse.png,40.8626,1.0003,0.8646,4.8513 +Khronos,8x8,ldr-rgb-emissive.png,47.5792,0.0739,0.0420,24.9389 +Khronos,8x8,ldr-rgb-metalrough.png,32.8612,0.5115,0.4703,2.2298 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6302,3.0730,2.9331,1.4300 +Khronos,8x8,ldr-rgba-base.png,33.2969,0.6392,0.5940,1.7652 +Khronos,8x8,ldr-rgba-diffuse.png,32.7445,0.5015,0.4578,2.2904 +Khronos,8x8,ldr-rgba-specgloss.png,33.6408,0.7511,0.7036,1.4903 +Khronos,8x8,ldr-xy-normal1.png,37.7175,0.5080,0.4360,2.4047 +Khronos,8x8,ldr-xy-normal2.png,42.5021,1.0866,0.8407,4.9888 +Khronos,12x12,ldr-l-occlusion.png,42.4458,0.1652,0.1305,8.0327 +Khronos,12x12,ldr-rgb-diffuse.png,36.6053,1.2218,1.0791,3.8868 +Khronos,12x12,ldr-rgb-emissive.png,42.3646,0.1050,0.0678,15.4632 +Khronos,12x12,ldr-rgb-metalrough.png,29.3020,0.6908,0.6456,1.6241 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7710,3.6073,3.4534,1.2145 +Khronos,12x12,ldr-rgba-base.png,29.9273,0.7375,0.6885,1.5230 +Khronos,12x12,ldr-rgba-diffuse.png,29.2650,0.6859,0.6377,1.6442 +Khronos,12x12,ldr-rgba-specgloss.png,30.7044,0.9539,0.9027,1.1616 +Khronos,12x12,ldr-xy-normal1.png,33.9544,0.5084,0.4330,2.4219 +Khronos,12x12,ldr-xy-normal2.png,38.4422,0.8885,0.6334,6.6219 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..367c0d43ffed0ae55ffe7e82eb744a491bb8f917 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0415,0.0096,108.7629 +Khronos,4x4,ldr-rgb-diffuse.png,52.8179,0.2312,0.0800,52.4446 +Khronos,4x4,ldr-rgb-emissive.png,58.5184,0.0420,0.0080,130.4052 +Khronos,4x4,ldr-rgb-metalrough.png,44.3627,0.1039,0.0606,17.2936 +Khronos,4x4,ldr-rgb-metalrough2.png,42.9750,0.5459,0.3818,10.9848 +Khronos,4x4,ldr-rgba-base.png,43.2965,0.1229,0.0758,13.8360 +Khronos,4x4,ldr-rgba-diffuse.png,43.9222,0.0996,0.0538,19.4924 +Khronos,4x4,ldr-rgba-specgloss.png,41.7049,0.1696,0.1209,8.6763 +Khronos,4x4,ldr-xy-normal1.png,44.9872,0.1633,0.0898,11.6789 +Khronos,4x4,ldr-xy-normal2.png,48.6837,0.3941,0.1379,30.4098 +Khronos,5x5,ldr-l-occlusion.png,54.3814,0.0391,0.0071,147.3333 +Khronos,5x5,ldr-rgb-diffuse.png,47.2236,0.2078,0.0587,71.4801 +Khronos,5x5,ldr-rgb-emissive.png,52.6635,0.0406,0.0063,165.4956 +Khronos,5x5,ldr-rgb-metalrough.png,39.9099,0.0889,0.0471,22.2485 +Khronos,5x5,ldr-rgb-metalrough2.png,37.9762,0.5365,0.3757,11.1628 +Khronos,5x5,ldr-rgba-base.png,38.9583,0.1018,0.0557,18.8359 +Khronos,5x5,ldr-rgba-diffuse.png,39.1885,0.0991,0.0537,19.5393 +Khronos,5x5,ldr-rgba-specgloss.png,38.4160,0.1252,0.0768,13.6597 +Khronos,5x5,ldr-xy-normal1.png,41.8334,0.1439,0.0701,14.9498 +Khronos,5x5,ldr-xy-normal2.png,46.1655,0.3565,0.0929,45.1340 +Khronos,6x6,ldr-l-occlusion.png,48.3862,0.0399,0.0088,119.3889 +Khronos,6x6,ldr-rgb-diffuse.png,43.2830,0.2294,0.0829,50.6107 +Khronos,6x6,ldr-rgb-emissive.png,49.1097,0.0401,0.0066,159.9639 +Khronos,6x6,ldr-rgb-metalrough.png,36.5415,0.0985,0.0563,18.6314 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3486,0.5346,0.3765,11.1397 +Khronos,6x6,ldr-rgba-base.png,36.1889,0.1096,0.0635,16.5133 +Khronos,6x6,ldr-rgba-diffuse.png,36.1527,0.1118,0.0670,15.6411 +Khronos,6x6,ldr-rgba-specgloss.png,36.1297,0.1314,0.0833,12.5817 +Khronos,6x6,ldr-xy-normal1.png,39.6460,0.1392,0.0658,15.9467 +Khronos,6x6,ldr-xy-normal2.png,44.1090,0.3527,0.0907,46.2417 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0396,0.0105,99.8830 +Khronos,8x8,ldr-rgb-diffuse.png,38.4150,0.2531,0.1093,38.3654 +Khronos,8x8,ldr-rgb-emissive.png,44.6847,0.0404,0.0088,119.3726 +Khronos,8x8,ldr-rgb-metalrough.png,32.3524,0.1168,0.0745,14.0663 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2210,0.4915,0.3359,12.4855 +Khronos,8x8,ldr-rgba-base.png,32.4716,0.1168,0.0704,14.8929 +Khronos,8x8,ldr-rgba-diffuse.png,32.1743,0.1350,0.0908,11.5490 +Khronos,8x8,ldr-rgba-specgloss.png,32.9565,0.1332,0.0854,12.2801 +Khronos,8x8,ldr-xy-normal1.png,36.5625,0.1320,0.0588,17.8472 +Khronos,8x8,ldr-xy-normal2.png,40.7934,0.3632,0.1046,40.1035 +Khronos,12x12,ldr-l-occlusion.png,40.5804,0.0412,0.0098,106.7928 +Khronos,12x12,ldr-rgb-diffuse.png,33.3731,0.2247,0.0784,53.4654 +Khronos,12x12,ldr-rgb-emissive.png,39.4844,0.0416,0.0079,132.2641 +Khronos,12x12,ldr-rgb-metalrough.png,28.6538,0.0862,0.0432,24.2731 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2618,0.3131,0.1561,26.8656 +Khronos,12x12,ldr-rgba-base.png,29.0434,0.1041,0.0569,18.4333 +Khronos,12x12,ldr-rgba-diffuse.png,28.6314,0.1129,0.0668,15.6912 +Khronos,12x12,ldr-rgba-specgloss.png,29.8201,0.0975,0.0479,21.8991 +Khronos,12x12,ldr-xy-normal1.png,32.7607,0.1147,0.0398,26.3528 +Khronos,12x12,ldr-xy-normal2.png,36.2418,0.3535,0.0922,45.5116 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..aeb95f0476483f51a98e95b144bd9eb1f18b88f3 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0399,0.0088,119.3726 +Khronos,4x4,ldr-rgb-diffuse.png,52.5960,0.2194,0.0693,60.5466 +Khronos,4x4,ldr-rgb-emissive.png,57.9317,0.0407,0.0071,148.1872 +Khronos,4x4,ldr-rgb-metalrough.png,43.8926,0.0819,0.0401,26.1561 +Khronos,4x4,ldr-rgb-metalrough2.png,42.6922,0.4025,0.2399,17.4813 +Khronos,4x4,ldr-rgba-base.png,42.8654,0.0942,0.0480,21.8567 +Khronos,4x4,ldr-rgba-diffuse.png,43.3179,0.0799,0.0343,30.5868 +Khronos,4x4,ldr-rgba-specgloss.png,41.4002,0.1237,0.0753,13.9181 +Khronos,4x4,ldr-xy-normal1.png,44.8194,0.1308,0.0581,18.0459 +Khronos,4x4,ldr-xy-normal2.png,48.3518,0.3660,0.1069,39.2258 +Khronos,5x5,ldr-l-occlusion.png,54.2366,0.0381,0.0069,151.4166 +Khronos,5x5,ldr-rgb-diffuse.png,47.0653,0.2030,0.0551,76.1109 +Khronos,5x5,ldr-rgb-emissive.png,52.3476,0.0396,0.0056,186.8805 +Khronos,5x5,ldr-rgb-metalrough.png,39.4280,0.0754,0.0338,31.0579 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4660,0.4040,0.2449,17.1284 +Khronos,5x5,ldr-rgba-base.png,38.3323,0.0846,0.0387,27.0811 +Khronos,5x5,ldr-rgba-diffuse.png,38.5010,0.0796,0.0352,29.8221 +Khronos,5x5,ldr-rgba-specgloss.png,37.9482,0.0995,0.0519,20.2127 +Khronos,5x5,ldr-xy-normal1.png,41.4622,0.1212,0.0485,21.6126 +Khronos,5x5,ldr-xy-normal2.png,45.8286,0.3416,0.0789,53.1569 +Khronos,6x6,ldr-l-occlusion.png,48.3017,0.0384,0.0081,129.9813 +Khronos,6x6,ldr-rgb-diffuse.png,43.2322,0.2172,0.0715,58.7019 +Khronos,6x6,ldr-rgb-emissive.png,49.0036,0.0382,0.0056,188.2887 +Khronos,6x6,ldr-rgb-metalrough.png,36.3590,0.0815,0.0404,25.9619 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1574,0.3966,0.2401,17.4691 +Khronos,6x6,ldr-rgba-base.png,36.0142,0.0881,0.0430,24.3962 +Khronos,6x6,ldr-rgba-diffuse.png,35.9592,0.0871,0.0432,24.2568 +Khronos,6x6,ldr-rgba-specgloss.png,35.9090,0.1026,0.0550,19.0508 +Khronos,6x6,ldr-xy-normal1.png,39.2368,0.1195,0.0468,22.4189 +Khronos,6x6,ldr-xy-normal2.png,43.7398,0.3357,0.0752,55.8080 +Khronos,8x8,ldr-l-occlusion.png,43.5141,0.0378,0.0090,116.2889 +Khronos,8x8,ldr-rgb-diffuse.png,38.2796,0.2314,0.0879,47.7053 +Khronos,8x8,ldr-rgb-emissive.png,44.2626,0.0379,0.0068,154.5180 +Khronos,8x8,ldr-rgb-metalrough.png,32.2702,0.0961,0.0541,19.3743 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1173,0.3955,0.2411,17.3934 +Khronos,8x8,ldr-rgba-base.png,32.3492,0.0964,0.0513,20.4389 +Khronos,8x8,ldr-rgba-diffuse.png,32.0637,0.1077,0.0639,16.4176 +Khronos,8x8,ldr-rgba-specgloss.png,32.8589,0.1096,0.0619,16.9459 +Khronos,8x8,ldr-xy-normal1.png,36.3456,0.1172,0.0445,23.5730 +Khronos,8x8,ldr-xy-normal2.png,40.3507,0.3451,0.0867,48.3968 +Khronos,12x12,ldr-l-occlusion.png,40.2287,0.0388,0.0081,129.1682 +Khronos,12x12,ldr-rgb-diffuse.png,33.3235,0.2097,0.0644,65.1695 +Khronos,12x12,ldr-rgb-emissive.png,39.2827,0.0390,0.0060,174.3596 +Khronos,12x12,ldr-rgb-metalrough.png,28.6080,0.0749,0.0325,32.2657 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1699,0.2733,0.1175,35.6923 +Khronos,12x12,ldr-rgba-base.png,28.9860,0.0877,0.0416,25.2195 +Khronos,12x12,ldr-rgba-diffuse.png,28.5784,0.0932,0.0478,21.9538 +Khronos,12x12,ldr-rgba-specgloss.png,29.7728,0.0845,0.0358,29.2922 +Khronos,12x12,ldr-xy-normal1.png,32.6323,0.1035,0.0299,35.0297 +Khronos,12x12,ldr-xy-normal2.png,36.0168,0.3341,0.0738,56.7964 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..69b02ae822a337e4544f76d99490f086326914d5 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.5687,0.0497,0.0171,61.1451 +Khronos,4x4,ldr-rgb-diffuse.png,54.2509,0.3701,0.2170,19.3278 +Khronos,4x4,ldr-rgb-emissive.png,59.8692,0.0510,0.0164,64.0778 +Khronos,4x4,ldr-rgb-metalrough.png,44.9162,0.2284,0.1851,5.6652 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8012,1.4463,1.2816,3.2727 +Khronos,4x4,ldr-rgba-base.png,43.8387,0.2828,0.2356,4.4510 +Khronos,4x4,ldr-rgba-diffuse.png,44.2480,0.1984,0.1522,6.8893 +Khronos,4x4,ldr-rgba-specgloss.png,42.3086,0.3810,0.3313,3.1651 +Khronos,4x4,ldr-xy-normal1.png,46.5096,0.3382,0.2657,3.9468 +Khronos,4x4,ldr-xy-normal2.png,50.2692,0.7803,0.5330,7.8688 +Khronos,5x5,ldr-l-occlusion.png,57.1506,0.0520,0.0188,55.7307 +Khronos,5x5,ldr-rgb-diffuse.png,49.0125,0.3701,0.2194,19.1154 +Khronos,5x5,ldr-rgb-emissive.png,55.4137,0.0532,0.0176,59.4974 +Khronos,5x5,ldr-rgb-metalrough.png,40.3176,0.2227,0.1793,5.8471 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1297,1.5655,1.4040,2.9874 +Khronos,5x5,ldr-rgba-base.png,39.4682,0.2843,0.2375,4.4157 +Khronos,5x5,ldr-rgba-diffuse.png,39.6061,0.2268,0.1801,5.8229 +Khronos,5x5,ldr-rgba-specgloss.png,38.7834,0.3660,0.3162,3.3160 +Khronos,5x5,ldr-xy-normal1.png,43.0303,0.3241,0.2496,4.2005 +Khronos,5x5,ldr-xy-normal2.png,47.2313,0.6870,0.4270,9.8238 +Khronos,6x6,ldr-l-occlusion.png,50.8594,0.0607,0.0283,37.0156 +Khronos,6x6,ldr-rgb-diffuse.png,44.9402,0.3870,0.2386,17.5756 +Khronos,6x6,ldr-rgb-emissive.png,51.5373,0.0534,0.0190,55.3081 +Khronos,6x6,ldr-rgb-metalrough.png,36.8816,0.2260,0.1831,5.7272 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5008,1.4848,1.3241,3.1677 +Khronos,6x6,ldr-rgba-base.png,36.6975,0.2627,0.2160,4.8555 +Khronos,6x6,ldr-rgba-diffuse.png,36.5302,0.2411,0.1950,5.3781 +Khronos,6x6,ldr-rgba-specgloss.png,36.4921,0.3535,0.3043,3.4461 +Khronos,6x6,ldr-xy-normal1.png,40.6408,0.2754,0.2011,5.2140 +Khronos,6x6,ldr-xy-normal2.png,45.1534,0.4950,0.2327,18.0256 +Khronos,8x8,ldr-l-occlusion.png,45.4584,0.0713,0.0407,25.7369 +Khronos,8x8,ldr-rgb-diffuse.png,40.2308,0.5254,0.3784,11.0843 +Khronos,8x8,ldr-rgb-emissive.png,46.6998,0.0600,0.0263,39.8442 +Khronos,8x8,ldr-rgb-metalrough.png,32.6999,0.2980,0.2541,4.1260 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2345,1.6888,1.5320,2.7377 +Khronos,8x8,ldr-rgba-base.png,33.0850,0.3040,0.2580,4.0643 +Khronos,8x8,ldr-rgba-diffuse.png,32.5888,0.3173,0.2717,3.8598 +Khronos,8x8,ldr-rgba-specgloss.png,33.4811,0.4078,0.3586,2.9238 +Khronos,8x8,ldr-xy-normal1.png,37.4281,0.2942,0.2188,4.7918 +Khronos,8x8,ldr-xy-normal2.png,42.0637,0.5227,0.2615,16.0414 +Khronos,12x12,ldr-l-occlusion.png,41.6347,0.0563,0.0226,46.3787 +Khronos,12x12,ldr-rgb-diffuse.png,35.7680,0.5245,0.3758,11.1618 +Khronos,12x12,ldr-rgb-emissive.png,41.4121,0.0651,0.0290,36.0978 +Khronos,12x12,ldr-rgb-metalrough.png,29.1213,0.2747,0.2283,4.5931 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1727,1.1983,1.0386,4.0383 +Khronos,12x12,ldr-rgba-base.png,29.6476,0.2832,0.2324,4.5119 +Khronos,12x12,ldr-rgba-diffuse.png,29.0758,0.3493,0.3006,3.4879 +Khronos,12x12,ldr-rgba-specgloss.png,30.4831,0.3257,0.2738,3.8302 +Khronos,12x12,ldr-xy-normal1.png,33.5197,0.2451,0.1668,6.2855 +Khronos,12x12,ldr-xy-normal2.png,37.8214,0.5255,0.2612,16.0602 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..dd88d12fe85a536582a85349c0341d8e5595940a --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.4255,0.0879,0.0552,18.9918 +Khronos,4x4,ldr-rgb-diffuse.png,54.7764,1.3799,1.2276,3.4165 +Khronos,4x4,ldr-rgb-emissive.png,60.8826,0.0726,0.0378,27.7423 +Khronos,4x4,ldr-rgb-metalrough.png,45.0480,0.4709,0.4267,2.4574 +Khronos,4x4,ldr-rgb-metalrough2.png,44.0818,2.9605,2.7954,1.5004 +Khronos,4x4,ldr-rgba-base.png,44.0332,0.5959,0.5474,1.9155 +Khronos,4x4,ldr-rgba-diffuse.png,44.4445,0.4050,0.3585,2.9246 +Khronos,4x4,ldr-rgba-specgloss.png,42.4764,0.7701,0.7207,1.4550 +Khronos,4x4,ldr-xy-normal1.png,46.6603,0.9350,0.8627,1.2155 +Khronos,4x4,ldr-xy-normal2.png,50.5464,2.3361,2.0942,2.0028 +Khronos,5x5,ldr-l-occlusion.png,58.7464,0.1443,0.1119,9.3668 +Khronos,5x5,ldr-rgb-diffuse.png,49.8233,1.2770,1.1246,3.7295 +Khronos,5x5,ldr-rgb-emissive.png,56.1632,0.0833,0.0470,22.2912 +Khronos,5x5,ldr-rgb-metalrough.png,40.5315,0.5124,0.4676,2.2425 +Khronos,5x5,ldr-rgb-metalrough2.png,39.5945,3.3313,3.1674,1.3242 +Khronos,5x5,ldr-rgba-base.png,39.8027,0.6606,0.6092,1.7211 +Khronos,5x5,ldr-rgba-diffuse.png,39.9365,0.4799,0.4334,2.4194 +Khronos,5x5,ldr-rgba-specgloss.png,39.0414,0.8176,0.7661,1.3687 +Khronos,5x5,ldr-xy-normal1.png,43.3853,1.1448,1.0709,0.9792 +Khronos,5x5,ldr-xy-normal2.png,47.7847,3.2567,2.9989,1.3986 +Khronos,6x6,ldr-l-occlusion.png,52.2712,0.1879,0.1563,6.7075 +Khronos,6x6,ldr-rgb-diffuse.png,45.7889,1.2844,1.1340,3.6987 +Khronos,6x6,ldr-rgb-emissive.png,52.6833,0.0909,0.0563,18.6314 +Khronos,6x6,ldr-rgb-metalrough.png,37.0684,0.5868,0.5423,1.9336 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8174,3.6645,3.5010,1.1980 +Khronos,6x6,ldr-rgba-base.png,36.9100,0.7278,0.6804,1.5411 +Khronos,6x6,ldr-rgba-diffuse.png,36.7066,0.5483,0.5009,2.0933 +Khronos,6x6,ldr-rgba-specgloss.png,36.6855,0.8641,0.8149,1.2868 +Khronos,6x6,ldr-xy-normal1.png,41.0976,1.0310,0.9567,1.0960 +Khronos,6x6,ldr-xy-normal2.png,45.7894,2.7314,2.4716,1.6970 +Khronos,8x8,ldr-l-occlusion.png,46.0363,0.2467,0.2146,4.8856 +Khronos,8x8,ldr-rgb-diffuse.png,40.8626,1.5129,1.3642,3.0745 +Khronos,8x8,ldr-rgb-emissive.png,47.5792,0.0995,0.0655,16.0100 +Khronos,8x8,ldr-rgb-metalrough.png,32.8612,0.7665,0.7214,1.4536 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6302,4.5766,4.4166,0.9497 +Khronos,8x8,ldr-rgba-base.png,33.2969,0.9471,0.8980,1.1677 +Khronos,8x8,ldr-rgba-diffuse.png,32.7445,0.7457,0.6975,1.5033 +Khronos,8x8,ldr-rgba-specgloss.png,33.6408,1.1120,1.0611,0.9882 +Khronos,8x8,ldr-xy-normal1.png,37.7175,0.7501,0.6727,1.5587 +Khronos,8x8,ldr-xy-normal2.png,42.5021,1.6170,1.3584,3.0877 +Khronos,12x12,ldr-l-occlusion.png,42.4458,0.2357,0.1994,5.2584 +Khronos,12x12,ldr-rgb-diffuse.png,36.6053,1.7785,1.6276,2.5770 +Khronos,12x12,ldr-rgb-emissive.png,42.3646,0.1399,0.1015,10.3354 +Khronos,12x12,ldr-rgb-metalrough.png,29.3020,1.0049,0.9557,1.0971 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7710,5.2208,5.0598,0.8289 +Khronos,12x12,ldr-rgba-base.png,29.9273,1.0669,1.0134,1.0347 +Khronos,12x12,ldr-rgba-diffuse.png,29.2650,0.9900,0.9392,1.1164 +Khronos,12x12,ldr-rgba-specgloss.png,30.7044,1.3718,1.3176,0.7958 +Khronos,12x12,ldr-xy-normal1.png,33.9544,0.7235,0.6441,1.6279 +Khronos,12x12,ldr-xy-normal2.png,38.4422,1.2283,0.9636,4.3528 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..44b5533e7ba31dc30fb76fa58ba6d135b04e57d8 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0380,0.0080,131.5835 +Khronos,4x4,ldr-rgb-diffuse.png,52.8179,0.2116,0.0646,64.9173 +Khronos,4x4,ldr-rgb-emissive.png,58.5184,0.0402,0.0075,139.0467 +Khronos,4x4,ldr-rgb-metalrough.png,44.3627,0.0912,0.0507,20.6632 +Khronos,4x4,ldr-rgb-metalrough2.png,42.9750,0.4768,0.3221,13.0213 +Khronos,4x4,ldr-rgba-base.png,43.2965,0.1085,0.0638,16.4473 +Khronos,4x4,ldr-rgba-diffuse.png,43.9222,0.0891,0.0451,23.2593 +Khronos,4x4,ldr-rgba-specgloss.png,41.7049,0.1488,0.1022,10.2611 +Khronos,4x4,ldr-xy-normal1.png,44.9872,0.1459,0.0754,13.9122 +Khronos,4x4,ldr-xy-normal2.png,48.6837,0.3618,0.1138,36.8704 +Khronos,5x5,ldr-l-occlusion.png,54.3814,0.0365,0.0062,168.2819 +Khronos,5x5,ldr-rgb-diffuse.png,47.2236,0.1952,0.0500,83.8378 +Khronos,5x5,ldr-rgb-emissive.png,52.6635,0.0384,0.0057,182.8405 +Khronos,5x5,ldr-rgb-metalrough.png,39.9099,0.0793,0.0390,26.8660 +Khronos,5x5,ldr-rgb-metalrough2.png,37.9762,0.4647,0.3113,13.4739 +Khronos,5x5,ldr-rgba-base.png,38.9583,0.0907,0.0460,22.7886 +Khronos,5x5,ldr-rgba-diffuse.png,39.1885,0.0883,0.0444,23.6214 +Khronos,5x5,ldr-rgba-specgloss.png,38.4160,0.1096,0.0632,16.5977 +Khronos,5x5,ldr-xy-normal1.png,41.8334,0.1304,0.0587,17.8657 +Khronos,5x5,ldr-xy-normal2.png,46.1655,0.3369,0.0789,53.1860 +Khronos,6x6,ldr-l-occlusion.png,48.3862,0.0371,0.0076,138.8491 +Khronos,6x6,ldr-rgb-diffuse.png,43.2830,0.2079,0.0687,61.0088 +Khronos,6x6,ldr-rgb-emissive.png,49.1097,0.0378,0.0058,180.0486 +Khronos,6x6,ldr-rgb-metalrough.png,36.5415,0.0860,0.0464,22.5835 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3486,0.4619,0.3119,13.4457 +Khronos,6x6,ldr-rgba-base.png,36.1889,0.0961,0.0526,19.9269 +Khronos,6x6,ldr-rgba-diffuse.png,36.1527,0.0983,0.0553,18.9564 +Khronos,6x6,ldr-rgba-specgloss.png,36.1297,0.1143,0.0685,15.3043 +Khronos,6x6,ldr-xy-normal1.png,39.6460,0.1255,0.0549,19.0942 +Khronos,6x6,ldr-xy-normal2.png,44.1090,0.3288,0.0767,54.6640 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0364,0.0090,117.1344 +Khronos,8x8,ldr-rgb-diffuse.png,38.4150,0.2246,0.0913,45.9222 +Khronos,8x8,ldr-rgb-emissive.png,44.6847,0.0373,0.0076,137.3188 +Khronos,8x8,ldr-rgb-metalrough.png,32.3524,0.1019,0.0619,16.9288 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2210,0.4244,0.2802,14.9716 +Khronos,8x8,ldr-rgba-base.png,32.4716,0.1020,0.0589,17.7915 +Khronos,8x8,ldr-rgba-diffuse.png,32.1743,0.1175,0.0756,13.8669 +Khronos,8x8,ldr-rgba-specgloss.png,32.9565,0.1166,0.0712,14.7328 +Khronos,8x8,ldr-xy-normal1.png,36.5625,0.1198,0.0490,21.3895 +Khronos,8x8,ldr-xy-normal2.png,40.7934,0.3341,0.0881,47.6274 +Khronos,12x12,ldr-l-occlusion.png,40.5804,0.0384,0.0086,121.6039 +Khronos,12x12,ldr-rgb-diffuse.png,33.3731,0.2051,0.0684,61.3524 +Khronos,12x12,ldr-rgb-emissive.png,39.4844,0.0386,0.0070,149.5019 +Khronos,12x12,ldr-rgb-metalrough.png,28.6538,0.0783,0.0378,27.7651 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2618,0.2840,0.1355,30.9474 +Khronos,12x12,ldr-rgba-base.png,29.0434,0.0941,0.0496,21.1500 +Khronos,12x12,ldr-rgba-diffuse.png,28.6314,0.1019,0.0582,18.0047 +Khronos,12x12,ldr-rgba-specgloss.png,29.8201,0.0889,0.0417,25.1741 +Khronos,12x12,ldr-xy-normal1.png,32.7607,0.1066,0.0349,30.0347 +Khronos,12x12,ldr-xy-normal2.png,36.2418,0.3315,0.0806,52.0199 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..09a5b5a8deffafbf7928052a6f1c43bbbc9d4085 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0369,0.0074,141.9503 +Khronos,4x4,ldr-rgb-diffuse.png,52.5960,0.1988,0.0566,74.1595 +Khronos,4x4,ldr-rgb-emissive.png,57.9317,0.0385,0.0067,156.5754 +Khronos,4x4,ldr-rgb-metalrough.png,43.8926,0.0733,0.0337,31.1602 +Khronos,4x4,ldr-rgb-metalrough2.png,42.6922,0.3554,0.2022,20.7468 +Khronos,4x4,ldr-rgba-base.png,42.8654,0.0843,0.0404,25.9677 +Khronos,4x4,ldr-rgba-diffuse.png,43.3179,0.0720,0.0289,36.3055 +Khronos,4x4,ldr-rgba-specgloss.png,41.4002,0.1100,0.0639,16.4207 +Khronos,4x4,ldr-xy-normal1.png,44.8194,0.1189,0.0489,21.4516 +Khronos,4x4,ldr-xy-normal2.png,48.3518,0.3399,0.0892,46.9966 +Khronos,5x5,ldr-l-occlusion.png,54.2366,0.0355,0.0061,171.5641 +Khronos,5x5,ldr-rgb-diffuse.png,47.0653,0.1908,0.0472,88.8131 +Khronos,5x5,ldr-rgb-emissive.png,52.3476,0.0374,0.0053,196.7718 +Khronos,5x5,ldr-rgb-metalrough.png,39.4280,0.0673,0.0280,37.4063 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4660,0.3531,0.2032,20.6382 +Khronos,5x5,ldr-rgba-base.png,38.3323,0.0756,0.0322,32.5181 +Khronos,5x5,ldr-rgba-diffuse.png,38.5010,0.0717,0.0292,35.9300 +Khronos,5x5,ldr-rgba-specgloss.png,37.9482,0.0882,0.0427,24.5752 +Khronos,5x5,ldr-xy-normal1.png,41.4622,0.1112,0.0406,25.8455 +Khronos,5x5,ldr-xy-normal2.png,45.8286,0.3234,0.0670,62.5950 +Khronos,6x6,ldr-l-occlusion.png,48.3017,0.0357,0.0070,150.8712 +Khronos,6x6,ldr-rgb-diffuse.png,43.2322,0.1971,0.0596,70.4273 +Khronos,6x6,ldr-rgb-emissive.png,49.0036,0.0360,0.0050,208.8837 +Khronos,6x6,ldr-rgb-metalrough.png,36.3590,0.0722,0.0333,31.5360 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1574,0.3456,0.1975,21.2344 +Khronos,6x6,ldr-rgba-base.png,36.0142,0.0785,0.0355,29.5050 +Khronos,6x6,ldr-rgba-diffuse.png,35.9592,0.0775,0.0354,29.5991 +Khronos,6x6,ldr-rgba-specgloss.png,35.9090,0.0901,0.0451,23.2733 +Khronos,6x6,ldr-xy-normal1.png,39.2368,0.1091,0.0391,26.8288 +Khronos,6x6,ldr-xy-normal2.png,43.7398,0.3147,0.0633,66.2157 +Khronos,8x8,ldr-l-occlusion.png,43.5141,0.0347,0.0078,134.9674 +Khronos,8x8,ldr-rgb-diffuse.png,38.2796,0.2061,0.0735,57.0834 +Khronos,8x8,ldr-rgb-emissive.png,44.2626,0.0355,0.0060,174.3596 +Khronos,8x8,ldr-rgb-metalrough.png,32.2702,0.0846,0.0448,23.3932 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1173,0.3436,0.2008,20.8863 +Khronos,8x8,ldr-rgba-base.png,32.3492,0.0850,0.0426,24.6173 +Khronos,8x8,ldr-rgba-diffuse.png,32.0637,0.0947,0.0529,19.8249 +Khronos,8x8,ldr-rgba-specgloss.png,32.8589,0.0968,0.0516,20.3279 +Khronos,8x8,ldr-xy-normal1.png,36.3456,0.1072,0.0372,28.1935 +Khronos,8x8,ldr-xy-normal2.png,40.3507,0.3191,0.0729,57.5397 +Khronos,12x12,ldr-l-occlusion.png,40.2287,0.0359,0.0072,146.2262 +Khronos,12x12,ldr-rgb-diffuse.png,33.3235,0.1931,0.0560,74.8983 +Khronos,12x12,ldr-rgb-emissive.png,39.2827,0.0367,0.0054,195.3385 +Khronos,12x12,ldr-rgb-metalrough.png,28.6080,0.0684,0.0283,37.0271 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1699,0.2487,0.1022,41.0409 +Khronos,12x12,ldr-rgba-base.png,28.9860,0.0801,0.0362,28.9421 +Khronos,12x12,ldr-rgba-diffuse.png,28.5784,0.0841,0.0415,25.2706 +Khronos,12x12,ldr-rgba-specgloss.png,29.7728,0.0764,0.0312,33.5662 +Khronos,12x12,ldr-xy-normal1.png,32.6323,0.0962,0.0263,39.9394 +Khronos,12x12,ldr-xy-normal2.png,36.0168,0.3150,0.0645,65.0673 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7348cee2bdcc022f608642c2dc3e246dff0fe438 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.5687,0.0451,0.0139,75.5068 +Khronos,4x4,ldr-rgb-diffuse.png,54.2509,0.3274,0.1799,23.3163 +Khronos,4x4,ldr-rgb-emissive.png,59.8692,0.0477,0.0145,72.2460 +Khronos,4x4,ldr-rgb-metalrough.png,44.9162,0.1965,0.1552,6.7570 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8012,1.2299,1.0750,3.9018 +Khronos,4x4,ldr-rgba-base.png,43.8387,0.2422,0.1973,5.3155 +Khronos,4x4,ldr-rgba-diffuse.png,44.2480,0.1735,0.1288,8.1417 +Khronos,4x4,ldr-rgba-specgloss.png,42.3086,0.3270,0.2798,3.7481 +Khronos,4x4,ldr-xy-normal1.png,46.5096,0.2954,0.2256,4.6480 +Khronos,4x4,ldr-xy-normal2.png,50.2692,0.6901,0.4484,9.3538 +Khronos,5x5,ldr-l-occlusion.png,57.1506,0.0469,0.0155,67.7905 +Khronos,5x5,ldr-rgb-diffuse.png,49.0125,0.3214,0.1780,23.5631 +Khronos,5x5,ldr-rgb-emissive.png,55.4137,0.0488,0.0148,70.9786 +Khronos,5x5,ldr-rgb-metalrough.png,40.3176,0.1880,0.1462,7.1736 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1297,1.3031,1.1504,3.6458 +Khronos,5x5,ldr-rgba-base.png,39.4682,0.2393,0.1943,5.3957 +Khronos,5x5,ldr-rgba-diffuse.png,39.6061,0.1915,0.1471,7.1282 +Khronos,5x5,ldr-rgba-specgloss.png,38.7834,0.3081,0.2604,4.0265 +Khronos,5x5,ldr-xy-normal1.png,43.0303,0.2762,0.2047,5.1230 +Khronos,5x5,ldr-xy-normal2.png,47.2313,0.6009,0.3474,12.0737 +Khronos,6x6,ldr-l-occlusion.png,50.8594,0.0532,0.0230,45.5289 +Khronos,6x6,ldr-rgb-diffuse.png,44.9402,0.3331,0.1924,21.8005 +Khronos,6x6,ldr-rgb-emissive.png,51.5373,0.0489,0.0159,66.0645 +Khronos,6x6,ldr-rgb-metalrough.png,36.8816,0.1912,0.1500,6.9889 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5008,1.2350,1.0861,3.8619 +Khronos,6x6,ldr-rgba-base.png,36.6975,0.2219,0.1768,5.9297 +Khronos,6x6,ldr-rgba-diffuse.png,36.5302,0.2039,0.1601,6.5477 +Khronos,6x6,ldr-rgba-specgloss.png,36.4921,0.2968,0.2496,4.2007 +Khronos,6x6,ldr-xy-normal1.png,40.6408,0.2360,0.1650,6.3533 +Khronos,6x6,ldr-xy-normal2.png,45.1534,0.4444,0.1925,21.7868 +Khronos,8x8,ldr-l-occlusion.png,45.4584,0.0620,0.0334,31.3906 +Khronos,8x8,ldr-rgb-diffuse.png,40.2308,0.4444,0.3089,13.5770 +Khronos,8x8,ldr-rgb-emissive.png,46.6998,0.0531,0.0220,47.6407 +Khronos,8x8,ldr-rgb-metalrough.png,32.6999,0.2522,0.2105,4.9818 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2345,1.4209,1.2745,3.2909 +Khronos,8x8,ldr-rgba-base.png,33.0850,0.2586,0.2148,4.8821 +Khronos,8x8,ldr-rgba-diffuse.png,32.5888,0.2691,0.2256,4.6480 +Khronos,8x8,ldr-rgba-specgloss.png,33.4811,0.3436,0.2970,3.5311 +Khronos,8x8,ldr-xy-normal1.png,37.4281,0.2553,0.1824,5.7500 +Khronos,8x8,ldr-xy-normal2.png,42.0637,0.4651,0.2161,19.4095 +Khronos,12x12,ldr-l-occlusion.png,41.6347,0.0517,0.0198,53.0793 +Khronos,12x12,ldr-rgb-diffuse.png,35.7680,0.4698,0.3266,12.8429 +Khronos,12x12,ldr-rgb-emissive.png,41.4121,0.0598,0.0254,41.2076 +Khronos,12x12,ldr-rgb-metalrough.png,29.1213,0.2434,0.1993,5.2610 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1727,1.0563,0.9045,4.6371 +Khronos,12x12,ldr-rgba-base.png,29.6476,0.2514,0.2032,5.1593 +Khronos,12x12,ldr-rgba-diffuse.png,29.0758,0.3109,0.2646,3.9626 +Khronos,12x12,ldr-rgba-specgloss.png,30.4831,0.2885,0.2390,4.3877 +Khronos,12x12,ldr-xy-normal1.png,33.5197,0.2228,0.1469,7.1376 +Khronos,12x12,ldr-xy-normal2.png,37.8214,0.4840,0.2291,18.3113 diff --git a/Test/Images/Khronos/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..70ce9b94ddcd2434d7220b4253f5d841249057c8 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.4255,0.0765,0.0455,23.0613 +Khronos,4x4,ldr-rgb-diffuse.png,54.7764,1.1733,1.0311,4.0680 +Khronos,4x4,ldr-rgb-emissive.png,60.8826,0.0656,0.0328,31.9600 +Khronos,4x4,ldr-rgb-metalrough.png,45.0480,0.4008,0.3590,2.9205 +Khronos,4x4,ldr-rgb-metalrough2.png,44.0818,2.5010,2.3450,1.7886 +Khronos,4x4,ldr-rgba-base.png,44.0332,0.5085,0.4626,2.2668 +Khronos,4x4,ldr-rgba-diffuse.png,44.4445,0.3498,0.3054,3.4331 +Khronos,4x4,ldr-rgba-specgloss.png,42.4764,0.6586,0.6110,1.7161 +Khronos,4x4,ldr-xy-normal1.png,46.6603,0.8150,0.7452,1.4071 +Khronos,4x4,ldr-xy-normal2.png,50.5464,2.0382,1.8019,2.3277 +Khronos,5x5,ldr-l-occlusion.png,58.7464,0.1214,0.0901,11.6347 +Khronos,5x5,ldr-rgb-diffuse.png,49.8233,1.0584,0.9137,4.5905 +Khronos,5x5,ldr-rgb-emissive.png,56.1632,0.0729,0.0386,27.1617 +Khronos,5x5,ldr-rgb-metalrough.png,40.5315,0.4230,0.3808,2.7533 +Khronos,5x5,ldr-rgb-metalrough2.png,39.5945,2.7561,2.5963,1.6155 +Khronos,5x5,ldr-rgba-base.png,39.8027,0.5516,0.5049,2.0767 +Khronos,5x5,ldr-rgba-diffuse.png,39.9365,0.4010,0.3558,2.9467 +Khronos,5x5,ldr-rgba-specgloss.png,39.0414,0.6822,0.6343,1.6532 +Khronos,5x5,ldr-xy-normal1.png,43.3853,0.9602,0.8893,1.1791 +Khronos,5x5,ldr-xy-normal2.png,47.7847,2.7467,2.4976,1.6794 +Khronos,6x6,ldr-l-occlusion.png,52.2712,0.1565,0.1262,8.3116 +Khronos,6x6,ldr-rgb-diffuse.png,45.7889,1.0673,0.9240,4.5392 +Khronos,6x6,ldr-rgb-emissive.png,52.6833,0.0790,0.0463,22.6348 +Khronos,6x6,ldr-rgb-metalrough.png,37.0684,0.4863,0.4447,2.3577 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8174,3.0393,2.8880,1.4523 +Khronos,6x6,ldr-rgba-base.png,36.9100,0.6096,0.5641,1.8589 +Khronos,6x6,ldr-rgba-diffuse.png,36.7066,0.4552,0.4112,2.5503 +Khronos,6x6,ldr-rgba-specgloss.png,36.6855,0.7266,0.6794,1.5435 +Khronos,6x6,ldr-xy-normal1.png,41.0976,0.8626,0.7904,1.3266 +Khronos,6x6,ldr-xy-normal2.png,45.7894,2.2930,2.0455,2.0505 +Khronos,8x8,ldr-l-occlusion.png,46.0363,0.2092,0.1787,5.8676 +Khronos,8x8,ldr-rgb-diffuse.png,40.8626,1.2696,1.1340,3.6987 +Khronos,8x8,ldr-rgb-emissive.png,47.5792,0.0870,0.0549,19.0889 +Khronos,8x8,ldr-rgb-metalrough.png,32.8612,0.6486,0.6054,1.7321 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6302,3.8740,3.7272,1.1253 +Khronos,8x8,ldr-rgba-base.png,33.2969,0.8026,0.7550,1.3889 +Khronos,8x8,ldr-rgba-diffuse.png,32.7445,0.6319,0.5870,1.7864 +Khronos,8x8,ldr-rgba-specgloss.png,33.6408,0.9413,0.8931,1.1740 +Khronos,8x8,ldr-xy-normal1.png,37.7175,0.6400,0.5677,1.8471 +Khronos,8x8,ldr-xy-normal2.png,42.5021,1.3685,1.1202,3.7442 +Khronos,12x12,ldr-l-occlusion.png,42.4458,0.2088,0.1746,6.0052 +Khronos,12x12,ldr-rgb-diffuse.png,36.6053,1.5706,1.4258,2.9417 +Khronos,12x12,ldr-rgb-emissive.png,42.3646,0.1263,0.0896,11.7094 +Khronos,12x12,ldr-rgb-metalrough.png,29.3020,0.8862,0.8395,1.2490 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7710,4.6028,4.4499,0.9426 +Khronos,12x12,ldr-rgba-base.png,29.9273,0.9429,0.8931,1.1741 +Khronos,12x12,ldr-rgba-diffuse.png,29.2650,0.8764,0.8284,1.2658 +Khronos,12x12,ldr-rgba-specgloss.png,30.7044,1.2141,1.1626,0.9019 +Khronos,12x12,ldr-xy-normal1.png,33.9544,0.6437,0.5680,1.8459 +Khronos,12x12,ldr-xy-normal2.png,38.4422,1.0970,0.8420,4.9811 diff --git a/Test/Images/Khronos/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/Khronos/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9eedca3529bc1da9a5ace34d872b8fd57a7717fd --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0371,0.0071,148.5877 +Khronos,4x4,ldr-rgb-diffuse.png,53.0267,0.2015,0.0543,77.2689 +Khronos,4x4,ldr-rgb-emissive.png,58.6381,0.0390,0.0073,144.4730 +Khronos,4x4,ldr-rgb-metalrough.png,44.3920,0.0853,0.0447,23.4429 +Khronos,4x4,ldr-rgb-metalrough2.png,43.0040,0.4393,0.2844,14.7457 +Khronos,4x4,ldr-rgba-base.png,43.3288,0.1012,0.0567,18.4980 +Khronos,4x4,ldr-rgba-diffuse.png,43.9623,0.0834,0.0399,26.2768 +Khronos,4x4,ldr-rgba-specgloss.png,41.7602,0.1375,0.0910,11.5173 +Khronos,4x4,ldr-xy-normal1.png,45.0735,0.1363,0.0657,15.9698 +Khronos,4x4,ldr-xy-normal2.png,48.7816,0.3495,0.0966,43.4004 +Khronos,5x5,ldr-l-occlusion.png,54.3818,0.0361,0.0054,192.9984 +Khronos,5x5,ldr-rgb-diffuse.png,47.3675,0.1902,0.0409,102.6729 +Khronos,5x5,ldr-rgb-emissive.png,52.6737,0.0377,0.0054,195.3385 +Khronos,5x5,ldr-rgb-metalrough.png,39.9283,0.0735,0.0327,32.0291 +Khronos,5x5,ldr-rgb-metalrough2.png,38.0052,0.4177,0.2660,15.7687 +Khronos,5x5,ldr-rgba-base.png,38.9802,0.0843,0.0391,26.8103 +Khronos,5x5,ldr-rgba-diffuse.png,39.2155,0.0824,0.0378,27.7357 +Khronos,5x5,ldr-rgba-specgloss.png,38.4625,0.1004,0.0535,19.5944 +Khronos,5x5,ldr-xy-normal1.png,41.9841,0.1207,0.0498,21.0371 +Khronos,5x5,ldr-xy-normal2.png,46.4301,0.3220,0.0655,63.9951 +Khronos,6x6,ldr-l-occlusion.png,48.3865,0.0359,0.0063,166.2778 +Khronos,6x6,ldr-rgb-diffuse.png,43.3210,0.1936,0.0538,77.9567 +Khronos,6x6,ldr-rgb-emissive.png,49.1136,0.0368,0.0053,198.8627 +Khronos,6x6,ldr-rgb-metalrough.png,36.5537,0.0768,0.0373,28.1007 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3595,0.4053,0.2530,16.5814 +Khronos,6x6,ldr-rgba-base.png,36.2020,0.0857,0.0427,24.5701 +Khronos,6x6,ldr-rgba-diffuse.png,36.1683,0.0875,0.0447,23.4744 +Khronos,6x6,ldr-rgba-specgloss.png,36.1582,0.1009,0.0552,18.9976 +Khronos,6x6,ldr-xy-normal1.png,39.6982,0.1148,0.0449,23.3317 +Khronos,6x6,ldr-xy-normal2.png,44.2645,0.3126,0.0622,67.4770 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0348,0.0072,146.1631 +Khronos,8x8,ldr-rgb-diffuse.png,38.4394,0.1971,0.0698,60.1118 +Khronos,8x8,ldr-rgb-emissive.png,44.6723,0.0355,0.0062,168.3592 +Khronos,8x8,ldr-rgb-metalrough.png,32.3577,0.0852,0.0477,21.9947 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2246,0.3541,0.2153,19.4779 +Khronos,8x8,ldr-rgba-base.png,32.4790,0.0888,0.0462,22.6881 +Khronos,8x8,ldr-rgba-diffuse.png,32.1796,0.0999,0.0583,17.9776 +Khronos,8x8,ldr-rgba-specgloss.png,32.9682,0.0997,0.0552,19.0063 +Khronos,8x8,ldr-xy-normal1.png,36.5942,0.1070,0.0386,27.2003 +Khronos,8x8,ldr-xy-normal2.png,40.8681,0.3118,0.0691,60.7236 +Khronos,12x12,ldr-l-occlusion.png,40.5805,0.0366,0.0065,160.2378 +Khronos,12x12,ldr-rgb-diffuse.png,33.3842,0.1906,0.0514,81.5873 +Khronos,12x12,ldr-rgb-emissive.png,39.4821,0.0369,0.0054,193.2188 +Khronos,12x12,ldr-rgb-metalrough.png,28.6554,0.0678,0.0288,36.4215 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2607,0.2506,0.1025,40.9148 +Khronos,12x12,ldr-rgba-base.png,29.0476,0.0815,0.0378,27.7423 +Khronos,12x12,ldr-rgba-diffuse.png,28.6320,0.0872,0.0440,23.8405 +Khronos,12x12,ldr-rgba-specgloss.png,29.8260,0.0780,0.0320,32.7762 +Khronos,12x12,ldr-xy-normal1.png,32.7642,0.0968,0.0265,39.5003 +Khronos,12x12,ldr-xy-normal2.png,36.2644,0.3126,0.0619,67.7222 diff --git a/Test/Images/Khronos/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..681e876f4f7ab252a6dfb969906d9b406d118b3d --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0363,0.0067,157.6078 +Khronos,4x4,ldr-rgb-diffuse.png,52.8124,0.1929,0.0478,87.6699 +Khronos,4x4,ldr-rgb-emissive.png,58.0052,0.0377,0.0066,157.9191 +Khronos,4x4,ldr-rgb-metalrough.png,43.9215,0.0693,0.0296,35.4310 +Khronos,4x4,ldr-rgb-metalrough2.png,42.7188,0.3281,0.1766,23.7569 +Khronos,4x4,ldr-rgba-base.png,42.9028,0.0800,0.0358,29.2873 +Khronos,4x4,ldr-rgba-diffuse.png,43.3583,0.0685,0.0253,41.4242 +Khronos,4x4,ldr-rgba-specgloss.png,41.4613,0.1020,0.0565,18.5559 +Khronos,4x4,ldr-xy-normal1.png,44.9379,0.1127,0.0427,24.5460 +Khronos,4x4,ldr-xy-normal2.png,48.5682,0.3276,0.0756,55.5044 +Khronos,5x5,ldr-l-occlusion.png,54.2370,0.0351,0.0054,194.1400 +Khronos,5x5,ldr-rgb-diffuse.png,47.2115,0.1817,0.0387,108.4278 +Khronos,5x5,ldr-rgb-emissive.png,52.3776,0.0365,0.0051,207.3083 +Khronos,5x5,ldr-rgb-metalrough.png,39.4514,0.0634,0.0234,44.8606 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4945,0.3247,0.1709,24.5443 +Khronos,5x5,ldr-rgba-base.png,38.3583,0.0705,0.0271,38.7329 +Khronos,5x5,ldr-rgba-diffuse.png,38.5295,0.0676,0.0246,42.6548 +Khronos,5x5,ldr-rgba-specgloss.png,37.9922,0.0812,0.0356,29.4174 +Khronos,5x5,ldr-xy-normal1.png,41.5416,0.1039,0.0346,30.3224 +Khronos,5x5,ldr-xy-normal2.png,46.0597,0.3077,0.0555,75.5078 +Khronos,6x6,ldr-l-occlusion.png,48.3019,0.0345,0.0058,181.4151 +Khronos,6x6,ldr-rgb-diffuse.png,43.2732,0.1865,0.0467,89.8542 +Khronos,6x6,ldr-rgb-emissive.png,49.0049,0.0351,0.0046,228.8861 +Khronos,6x6,ldr-rgb-metalrough.png,36.3724,0.0642,0.0263,39.9350 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1757,0.3066,0.1577,26.5903 +Khronos,6x6,ldr-rgba-base.png,36.0313,0.0713,0.0285,36.7625 +Khronos,6x6,ldr-rgba-diffuse.png,35.9759,0.0702,0.0283,37.0902 +Khronos,6x6,ldr-rgba-specgloss.png,35.9374,0.0804,0.0357,29.3630 +Khronos,6x6,ldr-xy-normal1.png,39.2788,0.0999,0.0319,32.8821 +Khronos,6x6,ldr-xy-normal2.png,43.8791,0.3027,0.0513,81.6964 +Khronos,8x8,ldr-l-occlusion.png,43.5147,0.0339,0.0063,167.1054 +Khronos,8x8,ldr-rgb-diffuse.png,38.3057,0.1849,0.0572,73.3154 +Khronos,8x8,ldr-rgb-emissive.png,44.2711,0.0342,0.0050,208.6756 +Khronos,8x8,ldr-rgb-metalrough.png,32.2747,0.0723,0.0350,29.9807 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1205,0.2932,0.1565,26.8027 +Khronos,8x8,ldr-rgba-base.png,32.3546,0.0758,0.0340,30.8423 +Khronos,8x8,ldr-rgba-diffuse.png,32.0684,0.0826,0.0414,25.3291 +Khronos,8x8,ldr-rgba-specgloss.png,32.8728,0.0848,0.0404,25.9336 +Khronos,8x8,ldr-xy-normal1.png,36.3792,0.0970,0.0295,35.5378 +Khronos,8x8,ldr-xy-normal2.png,40.4205,0.2988,0.0580,72.2694 +Khronos,12x12,ldr-l-occlusion.png,40.2288,0.0348,0.0055,191.3858 +Khronos,12x12,ldr-rgb-diffuse.png,33.3337,0.1780,0.0424,98.9036 +Khronos,12x12,ldr-rgb-emissive.png,39.2838,0.0352,0.0043,245.5089 +Khronos,12x12,ldr-rgb-metalrough.png,28.6096,0.0608,0.0219,47.9874 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1688,0.2240,0.0778,53.9072 +Khronos,12x12,ldr-rgba-base.png,28.9857,0.0708,0.0275,38.0829 +Khronos,12x12,ldr-rgba-diffuse.png,28.5805,0.0739,0.0316,33.2206 +Khronos,12x12,ldr-rgba-specgloss.png,29.7804,0.0684,0.0240,43.6254 +Khronos,12x12,ldr-xy-normal1.png,32.6324,0.0900,0.0203,51.6536 +Khronos,12x12,ldr-xy-normal2.png,36.0402,0.2994,0.0501,83.8022 diff --git a/Test/Images/Khronos/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/Khronos/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..d0658b2c015daea260a4f711980f7c842c31212d --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.6014,0.0426,0.0116,90.2460 +Khronos,4x4,ldr-rgb-diffuse.png,54.3556,0.2948,0.1500,27.9527 +Khronos,4x4,ldr-rgb-emissive.png,59.9751,0.0459,0.0132,79.2455 +Khronos,4x4,ldr-rgb-metalrough.png,44.9501,0.1759,0.1353,7.7497 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8315,1.0883,0.9347,4.4874 +Khronos,4x4,ldr-rgba-base.png,43.8666,0.2176,0.1721,6.0930 +Khronos,4x4,ldr-rgba-diffuse.png,44.2878,0.1570,0.1123,9.3384 +Khronos,4x4,ldr-rgba-specgloss.png,42.3783,0.2906,0.2431,4.3132 +Khronos,4x4,ldr-xy-normal1.png,46.6467,0.2596,0.1905,5.5032 +Khronos,4x4,ldr-xy-normal2.png,50.3582,0.5960,0.3564,11.7691 +Khronos,5x5,ldr-l-occlusion.png,57.1684,0.0450,0.0130,80.6286 +Khronos,5x5,ldr-rgb-diffuse.png,49.1067,0.2887,0.1437,29.1808 +Khronos,5x5,ldr-rgb-emissive.png,55.4603,0.0462,0.0128,81.8820 +Khronos,5x5,ldr-rgb-metalrough.png,40.3454,0.1636,0.1223,8.5765 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1509,1.1077,0.9541,4.3962 +Khronos,5x5,ldr-rgba-base.png,39.4887,0.2081,0.1624,6.4548 +Khronos,5x5,ldr-rgba-diffuse.png,39.6329,0.1697,0.1239,8.4600 +Khronos,5x5,ldr-rgba-specgloss.png,38.8241,0.2646,0.2168,4.8367 +Khronos,5x5,ldr-xy-normal1.png,43.1673,0.2372,0.1669,6.2821 +Khronos,5x5,ldr-xy-normal2.png,47.3690,0.5252,0.2695,15.5654 +Khronos,6x6,ldr-l-occlusion.png,50.8693,0.0487,0.0183,57.3648 +Khronos,6x6,ldr-rgb-diffuse.png,44.9599,0.2934,0.1512,27.7441 +Khronos,6x6,ldr-rgb-emissive.png,51.5481,0.0457,0.0132,79.7340 +Khronos,6x6,ldr-rgb-metalrough.png,36.8921,0.1601,0.1203,8.7190 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5121,1.0340,0.8828,4.7513 +Khronos,6x6,ldr-rgba-base.png,36.7084,0.1868,0.1422,7.3739 +Khronos,6x6,ldr-rgba-diffuse.png,36.5436,0.1725,0.1284,8.1657 +Khronos,6x6,ldr-rgba-specgloss.png,36.5238,0.2503,0.2033,5.1571 +Khronos,6x6,ldr-xy-normal1.png,40.6992,0.2032,0.1331,7.8781 +Khronos,6x6,ldr-xy-normal2.png,45.2966,0.4069,0.1511,27.7673 +Khronos,8x8,ldr-l-occlusion.png,45.4623,0.0545,0.0256,41.0013 +Khronos,8x8,ldr-rgb-diffuse.png,40.2673,0.3645,0.2326,18.0344 +Khronos,8x8,ldr-rgb-emissive.png,46.6668,0.0481,0.0170,61.8337 +Khronos,8x8,ldr-rgb-metalrough.png,32.7061,0.2027,0.1630,6.4313 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2423,1.1312,0.9903,4.2353 +Khronos,8x8,ldr-rgba-base.png,33.0988,0.2081,0.1640,6.3949 +Khronos,8x8,ldr-rgba-diffuse.png,32.5945,0.2177,0.1748,5.9975 +Khronos,8x8,ldr-rgba-specgloss.png,33.4998,0.2762,0.2303,4.5524 +Khronos,8x8,ldr-xy-normal1.png,37.4662,0.2122,0.1413,7.4199 +Khronos,8x8,ldr-xy-normal2.png,42.1537,0.4088,0.1652,25.3874 +Khronos,12x12,ldr-l-occlusion.png,41.6349,0.0471,0.0149,70.4872 +Khronos,12x12,ldr-rgb-diffuse.png,35.7761,0.3772,0.2373,17.6759 +Khronos,12x12,ldr-rgb-emissive.png,41.4092,0.0534,0.0193,54.3694 +Khronos,12x12,ldr-rgb-metalrough.png,29.1224,0.1932,0.1506,6.9619 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1747,0.8359,0.6838,6.1342 +Khronos,12x12,ldr-rgba-base.png,29.6502,0.2001,0.1530,6.8528 +Khronos,12x12,ldr-rgba-diffuse.png,29.0821,0.2477,0.2016,5.2016 +Khronos,12x12,ldr-rgba-specgloss.png,30.4902,0.2293,0.1802,5.8181 +Khronos,12x12,ldr-xy-normal1.png,33.5383,0.1871,0.1123,9.3396 +Khronos,12x12,ldr-xy-normal2.png,37.8558,0.4269,0.1720,24.3835 diff --git a/Test/Images/Khronos/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..2809a911816fb7048e989fa524ced3ec5a432922 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.5078,0.0700,0.0389,26.9267 +Khronos,4x4,ldr-rgb-diffuse.png,55.0173,1.0699,0.9269,4.5251 +Khronos,4x4,ldr-rgb-emissive.png,60.9828,0.0604,0.0292,35.9617 +Khronos,4x4,ldr-rgb-metalrough.png,45.0852,0.3518,0.3102,3.3805 +Khronos,4x4,ldr-rgb-metalrough2.png,44.1151,2.1725,2.0166,2.0798 +Khronos,4x4,ldr-rgba-base.png,44.0576,0.4457,0.4009,2.6155 +Khronos,4x4,ldr-rgba-diffuse.png,44.4803,0.3084,0.2638,3.9749 +Khronos,4x4,ldr-rgba-specgloss.png,42.5365,0.5490,0.5013,2.0918 +Khronos,4x4,ldr-xy-normal1.png,46.8266,0.6649,0.5973,1.7555 +Khronos,4x4,ldr-xy-normal2.png,50.7352,1.4004,1.1721,3.5784 +Khronos,5x5,ldr-l-occlusion.png,58.7745,0.1070,0.0752,13.9359 +Khronos,5x5,ldr-rgb-diffuse.png,49.9407,0.9009,0.7579,5.5340 +Khronos,5x5,ldr-rgb-emissive.png,56.2048,0.0664,0.0329,31.8833 +Khronos,5x5,ldr-rgb-metalrough.png,40.5577,0.3601,0.3185,3.2927 +Khronos,5x5,ldr-rgb-metalrough2.png,39.6175,2.2972,2.1434,1.9569 +Khronos,5x5,ldr-rgba-base.png,39.8200,0.4679,0.4223,2.4828 +Khronos,5x5,ldr-rgba-diffuse.png,39.9566,0.3419,0.2971,3.5290 +Khronos,5x5,ldr-rgba-specgloss.png,39.0743,0.5565,0.5086,2.0617 +Khronos,5x5,ldr-xy-normal1.png,43.5230,0.7853,0.7143,1.4681 +Khronos,5x5,ldr-xy-normal2.png,48.0259,1.8574,1.6153,2.5966 +Khronos,6x6,ldr-l-occlusion.png,52.2896,0.1308,0.1003,10.4583 +Khronos,6x6,ldr-rgb-diffuse.png,45.8228,0.8755,0.7328,5.7240 +Khronos,6x6,ldr-rgb-emissive.png,52.7040,0.0698,0.0373,28.1489 +Khronos,6x6,ldr-rgb-metalrough.png,37.0805,0.3983,0.3573,2.9346 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8317,2.4948,2.3461,1.7878 +Khronos,6x6,ldr-rgba-base.png,36.9234,0.5019,0.4570,2.2945 +Khronos,6x6,ldr-rgba-diffuse.png,36.7153,0.3765,0.3326,3.1527 +Khronos,6x6,ldr-rgba-specgloss.png,36.7092,0.5977,0.5505,1.9047 +Khronos,6x6,ldr-xy-normal1.png,41.1567,0.7009,0.6308,1.6622 +Khronos,6x6,ldr-xy-normal2.png,45.8887,1.7724,1.5210,2.7575 +Khronos,8x8,ldr-l-occlusion.png,46.0437,0.1670,0.1364,7.6856 +Khronos,8x8,ldr-rgb-diffuse.png,40.8943,0.9896,0.8569,4.8949 +Khronos,8x8,ldr-rgb-emissive.png,47.5254,0.0742,0.0419,25.0031 +Khronos,8x8,ldr-rgb-metalrough.png,32.8679,0.5067,0.4652,2.2539 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6388,3.0411,2.9000,1.4463 +Khronos,8x8,ldr-rgba-base.png,33.3019,0.6351,0.5892,1.7796 +Khronos,8x8,ldr-rgba-diffuse.png,32.7485,0.4977,0.4534,2.3129 +Khronos,8x8,ldr-rgba-specgloss.png,33.6585,0.7470,0.6993,1.4994 +Khronos,8x8,ldr-xy-normal1.png,37.7495,0.5018,0.4301,2.4380 +Khronos,8x8,ldr-xy-normal2.png,42.5566,1.0598,0.8158,5.1414 +Khronos,12x12,ldr-l-occlusion.png,42.4497,0.1646,0.1297,8.0822 +Khronos,12x12,ldr-rgb-diffuse.png,36.6128,1.2088,1.0682,3.9267 +Khronos,12x12,ldr-rgb-emissive.png,42.3574,0.1043,0.0676,15.5052 +Khronos,12x12,ldr-rgb-metalrough.png,29.3075,0.6862,0.6394,1.6400 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7751,3.5897,3.4383,1.2199 +Khronos,12x12,ldr-rgba-base.png,29.9281,0.7327,0.6828,1.5358 +Khronos,12x12,ldr-rgba-diffuse.png,29.2672,0.6802,0.6312,1.6613 +Khronos,12x12,ldr-rgba-specgloss.png,30.7132,0.9450,0.8935,1.1736 +Khronos,12x12,ldr-xy-normal1.png,33.9601,0.5052,0.4306,2.4353 +Khronos,12x12,ldr-xy-normal2.png,38.4700,0.8811,0.6217,6.7466 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9c5ae2c93f19d1fea2fb5a091131fc9504e5c845 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0415,0.0097,108.4598 +Khronos,4x4,ldr-rgb-diffuse.png,53.0267,0.2327,0.0799,52.4800 +Khronos,4x4,ldr-rgb-emissive.png,58.6381,0.0416,0.0078,133.6630 +Khronos,4x4,ldr-rgb-metalrough.png,44.3920,0.1031,0.0602,17.4306 +Khronos,4x4,ldr-rgb-metalrough2.png,43.0040,0.5443,0.3786,11.0780 +Khronos,4x4,ldr-rgba-base.png,43.3288,0.1218,0.0755,13.8904 +Khronos,4x4,ldr-rgba-diffuse.png,43.9623,0.0992,0.0535,19.6046 +Khronos,4x4,ldr-rgba-specgloss.png,41.7602,0.1693,0.1202,8.7253 +Khronos,4x4,ldr-xy-normal1.png,45.0735,0.1615,0.0884,11.8680 +Khronos,4x4,ldr-xy-normal2.png,48.7816,0.3903,0.1357,30.9052 +Khronos,5x5,ldr-l-occlusion.png,54.3818,0.0392,0.0071,146.9395 +Khronos,5x5,ldr-rgb-diffuse.png,47.3675,0.2072,0.0575,72.9189 +Khronos,5x5,ldr-rgb-emissive.png,52.6737,0.0407,0.0063,165.6265 +Khronos,5x5,ldr-rgb-metalrough.png,39.9283,0.0892,0.0470,22.3325 +Khronos,5x5,ldr-rgb-metalrough2.png,38.0052,0.5334,0.3726,11.2557 +Khronos,5x5,ldr-rgba-base.png,38.9802,0.1014,0.0554,18.9240 +Khronos,5x5,ldr-rgba-diffuse.png,39.2155,0.0987,0.0532,19.7001 +Khronos,5x5,ldr-rgba-specgloss.png,38.4625,0.1249,0.0762,13.7556 +Khronos,5x5,ldr-xy-normal1.png,41.9841,0.1422,0.0696,15.0614 +Khronos,5x5,ldr-xy-normal2.png,46.4301,0.3470,0.0911,46.0527 +Khronos,6x6,ldr-l-occlusion.png,48.3865,0.0400,0.0088,118.8436 +Khronos,6x6,ldr-rgb-diffuse.png,43.3210,0.2299,0.0825,50.8634 +Khronos,6x6,ldr-rgb-emissive.png,49.1136,0.0401,0.0067,157.5119 +Khronos,6x6,ldr-rgb-metalrough.png,36.5537,0.0986,0.0562,18.6523 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3595,0.5334,0.3742,11.2094 +Khronos,6x6,ldr-rgba-base.png,36.2020,0.1086,0.0633,16.5623 +Khronos,6x6,ldr-rgba-diffuse.png,36.1683,0.1119,0.0668,15.6888 +Khronos,6x6,ldr-rgba-specgloss.png,36.1582,0.1314,0.0830,12.6274 +Khronos,6x6,ldr-xy-normal1.png,39.6982,0.1383,0.0651,16.1086 +Khronos,6x6,ldr-xy-normal2.png,44.2645,0.3460,0.0901,46.5522 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0396,0.0105,100.0830 +Khronos,8x8,ldr-rgb-diffuse.png,38.4394,0.2517,0.1089,38.5099 +Khronos,8x8,ldr-rgb-emissive.png,44.6723,0.0404,0.0089,117.5163 +Khronos,8x8,ldr-rgb-metalrough.png,32.3577,0.1164,0.0739,14.1882 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2246,0.4876,0.3331,12.5923 +Khronos,8x8,ldr-rgba-base.png,32.4790,0.1154,0.0699,15.0065 +Khronos,8x8,ldr-rgba-diffuse.png,32.1796,0.1350,0.0906,11.5716 +Khronos,8x8,ldr-rgba-specgloss.png,32.9682,0.1325,0.0845,12.4078 +Khronos,8x8,ldr-xy-normal1.png,36.5942,0.1312,0.0584,17.9671 +Khronos,8x8,ldr-xy-normal2.png,40.8681,0.3592,0.1040,40.3388 +Khronos,12x12,ldr-l-occlusion.png,40.5805,0.0410,0.0099,106.1330 +Khronos,12x12,ldr-rgb-diffuse.png,33.3842,0.2247,0.0781,53.6740 +Khronos,12x12,ldr-rgb-emissive.png,39.4821,0.0416,0.0080,130.9098 +Khronos,12x12,ldr-rgb-metalrough.png,28.6554,0.0862,0.0432,24.2704 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2607,0.3124,0.1553,27.0017 +Khronos,12x12,ldr-rgba-base.png,29.0476,0.1034,0.0567,18.4931 +Khronos,12x12,ldr-rgba-diffuse.png,28.6320,0.1125,0.0665,15.7624 +Khronos,12x12,ldr-rgba-specgloss.png,29.8260,0.0968,0.0478,21.9184 +Khronos,12x12,ldr-xy-normal1.png,32.7642,0.1140,0.0395,26.5637 +Khronos,12x12,ldr-xy-normal2.png,36.2644,0.3529,0.0919,45.6588 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..854cacf1691264904fde48ff1affb8f76502e42e --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0401,0.0088,118.8983 +Khronos,4x4,ldr-rgb-diffuse.png,52.8124,0.2203,0.0689,60.8530 +Khronos,4x4,ldr-rgb-emissive.png,58.0052,0.0408,0.0073,143.9198 +Khronos,4x4,ldr-rgb-metalrough.png,43.9215,0.0819,0.0399,26.2656 +Khronos,4x4,ldr-rgb-metalrough2.png,42.7188,0.3995,0.2380,17.6262 +Khronos,4x4,ldr-rgba-base.png,42.9028,0.0936,0.0479,21.8955 +Khronos,4x4,ldr-rgba-diffuse.png,43.3583,0.0790,0.0340,30.8641 +Khronos,4x4,ldr-rgba-specgloss.png,41.4613,0.1236,0.0752,13.9373 +Khronos,4x4,ldr-xy-normal1.png,44.9379,0.1293,0.0571,18.3770 +Khronos,4x4,ldr-xy-normal2.png,48.5682,0.3584,0.1046,40.0840 +Khronos,5x5,ldr-l-occlusion.png,54.2370,0.0381,0.0070,150.2886 +Khronos,5x5,ldr-rgb-diffuse.png,47.2115,0.2035,0.0540,77.6694 +Khronos,5x5,ldr-rgb-emissive.png,52.3776,0.0392,0.0058,179.8571 +Khronos,5x5,ldr-rgb-metalrough.png,39.4514,0.0752,0.0335,31.2897 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4945,0.4024,0.2428,17.2757 +Khronos,5x5,ldr-rgba-base.png,38.3583,0.0835,0.0385,27.2224 +Khronos,5x5,ldr-rgba-diffuse.png,38.5295,0.0794,0.0351,29.9055 +Khronos,5x5,ldr-rgba-specgloss.png,37.9922,0.0995,0.0517,20.3012 +Khronos,5x5,ldr-xy-normal1.png,41.5416,0.1199,0.0480,21.8658 +Khronos,5x5,ldr-xy-normal2.png,46.0597,0.3308,0.0772,54.3388 +Khronos,6x6,ldr-l-occlusion.png,48.3019,0.0383,0.0080,130.5639 +Khronos,6x6,ldr-rgb-diffuse.png,43.2732,0.2179,0.0710,59.0582 +Khronos,6x6,ldr-rgb-emissive.png,49.0049,0.0381,0.0055,188.9682 +Khronos,6x6,ldr-rgb-metalrough.png,36.3724,0.0817,0.0402,26.0905 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1757,0.3948,0.2392,17.5349 +Khronos,6x6,ldr-rgba-base.png,36.0313,0.0879,0.0432,24.2962 +Khronos,6x6,ldr-rgba-diffuse.png,35.9759,0.0866,0.0432,24.2782 +Khronos,6x6,ldr-rgba-specgloss.png,35.9374,0.1025,0.0550,19.0806 +Khronos,6x6,ldr-xy-normal1.png,39.2788,0.1181,0.0467,22.4578 +Khronos,6x6,ldr-xy-normal2.png,43.8791,0.3302,0.0744,56.3440 +Khronos,8x8,ldr-l-occlusion.png,43.5147,0.0378,0.0090,116.3135 +Khronos,8x8,ldr-rgb-diffuse.png,38.3057,0.2302,0.0876,47.9065 +Khronos,8x8,ldr-rgb-emissive.png,44.2711,0.0383,0.0068,155.0683 +Khronos,8x8,ldr-rgb-metalrough.png,32.2747,0.0962,0.0538,19.4989 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1205,0.3931,0.2401,17.4680 +Khronos,8x8,ldr-rgba-base.png,32.3546,0.0968,0.0511,20.5184 +Khronos,8x8,ldr-rgba-diffuse.png,32.0684,0.1078,0.0635,16.5109 +Khronos,8x8,ldr-rgba-specgloss.png,32.8728,0.1094,0.0617,17.0014 +Khronos,8x8,ldr-xy-normal1.png,36.3792,0.1170,0.0444,23.6181 +Khronos,8x8,ldr-xy-normal2.png,40.4205,0.3417,0.0861,48.7320 +Khronos,12x12,ldr-l-occlusion.png,40.2288,0.0386,0.0081,128.7221 +Khronos,12x12,ldr-rgb-diffuse.png,33.3337,0.2078,0.0640,65.5185 +Khronos,12x12,ldr-rgb-emissive.png,39.2838,0.0389,0.0060,175.2280 +Khronos,12x12,ldr-rgb-metalrough.png,28.6096,0.0752,0.0323,32.4939 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1688,0.2710,0.1171,35.8053 +Khronos,12x12,ldr-rgba-base.png,28.9857,0.0875,0.0415,25.2882 +Khronos,12x12,ldr-rgba-diffuse.png,28.5805,0.0932,0.0476,22.0183 +Khronos,12x12,ldr-rgba-specgloss.png,29.7804,0.0849,0.0358,29.2873 +Khronos,12x12,ldr-xy-normal1.png,32.6324,0.1025,0.0298,35.1647 +Khronos,12x12,ldr-xy-normal2.png,36.0402,0.3308,0.0734,57.1221 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..183eea4db13fd35029ecca24f6c346462c097c73 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.6014,0.0497,0.0171,61.4896 +Khronos,4x4,ldr-rgb-diffuse.png,54.3556,0.3668,0.2139,19.6089 +Khronos,4x4,ldr-rgb-emissive.png,59.9751,0.0510,0.0162,64.6429 +Khronos,4x4,ldr-rgb-metalrough.png,44.9501,0.2266,0.1827,5.7379 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8315,1.4256,1.2622,3.3229 +Khronos,4x4,ldr-rgba-base.png,43.8666,0.2809,0.2335,4.4907 +Khronos,4x4,ldr-rgba-diffuse.png,44.2878,0.1969,0.1500,6.9903 +Khronos,4x4,ldr-rgba-specgloss.png,42.3783,0.3814,0.3318,3.1604 +Khronos,4x4,ldr-xy-normal1.png,46.6467,0.3285,0.2563,4.0908 +Khronos,4x4,ldr-xy-normal2.png,50.3582,0.7381,0.4919,8.5262 +Khronos,5x5,ldr-l-occlusion.png,57.1684,0.0519,0.0186,56.2964 +Khronos,5x5,ldr-rgb-diffuse.png,49.1067,0.3745,0.2187,19.1796 +Khronos,5x5,ldr-rgb-emissive.png,55.4603,0.0534,0.0174,60.1007 +Khronos,5x5,ldr-rgb-metalrough.png,40.3454,0.2273,0.1831,5.7270 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1509,1.5583,1.3945,3.0078 +Khronos,5x5,ldr-rgba-base.png,39.4887,0.2827,0.2353,4.4557 +Khronos,5x5,ldr-rgba-diffuse.png,39.6329,0.2258,0.1790,5.8569 +Khronos,5x5,ldr-rgba-specgloss.png,38.8241,0.3626,0.3130,3.3499 +Khronos,5x5,ldr-xy-normal1.png,43.1673,0.3168,0.2436,4.3052 +Khronos,5x5,ldr-xy-normal2.png,47.3690,0.6574,0.4005,10.4725 +Khronos,6x6,ldr-l-occlusion.png,50.8693,0.0601,0.0281,37.3742 +Khronos,6x6,ldr-rgb-diffuse.png,44.9599,0.3828,0.2359,17.7803 +Khronos,6x6,ldr-rgb-emissive.png,51.5481,0.0538,0.0189,55.5064 +Khronos,6x6,ldr-rgb-metalrough.png,36.8921,0.2253,0.1817,5.7702 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5121,1.4769,1.3170,3.1848 +Khronos,6x6,ldr-rgba-base.png,36.7084,0.2624,0.2143,4.8940 +Khronos,6x6,ldr-rgba-diffuse.png,36.5436,0.2399,0.1937,5.4146 +Khronos,6x6,ldr-rgba-specgloss.png,36.5238,0.3526,0.3029,3.4614 +Khronos,6x6,ldr-xy-normal1.png,40.6992,0.2719,0.1986,5.2788 +Khronos,6x6,ldr-xy-normal2.png,45.2966,0.4864,0.2273,18.4561 +Khronos,8x8,ldr-l-occlusion.png,45.4623,0.0708,0.0402,26.1133 +Khronos,8x8,ldr-rgb-diffuse.png,40.2673,0.5195,0.3737,11.2228 +Khronos,8x8,ldr-rgb-emissive.png,46.6668,0.0587,0.0257,40.8054 +Khronos,8x8,ldr-rgb-metalrough.png,32.7061,0.2955,0.2515,4.1700 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2423,1.6798,1.5214,2.7568 +Khronos,8x8,ldr-rgba-base.png,33.0988,0.3034,0.2568,4.0827 +Khronos,8x8,ldr-rgba-diffuse.png,32.5945,0.3161,0.2701,3.8816 +Khronos,8x8,ldr-rgba-specgloss.png,33.4998,0.4062,0.3566,2.9406 +Khronos,8x8,ldr-xy-normal1.png,37.4662,0.2941,0.2194,4.7788 +Khronos,8x8,ldr-xy-normal2.png,42.1537,0.5168,0.2588,16.2091 +Khronos,12x12,ldr-l-occlusion.png,41.6349,0.0564,0.0227,46.1766 +Khronos,12x12,ldr-rgb-diffuse.png,35.7761,0.5224,0.3726,11.2569 +Khronos,12x12,ldr-rgb-emissive.png,41.4092,0.0657,0.0288,36.4215 +Khronos,12x12,ldr-rgb-metalrough.png,29.1224,0.2734,0.2273,4.6127 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1747,1.1973,1.0363,4.0476 +Khronos,12x12,ldr-rgba-base.png,29.6502,0.2804,0.2313,4.5335 +Khronos,12x12,ldr-rgba-diffuse.png,29.0821,0.3486,0.3007,3.4875 +Khronos,12x12,ldr-rgba-specgloss.png,30.4902,0.3237,0.2725,3.8479 +Khronos,12x12,ldr-xy-normal1.png,33.5383,0.2436,0.1664,6.3032 +Khronos,12x12,ldr-xy-normal2.png,37.8558,0.5222,0.2613,16.0508 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e277d8126c5becb0aa4062c6d58ebd3568e0d64a --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.5078,0.0868,0.0547,19.1843 +Khronos,4x4,ldr-rgb-diffuse.png,55.0173,1.4068,1.2562,3.3390 +Khronos,4x4,ldr-rgb-emissive.png,60.9828,0.0722,0.0374,28.0195 +Khronos,4x4,ldr-rgb-metalrough.png,45.0852,0.4640,0.4200,2.4969 +Khronos,4x4,ldr-rgb-metalrough2.png,44.1151,2.8936,2.7291,1.5369 +Khronos,4x4,ldr-rgba-base.png,44.0576,0.5928,0.5436,1.9289 +Khronos,4x4,ldr-rgba-diffuse.png,44.4803,0.3987,0.3520,2.9790 +Khronos,4x4,ldr-rgba-specgloss.png,42.5365,0.7291,0.6792,1.5437 +Khronos,4x4,ldr-xy-normal1.png,46.8266,0.8588,0.7873,1.3318 +Khronos,4x4,ldr-xy-normal2.png,50.7352,1.8054,1.5688,2.6736 +Khronos,5x5,ldr-l-occlusion.png,58.7745,0.1433,0.1104,9.5022 +Khronos,5x5,ldr-rgb-diffuse.png,49.9407,1.2539,1.1036,3.8005 +Khronos,5x5,ldr-rgb-emissive.png,56.2048,0.0813,0.0458,22.8706 +Khronos,5x5,ldr-rgb-metalrough.png,40.5577,0.5022,0.4583,2.2879 +Khronos,5x5,ldr-rgb-metalrough2.png,39.6175,3.2451,3.0827,1.3606 +Khronos,5x5,ldr-rgba-base.png,39.8200,0.6515,0.6034,1.7377 +Khronos,5x5,ldr-rgba-diffuse.png,39.9566,0.4713,0.4242,2.4718 +Khronos,5x5,ldr-rgba-specgloss.png,39.0743,0.7746,0.7242,1.4480 +Khronos,5x5,ldr-xy-normal1.png,43.5230,1.0744,1.0011,1.0474 +Khronos,5x5,ldr-xy-normal2.png,48.0259,2.5504,2.2992,1.8242 +Khronos,6x6,ldr-l-occlusion.png,52.2896,0.1872,0.1555,6.7441 +Khronos,6x6,ldr-rgb-diffuse.png,45.8228,1.2676,1.1158,3.7590 +Khronos,6x6,ldr-rgb-emissive.png,52.7040,0.0898,0.0551,19.0229 +Khronos,6x6,ldr-rgb-metalrough.png,37.0805,0.5798,0.5348,1.9606 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8317,3.6072,3.4477,1.2165 +Khronos,6x6,ldr-rgba-base.png,36.9234,0.7211,0.6732,1.5577 +Khronos,6x6,ldr-rgba-diffuse.png,36.7153,0.5393,0.4923,2.1300 +Khronos,6x6,ldr-rgba-specgloss.png,36.7092,0.8503,0.7999,1.3108 +Khronos,6x6,ldr-xy-normal1.png,41.1567,0.9988,0.9239,1.1349 +Khronos,6x6,ldr-xy-normal2.png,45.8887,2.5015,2.2450,1.8683 +Khronos,8x8,ldr-l-occlusion.png,46.0437,0.2464,0.2133,4.9161 +Khronos,8x8,ldr-rgb-diffuse.png,40.8943,1.4851,1.3397,3.1308 +Khronos,8x8,ldr-rgb-emissive.png,47.5254,0.0979,0.0638,16.4364 +Khronos,8x8,ldr-rgb-metalrough.png,32.8679,0.7558,0.7099,1.4770 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6388,4.5333,4.3750,0.9587 +Khronos,8x8,ldr-rgba-base.png,33.3019,0.9336,0.8843,1.1857 +Khronos,8x8,ldr-rgba-diffuse.png,32.7485,0.7338,0.6868,1.5268 +Khronos,8x8,ldr-rgba-specgloss.png,33.6585,1.0974,1.0467,1.0017 +Khronos,8x8,ldr-xy-normal1.png,37.7495,0.7397,0.6655,1.5756 +Khronos,8x8,ldr-xy-normal2.png,42.5566,1.5603,1.3049,3.2143 +Khronos,12x12,ldr-l-occlusion.png,42.4497,0.2340,0.1979,5.2984 +Khronos,12x12,ldr-rgb-diffuse.png,36.6128,1.7633,1.6134,2.5996 +Khronos,12x12,ldr-rgb-emissive.png,42.3574,0.1399,0.1009,10.3971 +Khronos,12x12,ldr-rgb-metalrough.png,29.3075,0.9951,0.9457,1.1088 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7751,5.1869,5.0267,0.8344 +Khronos,12x12,ldr-rgba-base.png,29.9281,1.0570,1.0050,1.0433 +Khronos,12x12,ldr-rgba-diffuse.png,29.2672,0.9802,0.9295,1.1281 +Khronos,12x12,ldr-rgba-specgloss.png,30.7132,1.3570,1.3020,0.8054 +Khronos,12x12,ldr-xy-normal1.png,33.9601,0.7186,0.6387,1.6417 +Khronos,12x12,ldr-xy-normal2.png,38.4700,1.2113,0.9493,4.4184 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..5fe22862f2a42f0706a4a5b7d01dd0471e2df9ae --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0381,0.0081,129.7589 +Khronos,4x4,ldr-rgb-diffuse.png,53.0267,0.2125,0.0643,65.2384 +Khronos,4x4,ldr-rgb-emissive.png,58.6381,0.0398,0.0074,141.4891 +Khronos,4x4,ldr-rgb-metalrough.png,44.3920,0.0912,0.0504,20.8092 +Khronos,4x4,ldr-rgb-metalrough2.png,43.0040,0.4752,0.3186,13.1646 +Khronos,4x4,ldr-rgba-base.png,43.3288,0.1082,0.0635,16.5195 +Khronos,4x4,ldr-rgba-diffuse.png,43.9623,0.0884,0.0450,23.3276 +Khronos,4x4,ldr-rgba-specgloss.png,41.7602,0.1488,0.1023,10.2541 +Khronos,4x4,ldr-xy-normal1.png,45.0735,0.1451,0.0746,14.0588 +Khronos,4x4,ldr-xy-normal2.png,48.7816,0.3630,0.1126,37.2413 +Khronos,5x5,ldr-l-occlusion.png,54.3818,0.0367,0.0062,168.9866 +Khronos,5x5,ldr-rgb-diffuse.png,47.3675,0.1942,0.0493,85.0410 +Khronos,5x5,ldr-rgb-emissive.png,52.6737,0.0388,0.0059,177.3620 +Khronos,5x5,ldr-rgb-metalrough.png,39.9283,0.0789,0.0386,27.1617 +Khronos,5x5,ldr-rgb-metalrough2.png,38.0052,0.4631,0.3086,13.5928 +Khronos,5x5,ldr-rgba-base.png,38.9802,0.0903,0.0458,22.8747 +Khronos,5x5,ldr-rgba-diffuse.png,39.2155,0.0875,0.0441,23.7890 +Khronos,5x5,ldr-rgba-specgloss.png,38.4625,0.1095,0.0632,16.5823 +Khronos,5x5,ldr-xy-normal1.png,41.9841,0.1289,0.0582,18.0029 +Khronos,5x5,ldr-xy-normal2.png,46.4301,0.3251,0.0778,53.9148 +Khronos,6x6,ldr-l-occlusion.png,48.3865,0.0372,0.0076,137.5335 +Khronos,6x6,ldr-rgb-diffuse.png,43.3210,0.2076,0.0688,60.9435 +Khronos,6x6,ldr-rgb-emissive.png,49.1136,0.0381,0.0060,175.8796 +Khronos,6x6,ldr-rgb-metalrough.png,36.5537,0.0862,0.0466,22.5146 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3595,0.4609,0.3105,13.5084 +Khronos,6x6,ldr-rgba-base.png,36.2020,0.0964,0.0528,19.8624 +Khronos,6x6,ldr-rgba-diffuse.png,36.1683,0.0981,0.0554,18.9229 +Khronos,6x6,ldr-rgba-specgloss.png,36.1582,0.1145,0.0687,15.2644 +Khronos,6x6,ldr-xy-normal1.png,39.6982,0.1249,0.0548,19.1433 +Khronos,6x6,ldr-xy-normal2.png,44.2645,0.3251,0.0767,54.6711 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0359,0.0090,116.4706 +Khronos,8x8,ldr-rgb-diffuse.png,38.4394,0.2237,0.0910,46.1020 +Khronos,8x8,ldr-rgb-emissive.png,44.6723,0.0376,0.0076,137.7532 +Khronos,8x8,ldr-rgb-metalrough.png,32.3577,0.1017,0.0619,16.9376 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2246,0.4242,0.2803,14.9617 +Khronos,8x8,ldr-rgba-base.png,32.4790,0.1019,0.0593,17.6733 +Khronos,8x8,ldr-rgba-diffuse.png,32.1796,0.1174,0.0755,13.8925 +Khronos,8x8,ldr-rgba-specgloss.png,32.9682,0.1163,0.0710,14.7747 +Khronos,8x8,ldr-xy-normal1.png,36.5942,0.1193,0.0490,21.4153 +Khronos,8x8,ldr-xy-normal2.png,40.8681,0.3335,0.0882,47.5432 +Khronos,12x12,ldr-l-occlusion.png,40.5805,0.0383,0.0087,120.4581 +Khronos,12x12,ldr-rgb-diffuse.png,33.3842,0.2069,0.0688,61.0045 +Khronos,12x12,ldr-rgb-emissive.png,39.4821,0.0392,0.0071,148.5475 +Khronos,12x12,ldr-rgb-metalrough.png,28.6554,0.0786,0.0383,27.3994 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2607,0.2859,0.1371,30.5888 +Khronos,12x12,ldr-rgba-base.png,29.0476,0.0943,0.0502,20.8730 +Khronos,12x12,ldr-rgba-diffuse.png,28.6320,0.1019,0.0588,17.8190 +Khronos,12x12,ldr-rgba-specgloss.png,29.8260,0.0888,0.0422,24.8190 +Khronos,12x12,ldr-xy-normal1.png,32.7642,0.1064,0.0351,29.8977 +Khronos,12x12,ldr-xy-normal2.png,36.2644,0.3310,0.0809,51.8436 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..1fb33464e3c986c943d5f8decc12809be0cbaf95 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0366,0.0074,141.4709 +Khronos,4x4,ldr-rgb-diffuse.png,52.8124,0.1993,0.0561,74.7821 +Khronos,4x4,ldr-rgb-emissive.png,58.0052,0.0384,0.0067,155.6720 +Khronos,4x4,ldr-rgb-metalrough.png,43.9215,0.0733,0.0333,31.4830 +Khronos,4x4,ldr-rgb-metalrough2.png,42.7188,0.3526,0.2003,20.9386 +Khronos,4x4,ldr-rgba-base.png,42.9028,0.0843,0.0403,25.9979 +Khronos,4x4,ldr-rgba-diffuse.png,43.3583,0.0716,0.0287,36.5180 +Khronos,4x4,ldr-rgba-specgloss.png,41.4613,0.1100,0.0639,16.4117 +Khronos,4x4,ldr-xy-normal1.png,44.9379,0.1185,0.0487,21.5309 +Khronos,4x4,ldr-xy-normal2.png,48.5682,0.3340,0.0882,47.5416 +Khronos,5x5,ldr-l-occlusion.png,54.2370,0.0356,0.0062,168.6044 +Khronos,5x5,ldr-rgb-diffuse.png,47.2115,0.1897,0.0465,90.2793 +Khronos,5x5,ldr-rgb-emissive.png,52.3776,0.0373,0.0054,195.0872 +Khronos,5x5,ldr-rgb-metalrough.png,39.4514,0.0673,0.0279,37.5898 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4945,0.3512,0.2018,20.7842 +Khronos,5x5,ldr-rgba-base.png,38.3583,0.0753,0.0322,32.5815 +Khronos,5x5,ldr-rgba-diffuse.png,38.5295,0.0718,0.0291,36.0274 +Khronos,5x5,ldr-rgba-specgloss.png,37.9922,0.0882,0.0427,24.5649 +Khronos,5x5,ldr-xy-normal1.png,41.5416,0.1096,0.0405,25.9132 +Khronos,5x5,ldr-xy-normal2.png,46.0597,0.3155,0.0663,63.2797 +Khronos,6x6,ldr-l-occlusion.png,48.3019,0.0358,0.0070,149.9044 +Khronos,6x6,ldr-rgb-diffuse.png,43.2732,0.1970,0.0594,70.6397 +Khronos,6x6,ldr-rgb-emissive.png,49.0049,0.0360,0.0050,208.2211 +Khronos,6x6,ldr-rgb-metalrough.png,36.3724,0.0719,0.0330,31.7347 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1757,0.3448,0.1964,21.3586 +Khronos,6x6,ldr-rgba-base.png,36.0313,0.0781,0.0356,29.4495 +Khronos,6x6,ldr-rgba-diffuse.png,35.9759,0.0770,0.0354,29.6476 +Khronos,6x6,ldr-rgba-specgloss.png,35.9374,0.0899,0.0450,23.3156 +Khronos,6x6,ldr-xy-normal1.png,39.2788,0.1077,0.0391,26.8439 +Khronos,6x6,ldr-xy-normal2.png,43.8791,0.3121,0.0632,66.3403 +Khronos,8x8,ldr-l-occlusion.png,43.5147,0.0348,0.0078,134.5544 +Khronos,8x8,ldr-rgb-diffuse.png,38.3057,0.2049,0.0736,57.0157 +Khronos,8x8,ldr-rgb-emissive.png,44.2711,0.0357,0.0059,176.5929 +Khronos,8x8,ldr-rgb-metalrough.png,32.2747,0.0839,0.0450,23.2955 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1205,0.3443,0.2009,20.8760 +Khronos,8x8,ldr-rgba-base.png,32.3546,0.0853,0.0429,24.4698 +Khronos,8x8,ldr-rgba-diffuse.png,32.0684,0.0945,0.0529,19.8368 +Khronos,8x8,ldr-rgba-specgloss.png,32.8728,0.0965,0.0515,20.3757 +Khronos,8x8,ldr-xy-normal1.png,36.3792,0.1067,0.0371,28.2718 +Khronos,8x8,ldr-xy-normal2.png,40.4205,0.3170,0.0729,57.5634 +Khronos,12x12,ldr-l-occlusion.png,40.2288,0.0364,0.0072,146.0223 +Khronos,12x12,ldr-rgb-diffuse.png,33.3337,0.1942,0.0564,74.4173 +Khronos,12x12,ldr-rgb-emissive.png,39.2838,0.0368,0.0054,195.5209 +Khronos,12x12,ldr-rgb-metalrough.png,28.6096,0.0688,0.0286,36.6531 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1688,0.2497,0.1035,40.5435 +Khronos,12x12,ldr-rgba-base.png,28.9857,0.0798,0.0365,28.7259 +Khronos,12x12,ldr-rgba-diffuse.png,28.5805,0.0849,0.0418,25.0634 +Khronos,12x12,ldr-rgba-specgloss.png,29.7804,0.0771,0.0316,33.2141 +Khronos,12x12,ldr-xy-normal1.png,32.6324,0.0970,0.0264,39.7941 +Khronos,12x12,ldr-xy-normal2.png,36.0402,0.3135,0.0648,64.6950 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ff350f5facc93563cf4b6daf4acde20195a671a3 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.6014,0.0447,0.0139,75.1777 +Khronos,4x4,ldr-rgb-diffuse.png,54.3556,0.3216,0.1763,23.7883 +Khronos,4x4,ldr-rgb-emissive.png,59.9751,0.0469,0.0145,72.2911 +Khronos,4x4,ldr-rgb-metalrough.png,44.9501,0.1947,0.1533,6.8419 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8315,1.2104,1.0572,3.9675 +Khronos,4x4,ldr-rgba-base.png,43.8666,0.2414,0.1957,5.3569 +Khronos,4x4,ldr-rgba-diffuse.png,44.2878,0.1716,0.1270,8.2571 +Khronos,4x4,ldr-rgba-specgloss.png,42.3783,0.3266,0.2792,3.7559 +Khronos,4x4,ldr-xy-normal1.png,46.6467,0.2878,0.2181,4.8068 +Khronos,4x4,ldr-xy-normal2.png,50.3582,0.6507,0.4143,10.1247 +Khronos,5x5,ldr-l-occlusion.png,57.1684,0.0469,0.0154,68.0054 +Khronos,5x5,ldr-rgb-diffuse.png,49.1067,0.3166,0.1733,24.2068 +Khronos,5x5,ldr-rgb-emissive.png,55.4603,0.0489,0.0148,70.7969 +Khronos,5x5,ldr-rgb-metalrough.png,40.3454,0.1871,0.1453,7.2174 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1509,1.2914,1.1383,3.6846 +Khronos,5x5,ldr-rgba-base.png,39.4887,0.2387,0.1941,5.4015 +Khronos,5x5,ldr-rgba-diffuse.png,39.6329,0.1924,0.1466,7.1537 +Khronos,5x5,ldr-rgba-specgloss.png,38.8241,0.3073,0.2600,4.0336 +Khronos,5x5,ldr-xy-normal1.png,43.1673,0.2708,0.2002,5.2386 +Khronos,5x5,ldr-xy-normal2.png,47.3690,0.5786,0.3273,12.8164 +Khronos,6x6,ldr-l-occlusion.png,50.8693,0.0534,0.0229,45.7672 +Khronos,6x6,ldr-rgb-diffuse.png,44.9599,0.3300,0.1914,21.9152 +Khronos,6x6,ldr-rgb-emissive.png,51.5481,0.0489,0.0159,66.1400 +Khronos,6x6,ldr-rgb-metalrough.png,36.8921,0.1896,0.1485,7.0609 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5121,1.2324,1.0788,3.8880 +Khronos,6x6,ldr-rgba-base.png,36.7084,0.2215,0.1765,5.9415 +Khronos,6x6,ldr-rgba-diffuse.png,36.5436,0.2031,0.1588,6.6043 +Khronos,6x6,ldr-rgba-specgloss.png,36.5238,0.2964,0.2498,4.1983 +Khronos,6x6,ldr-xy-normal1.png,40.6992,0.2347,0.1640,6.3947 +Khronos,6x6,ldr-xy-normal2.png,45.2966,0.4383,0.1882,22.2878 +Khronos,8x8,ldr-l-occlusion.png,45.4623,0.0621,0.0336,31.2372 +Khronos,8x8,ldr-rgb-diffuse.png,40.2673,0.4435,0.3089,13.5785 +Khronos,8x8,ldr-rgb-emissive.png,46.6668,0.0532,0.0218,48.1350 +Khronos,8x8,ldr-rgb-metalrough.png,32.7061,0.2509,0.2097,4.9997 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2423,1.4203,1.2761,3.2867 +Khronos,8x8,ldr-rgba-base.png,33.0988,0.2602,0.2151,4.8750 +Khronos,8x8,ldr-rgba-diffuse.png,32.5945,0.2699,0.2261,4.6372 +Khronos,8x8,ldr-rgba-specgloss.png,33.4998,0.3439,0.2971,3.5291 +Khronos,8x8,ldr-xy-normal1.png,37.4662,0.2544,0.1823,5.7508 +Khronos,8x8,ldr-xy-normal2.png,42.1537,0.4618,0.2153,19.4817 +Khronos,12x12,ldr-l-occlusion.png,41.6349,0.0516,0.0201,52.2433 +Khronos,12x12,ldr-rgb-diffuse.png,35.7761,0.4705,0.3290,12.7499 +Khronos,12x12,ldr-rgb-emissive.png,41.4092,0.0611,0.0256,41.0002 +Khronos,12x12,ldr-rgb-metalrough.png,29.1224,0.2439,0.2007,5.2254 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1747,1.0665,0.9167,4.5754 +Khronos,12x12,ldr-rgba-base.png,29.6502,0.2538,0.2060,5.0913 +Khronos,12x12,ldr-rgba-diffuse.png,29.0821,0.3112,0.2652,3.9541 +Khronos,12x12,ldr-rgba-specgloss.png,30.4902,0.2910,0.2418,4.3367 +Khronos,12x12,ldr-xy-normal1.png,33.5383,0.2233,0.1474,7.1135 +Khronos,12x12,ldr-xy-normal2.png,37.8558,0.4840,0.2298,18.2509 diff --git a/Test/Images/Khronos/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c1e36f5a20d39f97cbb812163bcd1402a7c30576 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.5078,0.0761,0.0451,23.2491 +Khronos,4x4,ldr-rgb-diffuse.png,55.0173,1.2039,1.0598,3.9578 +Khronos,4x4,ldr-rgb-emissive.png,60.9828,0.0658,0.0325,32.2676 +Khronos,4x4,ldr-rgb-metalrough.png,45.0852,0.3962,0.3543,2.9594 +Khronos,4x4,ldr-rgb-metalrough2.png,44.1151,2.4540,2.2991,1.8243 +Khronos,4x4,ldr-rgba-base.png,44.0576,0.5032,0.4574,2.2926 +Khronos,4x4,ldr-rgba-diffuse.png,44.4803,0.3452,0.3005,3.4897 +Khronos,4x4,ldr-rgba-specgloss.png,42.5365,0.6260,0.5788,1.8117 +Khronos,4x4,ldr-xy-normal1.png,46.8266,0.7533,0.6836,1.5338 +Khronos,4x4,ldr-xy-normal2.png,50.7352,1.5754,1.3439,3.1209 +Khronos,5x5,ldr-l-occlusion.png,58.7745,0.1208,0.0894,11.7245 +Khronos,5x5,ldr-rgb-diffuse.png,49.9407,1.0464,0.9039,4.6400 +Khronos,5x5,ldr-rgb-emissive.png,56.2048,0.0717,0.0381,27.5124 +Khronos,5x5,ldr-rgb-metalrough.png,40.5577,0.4186,0.3769,2.7822 +Khronos,5x5,ldr-rgb-metalrough2.png,39.6175,2.7013,2.5471,1.6467 +Khronos,5x5,ldr-rgba-base.png,39.8200,0.5469,0.4995,2.0994 +Khronos,5x5,ldr-rgba-diffuse.png,39.9566,0.3955,0.3511,2.9864 +Khronos,5x5,ldr-rgba-specgloss.png,39.0743,0.6522,0.6047,1.7340 +Khronos,5x5,ldr-xy-normal1.png,43.5230,0.9153,0.8425,1.2447 +Khronos,5x5,ldr-xy-normal2.png,48.0259,2.1604,1.9181,2.1867 +Khronos,6x6,ldr-l-occlusion.png,52.2896,0.1559,0.1258,8.3366 +Khronos,6x6,ldr-rgb-diffuse.png,45.8228,1.0543,0.9144,4.5868 +Khronos,6x6,ldr-rgb-emissive.png,52.7040,0.0792,0.0458,22.9168 +Khronos,6x6,ldr-rgb-metalrough.png,37.0805,0.4840,0.4412,2.3767 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8317,3.0200,2.8701,1.4614 +Khronos,6x6,ldr-rgba-base.png,36.9234,0.6087,0.5632,1.8618 +Khronos,6x6,ldr-rgba-diffuse.png,36.7153,0.4531,0.4090,2.5640 +Khronos,6x6,ldr-rgba-specgloss.png,36.7092,0.7170,0.6697,1.5658 +Khronos,6x6,ldr-xy-normal1.png,41.1567,0.8440,0.7727,1.3570 +Khronos,6x6,ldr-xy-normal2.png,45.8887,2.1253,1.8790,2.2322 +Khronos,8x8,ldr-l-occlusion.png,46.0437,0.2095,0.1795,5.8409 +Khronos,8x8,ldr-rgb-diffuse.png,40.8943,1.2651,1.1278,3.7190 +Khronos,8x8,ldr-rgb-emissive.png,47.5254,0.0866,0.0542,19.3386 +Khronos,8x8,ldr-rgb-metalrough.png,32.8679,0.6436,0.6010,1.7447 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6388,3.8676,3.7198,1.1276 +Khronos,8x8,ldr-rgba-base.png,33.3019,0.7957,0.7503,1.3975 +Khronos,8x8,ldr-rgba-diffuse.png,32.7485,0.6298,0.5850,1.7925 +Khronos,8x8,ldr-rgba-specgloss.png,33.6585,0.9435,0.8948,1.1719 +Khronos,8x8,ldr-xy-normal1.png,37.7495,0.6373,0.5648,1.8565 +Khronos,8x8,ldr-xy-normal2.png,42.5566,1.3422,1.0941,3.8334 +Khronos,12x12,ldr-l-occlusion.png,42.4497,0.2097,0.1749,5.9953 +Khronos,12x12,ldr-rgb-diffuse.png,36.6128,1.5722,1.4272,2.9388 +Khronos,12x12,ldr-rgb-emissive.png,42.3574,0.1270,0.0892,11.7531 +Khronos,12x12,ldr-rgb-metalrough.png,29.3075,0.8875,0.8418,1.2457 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7751,4.6276,4.4710,0.9381 +Khronos,12x12,ldr-rgba-base.png,29.9281,0.9456,0.8942,1.1727 +Khronos,12x12,ldr-rgba-diffuse.png,29.2672,0.8751,0.8263,1.2690 +Khronos,12x12,ldr-rgba-specgloss.png,30.7132,1.2148,1.1633,0.9014 +Khronos,12x12,ldr-xy-normal1.png,33.9601,0.6449,0.5683,1.8450 +Khronos,12x12,ldr-xy-normal2.png,38.4700,1.0933,0.8410,4.9871 diff --git a/Test/Images/Khronos/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/Khronos/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ee7453a7c263b08596efbc17dc8dcc40cfffbfa9 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2220,0.0370,0.0071,147.5409 +Khronos,4x4,ldr-rgb-diffuse.png,53.2418,0.1996,0.0542,77.4185 +Khronos,4x4,ldr-rgb-emissive.png,58.6689,0.0387,0.0071,148.0425 +Khronos,4x4,ldr-rgb-metalrough.png,44.4033,0.0848,0.0448,23.3843 +Khronos,4x4,ldr-rgb-metalrough2.png,43.0113,0.4352,0.2842,14.7602 +Khronos,4x4,ldr-rgba-base.png,43.3485,0.1011,0.0571,18.3796 +Khronos,4x4,ldr-rgba-diffuse.png,43.9699,0.0836,0.0401,26.1281 +Khronos,4x4,ldr-rgba-specgloss.png,41.7678,0.1403,0.0930,11.2738 +Khronos,4x4,ldr-xy-normal1.png,45.0735,0.1362,0.0657,15.9596 +Khronos,4x4,ldr-xy-normal2.png,48.7816,0.3499,0.0974,43.0707 +Khronos,5x5,ldr-l-occlusion.png,54.3818,0.0356,0.0054,195.0786 +Khronos,5x5,ldr-rgb-diffuse.png,47.4493,0.1882,0.0408,102.8675 +Khronos,5x5,ldr-rgb-emissive.png,52.6811,0.0382,0.0060,174.4149 +Khronos,5x5,ldr-rgb-metalrough.png,39.9455,0.0738,0.0331,31.6753 +Khronos,5x5,ldr-rgb-metalrough2.png,38.0100,0.4152,0.2657,15.7830 +Khronos,5x5,ldr-rgba-base.png,38.9836,0.0837,0.0392,26.7337 +Khronos,5x5,ldr-rgba-diffuse.png,39.2167,0.0817,0.0379,27.6692 +Khronos,5x5,ldr-rgba-specgloss.png,38.4684,0.1000,0.0540,19.4170 +Khronos,5x5,ldr-xy-normal1.png,41.9841,0.1210,0.0501,20.9498 +Khronos,5x5,ldr-xy-normal2.png,46.4301,0.3211,0.0661,63.4817 +Khronos,6x6,ldr-l-occlusion.png,48.3865,0.0356,0.0062,167.8772 +Khronos,6x6,ldr-rgb-diffuse.png,43.3495,0.1947,0.0536,78.2344 +Khronos,6x6,ldr-rgb-emissive.png,49.1158,0.0364,0.0051,205.8818 +Khronos,6x6,ldr-rgb-metalrough.png,36.5585,0.0760,0.0371,28.2773 +Khronos,6x6,ldr-rgb-metalrough2.png,35.3616,0.3988,0.2510,16.7120 +Khronos,6x6,ldr-rgba-base.png,36.2055,0.0848,0.0425,24.6862 +Khronos,6x6,ldr-rgba-diffuse.png,36.1693,0.0869,0.0447,23.4680 +Khronos,6x6,ldr-rgba-specgloss.png,36.1633,0.1001,0.0552,18.9893 +Khronos,6x6,ldr-xy-normal1.png,39.6982,0.1145,0.0450,23.3162 +Khronos,6x6,ldr-xy-normal2.png,44.2645,0.3135,0.0622,67.4128 +Khronos,8x8,ldr-l-occlusion.png,44.0109,0.0345,0.0072,145.4140 +Khronos,8x8,ldr-rgb-diffuse.png,38.4528,0.1967,0.0695,60.3516 +Khronos,8x8,ldr-rgb-emissive.png,44.6690,0.0353,0.0061,171.0304 +Khronos,8x8,ldr-rgb-metalrough.png,32.3608,0.0844,0.0474,22.1270 +Khronos,8x8,ldr-rgb-metalrough2.png,32.2252,0.3534,0.2140,19.5996 +Khronos,8x8,ldr-rgba-base.png,32.4791,0.0878,0.0460,22.8051 +Khronos,8x8,ldr-rgba-diffuse.png,32.1803,0.0993,0.0580,18.0714 +Khronos,8x8,ldr-rgba-specgloss.png,32.9700,0.0990,0.0549,19.1168 +Khronos,8x8,ldr-xy-normal1.png,36.5942,0.1072,0.0384,27.3018 +Khronos,8x8,ldr-xy-normal2.png,40.8681,0.3106,0.0688,60.9388 +Khronos,12x12,ldr-l-occlusion.png,40.5805,0.0363,0.0065,162.4694 +Khronos,12x12,ldr-rgb-diffuse.png,33.3907,0.1875,0.0512,81.9537 +Khronos,12x12,ldr-rgb-emissive.png,39.4822,0.0365,0.0054,192.5421 +Khronos,12x12,ldr-rgb-metalrough.png,28.6562,0.0678,0.0287,36.5766 +Khronos,12x12,ldr-rgb-metalrough2.png,29.2641,0.2488,0.1020,41.1287 +Khronos,12x12,ldr-rgba-base.png,29.0480,0.0810,0.0376,27.9069 +Khronos,12x12,ldr-rgba-diffuse.png,28.6322,0.0866,0.0438,23.9172 +Khronos,12x12,ldr-rgba-specgloss.png,29.8272,0.0771,0.0320,32.7794 +Khronos,12x12,ldr-xy-normal1.png,32.7642,0.0964,0.0265,39.5241 +Khronos,12x12,ldr-xy-normal2.png,36.2644,0.3116,0.0618,67.9209 diff --git a/Test/Images/Khronos/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/Khronos/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..3fbb449eb3ae6fcec8a99bd163a1bba66e3f8542 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,65.2091,0.0358,0.0067,156.3639 +Khronos,4x4,ldr-rgb-diffuse.png,53.0241,0.1937,0.0486,86.2650 +Khronos,4x4,ldr-rgb-emissive.png,58.0461,0.0376,0.0065,161.6394 +Khronos,4x4,ldr-rgb-metalrough.png,43.9329,0.0694,0.0295,35.5521 +Khronos,4x4,ldr-rgb-metalrough2.png,42.7265,0.3280,0.1772,23.6738 +Khronos,4x4,ldr-rgba-base.png,42.9205,0.0803,0.0362,28.9621 +Khronos,4x4,ldr-rgba-diffuse.png,43.3656,0.0690,0.0254,41.2354 +Khronos,4x4,ldr-rgba-specgloss.png,41.4692,0.1024,0.0574,18.2739 +Khronos,4x4,ldr-xy-normal1.png,44.9379,0.1126,0.0431,24.3509 +Khronos,4x4,ldr-xy-normal2.png,48.5682,0.3269,0.0765,54.8518 +Khronos,5x5,ldr-l-occlusion.png,54.2370,0.0343,0.0054,194.3544 +Khronos,5x5,ldr-rgb-diffuse.png,47.2889,0.1823,0.0385,108.8895 +Khronos,5x5,ldr-rgb-emissive.png,52.3843,0.0361,0.0050,210.2216 +Khronos,5x5,ldr-rgb-metalrough.png,39.4668,0.0631,0.0234,44.8565 +Khronos,5x5,ldr-rgb-metalrough2.png,37.4988,0.3230,0.1711,24.5172 +Khronos,5x5,ldr-rgba-base.png,38.3612,0.0709,0.0272,38.5111 +Khronos,5x5,ldr-rgba-diffuse.png,38.5312,0.0674,0.0247,42.4493 +Khronos,5x5,ldr-rgba-specgloss.png,37.9980,0.0810,0.0360,29.1126 +Khronos,5x5,ldr-xy-normal1.png,41.5416,0.1043,0.0349,30.0805 +Khronos,5x5,ldr-xy-normal2.png,46.0597,0.3101,0.0563,74.4848 +Khronos,6x6,ldr-l-occlusion.png,48.3019,0.0346,0.0058,181.7299 +Khronos,6x6,ldr-rgb-diffuse.png,43.2974,0.1858,0.0464,90.3053 +Khronos,6x6,ldr-rgb-emissive.png,49.0070,0.0347,0.0045,235.1016 +Khronos,6x6,ldr-rgb-metalrough.png,36.3770,0.0646,0.0261,40.1293 +Khronos,6x6,ldr-rgb-metalrough2.png,35.1779,0.3045,0.1566,26.7836 +Khronos,6x6,ldr-rgba-base.png,36.0346,0.0715,0.0285,36.7868 +Khronos,6x6,ldr-rgba-diffuse.png,35.9764,0.0704,0.0284,36.9475 +Khronos,6x6,ldr-rgba-specgloss.png,35.9426,0.0804,0.0359,29.1839 +Khronos,6x6,ldr-xy-normal1.png,39.2788,0.1005,0.0321,32.6485 +Khronos,6x6,ldr-xy-normal2.png,43.8791,0.3007,0.0516,81.2377 +Khronos,8x8,ldr-l-occlusion.png,43.5147,0.0340,0.0064,164.2533 +Khronos,8x8,ldr-rgb-diffuse.png,38.3219,0.1855,0.0568,73.8500 +Khronos,8x8,ldr-rgb-emissive.png,44.2682,0.0339,0.0050,208.5865 +Khronos,8x8,ldr-rgb-metalrough.png,32.2777,0.0717,0.0350,29.9970 +Khronos,8x8,ldr-rgb-metalrough2.png,32.1212,0.2933,0.1551,27.0480 +Khronos,8x8,ldr-rgba-base.png,32.3549,0.0749,0.0341,30.7193 +Khronos,8x8,ldr-rgba-diffuse.png,32.0693,0.0820,0.0414,25.3255 +Khronos,8x8,ldr-rgba-specgloss.png,32.8744,0.0837,0.0402,26.0865 +Khronos,8x8,ldr-xy-normal1.png,36.3792,0.0968,0.0295,35.6028 +Khronos,8x8,ldr-xy-normal2.png,40.4205,0.2981,0.0580,72.3544 +Khronos,12x12,ldr-l-occlusion.png,40.2288,0.0346,0.0055,191.2444 +Khronos,12x12,ldr-rgb-diffuse.png,33.3401,0.1785,0.0423,99.0696 +Khronos,12x12,ldr-rgb-emissive.png,39.2839,0.0349,0.0042,247.6517 +Khronos,12x12,ldr-rgb-metalrough.png,28.6103,0.0605,0.0217,48.2369 +Khronos,12x12,ldr-rgb-metalrough2.png,29.1709,0.2229,0.0774,54.1705 +Khronos,12x12,ldr-rgba-base.png,28.9861,0.0706,0.0274,38.2146 +Khronos,12x12,ldr-rgba-diffuse.png,28.5805,0.0736,0.0316,33.1963 +Khronos,12x12,ldr-rgba-specgloss.png,29.7817,0.0685,0.0240,43.6509 +Khronos,12x12,ldr-xy-normal1.png,32.6324,0.0896,0.0203,51.6154 +Khronos,12x12,ldr-xy-normal2.png,36.0402,0.2995,0.0500,83.8694 diff --git a/Test/Images/Khronos/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/Khronos/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..8f2149955192c704a14f90f5e3630c29f7632086 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,68.6014,0.0421,0.0116,90.3776 +Khronos,4x4,ldr-rgb-diffuse.png,54.3884,0.2978,0.1508,27.8052 +Khronos,4x4,ldr-rgb-emissive.png,60.0039,0.0448,0.0130,80.9268 +Khronos,4x4,ldr-rgb-metalrough.png,44.9558,0.1756,0.1349,7.7733 +Khronos,4x4,ldr-rgb-metalrough2.png,43.8399,1.0890,0.9363,4.4796 +Khronos,4x4,ldr-rgba-base.png,43.8790,0.2207,0.1754,5.9772 +Khronos,4x4,ldr-rgba-diffuse.png,44.2942,0.1571,0.1130,9.2803 +Khronos,4x4,ldr-rgba-specgloss.png,42.3942,0.2928,0.2460,4.2626 +Khronos,4x4,ldr-xy-normal1.png,46.6467,0.2593,0.1908,5.4946 +Khronos,4x4,ldr-xy-normal2.png,50.3582,0.5937,0.3569,11.7517 +Khronos,5x5,ldr-l-occlusion.png,57.1684,0.0441,0.0130,80.8955 +Khronos,5x5,ldr-rgb-diffuse.png,49.1263,0.2869,0.1432,29.2878 +Khronos,5x5,ldr-rgb-emissive.png,55.4722,0.0459,0.0127,82.2926 +Khronos,5x5,ldr-rgb-metalrough.png,40.3564,0.1637,0.1228,8.5394 +Khronos,5x5,ldr-rgb-metalrough2.png,39.1561,1.1059,0.9543,4.3950 +Khronos,5x5,ldr-rgba-base.png,39.4933,0.2083,0.1630,6.4350 +Khronos,5x5,ldr-rgba-diffuse.png,39.6342,0.1686,0.1238,8.4691 +Khronos,5x5,ldr-rgba-specgloss.png,38.8297,0.2647,0.2177,4.8165 +Khronos,5x5,ldr-xy-normal1.png,43.1673,0.2371,0.1671,6.2761 +Khronos,5x5,ldr-xy-normal2.png,47.3689,0.5194,0.2699,15.5388 +Khronos,6x6,ldr-l-occlusion.png,50.8693,0.0481,0.0182,57.5540 +Khronos,6x6,ldr-rgb-diffuse.png,44.9823,0.2923,0.1506,27.8494 +Khronos,6x6,ldr-rgb-emissive.png,51.5547,0.0452,0.0131,79.9107 +Khronos,6x6,ldr-rgb-metalrough.png,36.8953,0.1588,0.1199,8.7480 +Khronos,6x6,ldr-rgb-metalrough2.png,36.5150,1.0277,0.8793,4.7701 +Khronos,6x6,ldr-rgba-base.png,36.7120,0.1865,0.1420,7.3859 +Khronos,6x6,ldr-rgba-diffuse.png,36.5446,0.1720,0.1284,8.1667 +Khronos,6x6,ldr-rgba-specgloss.png,36.5286,0.2501,0.2035,5.1517 +Khronos,6x6,ldr-xy-normal1.png,40.6992,0.2027,0.1326,7.9064 +Khronos,6x6,ldr-xy-normal2.png,45.2966,0.4036,0.1509,27.8024 +Khronos,8x8,ldr-l-occlusion.png,45.4623,0.0545,0.0254,41.2811 +Khronos,8x8,ldr-rgb-diffuse.png,40.2835,0.3618,0.2319,18.0849 +Khronos,8x8,ldr-rgb-emissive.png,46.6675,0.0474,0.0168,62.4226 +Khronos,8x8,ldr-rgb-metalrough.png,32.7090,0.2007,0.1621,6.4670 +Khronos,8x8,ldr-rgb-metalrough2.png,33.2429,1.1252,0.9844,4.2606 +Khronos,8x8,ldr-rgba-base.png,33.1003,0.2062,0.1635,6.4133 +Khronos,8x8,ldr-rgba-diffuse.png,32.5948,0.2175,0.1740,6.0258 +Khronos,8x8,ldr-rgba-specgloss.png,33.5022,0.2758,0.2303,4.5540 +Khronos,8x8,ldr-xy-normal1.png,37.4662,0.2113,0.1408,7.4450 +Khronos,8x8,ldr-xy-normal2.png,42.1537,0.4075,0.1651,25.4059 +Khronos,12x12,ldr-l-occlusion.png,41.6349,0.0473,0.0149,70.3552 +Khronos,12x12,ldr-rgb-diffuse.png,35.7843,0.3762,0.2375,17.6635 +Khronos,12x12,ldr-rgb-emissive.png,41.4092,0.0530,0.0193,54.4596 +Khronos,12x12,ldr-rgb-metalrough.png,29.1232,0.1918,0.1494,7.0163 +Khronos,12x12,ldr-rgb-metalrough2.png,30.1752,0.8267,0.6795,6.1731 +Khronos,12x12,ldr-rgba-base.png,29.6504,0.1987,0.1531,6.8511 +Khronos,12x12,ldr-rgba-diffuse.png,29.0820,0.2461,0.2012,5.2123 +Khronos,12x12,ldr-rgba-specgloss.png,30.4918,0.2278,0.1801,5.8236 +Khronos,12x12,ldr-xy-normal1.png,33.5383,0.1857,0.1114,9.4111 +Khronos,12x12,ldr-xy-normal2.png,37.8558,0.4263,0.1720,24.3785 diff --git a/Test/Images/Khronos/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/Khronos/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..0b97c2bab9f1912692e1a3944e990362fa258c92 --- /dev/null +++ b/Test/Images/Khronos/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,51 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Khronos,4x4,ldr-l-occlusion.png,70.5078,0.0701,0.0389,26.9224 +Khronos,4x4,ldr-rgb-diffuse.png,55.1174,1.0661,0.9248,4.5352 +Khronos,4x4,ldr-rgb-emissive.png,61.0315,0.0612,0.0290,36.1117 +Khronos,4x4,ldr-rgb-metalrough.png,45.0904,0.3499,0.3090,3.3938 +Khronos,4x4,ldr-rgb-metalrough2.png,44.1252,2.1653,2.0124,2.0843 +Khronos,4x4,ldr-rgba-base.png,44.0698,0.4502,0.4051,2.5887 +Khronos,4x4,ldr-rgba-diffuse.png,44.4863,0.3086,0.2640,3.9715 +Khronos,4x4,ldr-rgba-specgloss.png,42.5520,0.5513,0.5042,2.0797 +Khronos,4x4,ldr-xy-normal1.png,46.8266,0.6656,0.5981,1.7532 +Khronos,4x4,ldr-xy-normal2.png,50.7352,1.4058,1.1740,3.5725 +Khronos,5x5,ldr-l-occlusion.png,58.7745,0.1064,0.0752,13.9501 +Khronos,5x5,ldr-rgb-diffuse.png,49.9726,0.9054,0.7625,5.5005 +Khronos,5x5,ldr-rgb-emissive.png,56.2188,0.0658,0.0327,32.0401 +Khronos,5x5,ldr-rgb-metalrough.png,40.5616,0.3589,0.3178,3.2993 +Khronos,5x5,ldr-rgb-metalrough2.png,39.6224,2.2867,2.1351,1.9644 +Khronos,5x5,ldr-rgba-base.png,39.8238,0.4691,0.4227,2.4804 +Khronos,5x5,ldr-rgba-diffuse.png,39.9581,0.3426,0.2982,3.5162 +Khronos,5x5,ldr-rgba-specgloss.png,39.0811,0.5560,0.5086,2.0616 +Khronos,5x5,ldr-xy-normal1.png,43.5230,0.7848,0.7136,1.4695 +Khronos,5x5,ldr-xy-normal2.png,48.0259,1.8541,1.6128,2.6006 +Khronos,6x6,ldr-l-occlusion.png,52.2896,0.1308,0.1006,10.4203 +Khronos,6x6,ldr-rgb-diffuse.png,45.8474,0.8690,0.7312,5.7360 +Khronos,6x6,ldr-rgb-emissive.png,52.7081,0.0694,0.0372,28.1686 +Khronos,6x6,ldr-rgb-metalrough.png,37.0837,0.3958,0.3555,2.9494 +Khronos,6x6,ldr-rgb-metalrough2.png,36.8344,2.4918,2.3437,1.7896 +Khronos,6x6,ldr-rgba-base.png,36.9273,0.5016,0.4567,2.2958 +Khronos,6x6,ldr-rgba-diffuse.png,36.7165,0.3753,0.3319,3.1590 +Khronos,6x6,ldr-rgba-specgloss.png,36.7141,0.5986,0.5518,1.9003 +Khronos,6x6,ldr-xy-normal1.png,41.1567,0.6986,0.6280,1.6697 +Khronos,6x6,ldr-xy-normal2.png,45.8887,1.7654,1.5207,2.7581 +Khronos,8x8,ldr-l-occlusion.png,46.0437,0.1668,0.1360,7.7095 +Khronos,8x8,ldr-rgb-diffuse.png,40.9077,0.9859,0.8510,4.9286 +Khronos,8x8,ldr-rgb-emissive.png,47.5271,0.0745,0.0420,24.9869 +Khronos,8x8,ldr-rgb-metalrough.png,32.8690,0.5028,0.4623,2.2684 +Khronos,8x8,ldr-rgb-metalrough2.png,33.6394,3.0298,2.8892,1.4517 +Khronos,8x8,ldr-rgba-base.png,33.3032,0.6308,0.5845,1.7938 +Khronos,8x8,ldr-rgba-diffuse.png,32.7488,0.4948,0.4513,2.3233 +Khronos,8x8,ldr-rgba-specgloss.png,33.6613,0.7427,0.6942,1.5104 +Khronos,8x8,ldr-xy-normal1.png,37.7495,0.4995,0.4282,2.4487 +Khronos,8x8,ldr-xy-normal2.png,42.5566,1.0532,0.8113,5.1697 +Khronos,12x12,ldr-l-occlusion.png,42.4497,0.1641,0.1298,8.0800 +Khronos,12x12,ldr-rgb-diffuse.png,36.6186,1.2087,1.0670,3.9308 +Khronos,12x12,ldr-rgb-emissive.png,42.3575,0.1032,0.0672,15.6066 +Khronos,12x12,ldr-rgb-metalrough.png,29.3080,0.6827,0.6386,1.6421 +Khronos,12x12,ldr-rgb-metalrough2.png,30.7754,3.5837,3.4344,1.2213 +Khronos,12x12,ldr-rgba-base.png,29.9285,0.7331,0.6838,1.5334 +Khronos,12x12,ldr-rgba-diffuse.png,29.2674,0.6781,0.6306,1.6629 +Khronos,12x12,ldr-rgba-specgloss.png,30.7150,0.9417,0.8915,1.1762 +Khronos,12x12,ldr-xy-normal1.png,33.9601,0.5027,0.4291,2.4438 +Khronos,12x12,ldr-xy-normal2.png,38.4700,0.8736,0.6224,6.7393 diff --git a/Test/Images/Kodak/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/Kodak/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index a483546d34897398a074350bce99f37488814403..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.8489,0.0350,0.0182,21.5624 -Kodak,4x4,ldr-rgb-kodak02.png,44.2380,0.0435,0.0252,15.6045 -Kodak,4x4,ldr-rgb-kodak03.png,46.6338,0.0304,0.0149,26.3125 -Kodak,4x4,ldr-rgb-kodak04.png,44.5665,0.0433,0.0226,17.3891 -Kodak,4x4,ldr-rgb-kodak05.png,41.5682,0.0514,0.0333,11.8175 -Kodak,4x4,ldr-rgb-kodak06.png,44.7452,0.0346,0.0179,21.9183 -Kodak,4x4,ldr-rgb-kodak07.png,45.0418,0.0397,0.0199,19.7248 -Kodak,4x4,ldr-rgb-kodak08.png,42.0821,0.0562,0.0346,11.3516 -Kodak,4x4,ldr-rgb-kodak09.png,46.2551,0.0330,0.0140,28.1248 -Kodak,4x4,ldr-rgb-kodak10.png,46.0288,0.0349,0.0146,26.9088 -Kodak,4x4,ldr-rgb-kodak11.png,44.2450,0.0378,0.0213,18.4548 -Kodak,4x4,ldr-rgb-kodak12.png,47.0135,0.0295,0.0137,28.6580 -Kodak,4x4,ldr-rgb-kodak13.png,41.4309,0.0479,0.0294,13.3965 -Kodak,4x4,ldr-rgb-kodak14.png,41.8065,0.0449,0.0273,14.3772 -Kodak,4x4,ldr-rgb-kodak15.png,44.5942,0.0433,0.0244,16.0896 -Kodak,4x4,ldr-rgb-kodak16.png,47.1801,0.0280,0.0123,32.0445 -Kodak,4x4,ldr-rgb-kodak17.png,45.7548,0.0336,0.0132,29.7262 -Kodak,4x4,ldr-rgb-kodak18.png,41.6128,0.0546,0.0329,11.9410 -Kodak,4x4,ldr-rgb-kodak19.png,44.8023,0.0383,0.0177,22.2748 -Kodak,4x4,ldr-rgb-kodak20.png,46.3894,0.0310,0.0154,25.4819 -Kodak,4x4,ldr-rgb-kodak21.png,44.5781,0.0353,0.0185,21.2021 -Kodak,4x4,ldr-rgb-kodak22.png,43.1599,0.0470,0.0279,14.1069 -Kodak,4x4,ldr-rgb-kodak23.png,45.5706,0.0348,0.0177,22.1893 -Kodak,4x4,ldr-rgb-kodak24.png,41.8541,0.0466,0.0275,14.2743 -Kodak,5x5,ldr-rgb-kodak01.png,39.6106,0.0354,0.0176,22.3979 -Kodak,5x5,ldr-rgb-kodak02.png,40.6312,0.0360,0.0164,23.9270 -Kodak,5x5,ldr-rgb-kodak03.png,43.0303,0.0282,0.0119,32.9906 -Kodak,5x5,ldr-rgb-kodak04.png,41.2378,0.0376,0.0158,24.9300 -Kodak,5x5,ldr-rgb-kodak05.png,37.4134,0.0484,0.0291,13.5336 -Kodak,5x5,ldr-rgb-kodak06.png,40.5758,0.0319,0.0144,27.3656 -Kodak,5x5,ldr-rgb-kodak07.png,41.4746,0.0357,0.0149,26.4183 -Kodak,5x5,ldr-rgb-kodak08.png,37.7544,0.0520,0.0297,13.2338 -Kodak,5x5,ldr-rgb-kodak09.png,42.9020,0.0309,0.0108,36.5716 -Kodak,5x5,ldr-rgb-kodak10.png,42.6178,0.0322,0.0110,35.7953 -Kodak,5x5,ldr-rgb-kodak11.png,40.2886,0.0340,0.0165,23.8340 -Kodak,5x5,ldr-rgb-kodak12.png,43.4048,0.0273,0.0102,38.4230 -Kodak,5x5,ldr-rgb-kodak13.png,36.8038,0.0451,0.0261,15.0703 -Kodak,5x5,ldr-rgb-kodak14.png,37.9374,0.0442,0.0256,15.3792 -Kodak,5x5,ldr-rgb-kodak15.png,41.1606,0.0366,0.0164,23.9590 -Kodak,5x5,ldr-rgb-kodak16.png,43.4729,0.0266,0.0094,41.7335 -Kodak,5x5,ldr-rgb-kodak17.png,42.0129,0.0325,0.0110,35.7860 -Kodak,5x5,ldr-rgb-kodak18.png,38.0842,0.0482,0.0232,16.9220 -Kodak,5x5,ldr-rgb-kodak19.png,41.1186,0.0348,0.0127,31.0474 -Kodak,5x5,ldr-rgb-kodak20.png,42.3441,0.0280,0.0119,33.0435 -Kodak,5x5,ldr-rgb-kodak21.png,40.4026,0.0331,0.0155,25.3999 -Kodak,5x5,ldr-rgb-kodak22.png,39.7574,0.0387,0.0184,21.3332 -Kodak,5x5,ldr-rgb-kodak23.png,42.4861,0.0308,0.0123,32.0414 -Kodak,5x5,ldr-rgb-kodak24.png,37.7908,0.0415,0.0214,18.3711 -Kodak,6x6,ldr-rgb-kodak01.png,35.7514,0.0421,0.0237,16.6074 -Kodak,6x6,ldr-rgb-kodak02.png,38.1633,0.0367,0.0166,23.6251 -Kodak,6x6,ldr-rgb-kodak03.png,40.5315,0.0284,0.0113,34.9310 -Kodak,6x6,ldr-rgb-kodak04.png,38.5310,0.0384,0.0158,24.9014 -Kodak,6x6,ldr-rgb-kodak05.png,34.3246,0.0542,0.0345,11.4115 -Kodak,6x6,ldr-rgb-kodak06.png,37.2781,0.0353,0.0169,23.2439 -Kodak,6x6,ldr-rgb-kodak07.png,38.8424,0.0367,0.0156,25.2209 -Kodak,6x6,ldr-rgb-kodak08.png,34.4294,0.0577,0.0349,11.2692 -Kodak,6x6,ldr-rgb-kodak09.png,39.9499,0.0325,0.0119,33.1325 -Kodak,6x6,ldr-rgb-kodak10.png,39.7100,0.0334,0.0118,33.4198 -Kodak,6x6,ldr-rgb-kodak11.png,37.1255,0.0366,0.0185,21.2045 -Kodak,6x6,ldr-rgb-kodak12.png,40.7229,0.0274,0.0101,39.0359 -Kodak,6x6,ldr-rgb-kodak13.png,32.7806,0.0571,0.0372,10.5714 -Kodak,6x6,ldr-rgb-kodak14.png,35.2350,0.0479,0.0288,13.6699 -Kodak,6x6,ldr-rgb-kodak15.png,38.5238,0.0366,0.0165,23.8069 -Kodak,6x6,ldr-rgb-kodak16.png,40.4988,0.0272,0.0098,40.0911 -Kodak,6x6,ldr-rgb-kodak17.png,38.9257,0.0337,0.0120,32.7463 -Kodak,6x6,ldr-rgb-kodak18.png,35.0961,0.0484,0.0253,15.5687 -Kodak,6x6,ldr-rgb-kodak19.png,37.9622,0.0380,0.0160,24.6328 -Kodak,6x6,ldr-rgb-kodak20.png,39.1651,0.0300,0.0135,29.1056 -Kodak,6x6,ldr-rgb-kodak21.png,36.8830,0.0369,0.0190,20.7184 -Kodak,6x6,ldr-rgb-kodak22.png,36.9688,0.0407,0.0198,19.8105 -Kodak,6x6,ldr-rgb-kodak23.png,40.0315,0.0305,0.0120,32.8690 -Kodak,6x6,ldr-rgb-kodak24.png,34.7652,0.0448,0.0242,16.2432 -Kodak,8x8,ldr-rgb-kodak01.png,31.3198,0.0554,0.0326,12.0438 -Kodak,8x8,ldr-rgb-kodak02.png,34.8859,0.0407,0.0173,22.7122 -Kodak,8x8,ldr-rgb-kodak03.png,36.5587,0.0338,0.0130,30.2963 -Kodak,8x8,ldr-rgb-kodak04.png,35.1631,0.0419,0.0160,24.5635 -Kodak,8x8,ldr-rgb-kodak05.png,30.2290,0.0686,0.0447,8.8055 -Kodak,8x8,ldr-rgb-kodak06.png,32.8875,0.0456,0.0230,17.0629 -Kodak,8x8,ldr-rgb-kodak07.png,34.9574,0.0430,0.0179,21.9920 -Kodak,8x8,ldr-rgb-kodak08.png,29.9727,0.0754,0.0486,8.0913 -Kodak,8x8,ldr-rgb-kodak09.png,36.0644,0.0386,0.0140,28.1090 -Kodak,8x8,ldr-rgb-kodak10.png,35.8574,0.0393,0.0136,28.9279 -Kodak,8x8,ldr-rgb-kodak11.png,32.9724,0.0455,0.0231,17.0511 -Kodak,8x8,ldr-rgb-kodak12.png,36.6491,0.0338,0.0122,32.1069 -Kodak,8x8,ldr-rgb-kodak13.png,28.2115,0.0787,0.0543,7.2382 -Kodak,8x8,ldr-rgb-kodak14.png,31.4868,0.0585,0.0354,11.0977 -Kodak,8x8,ldr-rgb-kodak15.png,34.9071,0.0418,0.0178,22.0573 -Kodak,8x8,ldr-rgb-kodak16.png,36.0183,0.0351,0.0139,28.2259 -Kodak,8x8,ldr-rgb-kodak17.png,34.8533,0.0409,0.0152,25.8170 -Kodak,8x8,ldr-rgb-kodak18.png,31.2426,0.0578,0.0309,12.7250 -Kodak,8x8,ldr-rgb-kodak19.png,34.0758,0.0455,0.0194,20.2792 -Kodak,8x8,ldr-rgb-kodak20.png,35.2054,0.0361,0.0155,25.3348 -Kodak,8x8,ldr-rgb-kodak21.png,32.7363,0.0464,0.0241,16.3336 -Kodak,8x8,ldr-rgb-kodak22.png,33.4351,0.0457,0.0212,18.5724 -Kodak,8x8,ldr-rgb-kodak23.png,36.4996,0.0345,0.0120,32.8337 -Kodak,8x8,ldr-rgb-kodak24.png,30.8082,0.0548,0.0303,12.9765 -Kodak,12x12,ldr-rgb-kodak01.png,27.1019,0.0531,0.0244,16.1406 -Kodak,12x12,ldr-rgb-kodak02.png,31.0998,0.0397,0.0092,42.8103 -Kodak,12x12,ldr-rgb-kodak03.png,32.6801,0.0359,0.0085,46.4465 -Kodak,12x12,ldr-rgb-kodak04.png,31.5605,0.0410,0.0082,47.7260 -Kodak,12x12,ldr-rgb-kodak05.png,25.8046,0.0599,0.0299,13.1361 -Kodak,12x12,ldr-rgb-kodak06.png,28.6329,0.0469,0.0180,21.8417 -Kodak,12x12,ldr-rgb-kodak07.png,30.8575,0.0422,0.0104,37.9552 -Kodak,12x12,ldr-rgb-kodak08.png,25.3858,0.0684,0.0343,11.4653 -Kodak,12x12,ldr-rgb-kodak09.png,31.8332,0.0403,0.0092,42.5233 -Kodak,12x12,ldr-rgb-kodak10.png,31.5261,0.0423,0.0099,39.7749 -Kodak,12x12,ldr-rgb-kodak11.png,28.9305,0.0431,0.0144,27.2498 -Kodak,12x12,ldr-rgb-kodak12.png,32.2648,0.0363,0.0083,47.4214 -Kodak,12x12,ldr-rgb-kodak13.png,24.3204,0.0711,0.0402,9.7812 -Kodak,12x12,ldr-rgb-kodak14.png,27.5269,0.0490,0.0199,19.7657 -Kodak,12x12,ldr-rgb-kodak15.png,31.2436,0.0418,0.0110,35.6144 -Kodak,12x12,ldr-rgb-kodak16.png,31.4839,0.0375,0.0093,42.2586 -Kodak,12x12,ldr-rgb-kodak17.png,30.8893,0.0430,0.0105,37.3425 -Kodak,12x12,ldr-rgb-kodak18.png,27.4177,0.0535,0.0200,19.7092 -Kodak,12x12,ldr-rgb-kodak19.png,30.1727,0.0460,0.0133,29.4680 -Kodak,12x12,ldr-rgb-kodak20.png,31.0405,0.0383,0.0110,35.7821 -Kodak,12x12,ldr-rgb-kodak21.png,28.7196,0.0459,0.0172,22.9014 -Kodak,12x12,ldr-rgb-kodak22.png,29.8238,0.0425,0.0112,35.2438 -Kodak,12x12,ldr-rgb-kodak23.png,32.5185,0.0375,0.0082,48.0304 -Kodak,12x12,ldr-rgb-kodak24.png,26.7652,0.0545,0.0232,16.9286 diff --git a/Test/Images/Kodak/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/Kodak/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index 8623655914304749b15e2ce1128547e4815febf4..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.5072,0.0298,0.0138,28.5647 -Kodak,4x4,ldr-rgb-kodak02.png,43.8025,0.0349,0.0175,22.4926 -Kodak,4x4,ldr-rgb-kodak03.png,46.0406,0.0260,0.0110,35.6691 -Kodak,4x4,ldr-rgb-kodak04.png,44.1429,0.0360,0.0160,24.5179 -Kodak,4x4,ldr-rgb-kodak05.png,40.9879,0.0385,0.0211,18.6394 -Kodak,4x4,ldr-rgb-kodak06.png,44.4296,0.0298,0.0139,28.3887 -Kodak,4x4,ldr-rgb-kodak07.png,44.6051,0.0333,0.0140,28.0326 -Kodak,4x4,ldr-rgb-kodak08.png,41.5000,0.0423,0.0218,18.0159 -Kodak,4x4,ldr-rgb-kodak09.png,45.9005,0.0292,0.0108,36.2540 -Kodak,4x4,ldr-rgb-kodak10.png,45.6663,0.0312,0.0114,34.4049 -Kodak,4x4,ldr-rgb-kodak11.png,43.8292,0.0314,0.0154,25.4627 -Kodak,4x4,ldr-rgb-kodak12.png,46.4729,0.0263,0.0110,35.7759 -Kodak,4x4,ldr-rgb-kodak13.png,41.1509,0.0387,0.0213,18.4391 -Kodak,4x4,ldr-rgb-kodak14.png,41.0931,0.0340,0.0174,22.6194 -Kodak,4x4,ldr-rgb-kodak15.png,44.1027,0.0344,0.0164,24.0176 -Kodak,4x4,ldr-rgb-kodak16.png,47.0422,0.0255,0.0103,38.1757 -Kodak,4x4,ldr-rgb-kodak17.png,45.4973,0.0304,0.0106,36.9874 -Kodak,4x4,ldr-rgb-kodak18.png,41.2449,0.0426,0.0218,17.9978 -Kodak,4x4,ldr-rgb-kodak19.png,44.5301,0.0335,0.0135,29.2289 -Kodak,4x4,ldr-rgb-kodak20.png,45.8602,0.0261,0.0115,34.3268 -Kodak,4x4,ldr-rgb-kodak21.png,44.2614,0.0300,0.0138,28.5850 -Kodak,4x4,ldr-rgb-kodak22.png,42.7742,0.0372,0.0186,21.1770 -Kodak,4x4,ldr-rgb-kodak23.png,45.2565,0.0294,0.0128,30.7561 -Kodak,4x4,ldr-rgb-kodak24.png,41.2205,0.0365,0.0181,21.7487 -Kodak,5x5,ldr-rgb-kodak01.png,39.3652,0.0315,0.0145,27.0327 -Kodak,5x5,ldr-rgb-kodak02.png,40.3762,0.0314,0.0133,29.5118 -Kodak,5x5,ldr-rgb-kodak03.png,42.6004,0.0250,0.0095,41.3869 -Kodak,5x5,ldr-rgb-kodak04.png,40.7711,0.0334,0.0126,31.1853 -Kodak,5x5,ldr-rgb-kodak05.png,36.9823,0.0389,0.0207,18.9527 -Kodak,5x5,ldr-rgb-kodak06.png,40.4008,0.0289,0.0123,32.0053 -Kodak,5x5,ldr-rgb-kodak07.png,41.1154,0.0318,0.0120,32.6698 -Kodak,5x5,ldr-rgb-kodak08.png,37.3666,0.0427,0.0214,18.3814 -Kodak,5x5,ldr-rgb-kodak09.png,42.5422,0.0284,0.0092,42.7271 -Kodak,5x5,ldr-rgb-kodak10.png,42.3455,0.0298,0.0095,41.1874 -Kodak,5x5,ldr-rgb-kodak11.png,40.0401,0.0299,0.0132,29.8138 -Kodak,5x5,ldr-rgb-kodak12.png,43.1448,0.0248,0.0088,44.4463 -Kodak,5x5,ldr-rgb-kodak13.png,36.6876,0.0389,0.0209,18.8169 -Kodak,5x5,ldr-rgb-kodak14.png,37.3962,0.0341,0.0169,23.2203 -Kodak,5x5,ldr-rgb-kodak15.png,40.8535,0.0309,0.0123,31.9353 -Kodak,5x5,ldr-rgb-kodak16.png,43.3795,0.0245,0.0087,44.9907 -Kodak,5x5,ldr-rgb-kodak17.png,41.8560,0.0295,0.0092,42.6255 -Kodak,5x5,ldr-rgb-kodak18.png,37.9129,0.0391,0.0174,22.5661 -Kodak,5x5,ldr-rgb-kodak19.png,40.8503,0.0321,0.0114,34.5172 -Kodak,5x5,ldr-rgb-kodak20.png,42.0160,0.0252,0.0097,40.5504 -Kodak,5x5,ldr-rgb-kodak21.png,40.1806,0.0294,0.0126,31.2746 -Kodak,5x5,ldr-rgb-kodak22.png,39.4506,0.0332,0.0141,27.8461 -Kodak,5x5,ldr-rgb-kodak23.png,42.1119,0.0277,0.0104,37.8715 -Kodak,5x5,ldr-rgb-kodak24.png,37.5517,0.0349,0.0158,24.8635 -Kodak,6x6,ldr-rgb-kodak01.png,35.6562,0.0347,0.0175,22.4311 -Kodak,6x6,ldr-rgb-kodak02.png,38.0339,0.0310,0.0124,31.7161 -Kodak,6x6,ldr-rgb-kodak03.png,40.3032,0.0242,0.0085,46.1566 -Kodak,6x6,ldr-rgb-kodak04.png,38.2918,0.0328,0.0118,33.4083 -Kodak,6x6,ldr-rgb-kodak05.png,34.0896,0.0404,0.0218,18.0077 -Kodak,6x6,ldr-rgb-kodak06.png,37.2222,0.0299,0.0128,30.7848 -Kodak,6x6,ldr-rgb-kodak07.png,38.6336,0.0314,0.0114,34.4804 -Kodak,6x6,ldr-rgb-kodak08.png,34.2253,0.0439,0.0226,17.3911 -Kodak,6x6,ldr-rgb-kodak09.png,39.7573,0.0286,0.0092,42.7692 -Kodak,6x6,ldr-rgb-kodak10.png,39.5669,0.0298,0.0091,43.0922 -Kodak,6x6,ldr-rgb-kodak11.png,36.9968,0.0303,0.0134,29.2377 -Kodak,6x6,ldr-rgb-kodak12.png,40.5658,0.0245,0.0083,47.3696 -Kodak,6x6,ldr-rgb-kodak13.png,32.7154,0.0436,0.0252,15.6323 -Kodak,6x6,ldr-rgb-kodak14.png,34.8624,0.0351,0.0176,22.3596 -Kodak,6x6,ldr-rgb-kodak15.png,38.3699,0.0309,0.0120,32.6834 -Kodak,6x6,ldr-rgb-kodak16.png,40.4581,0.0246,0.0083,47.0977 -Kodak,6x6,ldr-rgb-kodak17.png,38.8420,0.0302,0.0095,41.2647 -Kodak,6x6,ldr-rgb-kodak18.png,35.0034,0.0397,0.0178,22.1007 -Kodak,6x6,ldr-rgb-kodak19.png,37.8298,0.0332,0.0123,31.9564 -Kodak,6x6,ldr-rgb-kodak20.png,39.0123,0.0257,0.0100,39.2786 -Kodak,6x6,ldr-rgb-kodak21.png,36.8075,0.0308,0.0139,28.3131 -Kodak,6x6,ldr-rgb-kodak22.png,36.8498,0.0337,0.0141,27.9295 -Kodak,6x6,ldr-rgb-kodak23.png,39.8307,0.0267,0.0093,42.4314 -Kodak,6x6,ldr-rgb-kodak24.png,34.6916,0.0362,0.0166,23.6964 -Kodak,8x8,ldr-rgb-kodak01.png,31.1792,0.0449,0.0241,16.2883 -Kodak,8x8,ldr-rgb-kodak02.png,34.7811,0.0351,0.0134,29.3840 -Kodak,8x8,ldr-rgb-kodak03.png,36.4262,0.0293,0.0103,38.3399 -Kodak,8x8,ldr-rgb-kodak04.png,35.0547,0.0370,0.0126,31.2349 -Kodak,8x8,ldr-rgb-kodak05.png,30.0205,0.0516,0.0298,13.2014 -Kodak,8x8,ldr-rgb-kodak06.png,32.7989,0.0381,0.0177,22.1631 -Kodak,8x8,ldr-rgb-kodak07.png,34.8360,0.0373,0.0137,28.6137 -Kodak,8x8,ldr-rgb-kodak08.png,29.7069,0.0569,0.0319,12.3153 -Kodak,8x8,ldr-rgb-kodak09.png,35.8914,0.0340,0.0108,36.3892 -Kodak,8x8,ldr-rgb-kodak10.png,35.7051,0.0347,0.0106,36.9807 -Kodak,8x8,ldr-rgb-kodak11.png,32.8451,0.0373,0.0169,23.2465 -Kodak,8x8,ldr-rgb-kodak12.png,36.5111,0.0297,0.0101,39.1109 -Kodak,8x8,ldr-rgb-kodak13.png,28.1364,0.0592,0.0369,10.6626 -Kodak,8x8,ldr-rgb-kodak14.png,31.2591,0.0447,0.0232,16.9307 -Kodak,8x8,ldr-rgb-kodak15.png,34.7599,0.0357,0.0133,29.5007 -Kodak,8x8,ldr-rgb-kodak16.png,35.9616,0.0310,0.0113,34.8196 -Kodak,8x8,ldr-rgb-kodak17.png,34.7164,0.0360,0.0119,32.9603 -Kodak,8x8,ldr-rgb-kodak18.png,31.1666,0.0474,0.0223,17.6464 -Kodak,8x8,ldr-rgb-kodak19.png,33.8904,0.0392,0.0148,26.5758 -Kodak,8x8,ldr-rgb-kodak20.png,35.0191,0.0310,0.0119,33.0932 -Kodak,8x8,ldr-rgb-kodak21.png,32.6198,0.0379,0.0177,22.2294 -Kodak,8x8,ldr-rgb-kodak22.png,33.3242,0.0388,0.0159,24.7947 -Kodak,8x8,ldr-rgb-kodak23.png,36.3894,0.0305,0.0096,40.9045 -Kodak,8x8,ldr-rgb-kodak24.png,30.7268,0.0444,0.0215,18.2500 -Kodak,12x12,ldr-rgb-kodak01.png,26.9930,0.0436,0.0184,21.3183 -Kodak,12x12,ldr-rgb-kodak02.png,31.0354,0.0340,0.0081,48.3770 -Kodak,12x12,ldr-rgb-kodak03.png,32.6215,0.0305,0.0072,54.9811 -Kodak,12x12,ldr-rgb-kodak04.png,31.4774,0.0358,0.0072,54.9499 -Kodak,12x12,ldr-rgb-kodak05.png,25.6941,0.0479,0.0218,18.0449 -Kodak,12x12,ldr-rgb-kodak06.png,28.4895,0.0387,0.0142,27.7594 -Kodak,12x12,ldr-rgb-kodak07.png,30.8016,0.0362,0.0085,46.3316 -Kodak,12x12,ldr-rgb-kodak08.png,25.2157,0.0542,0.0255,15.4058 -Kodak,12x12,ldr-rgb-kodak09.png,31.6339,0.0348,0.0078,50.4641 -Kodak,12x12,ldr-rgb-kodak10.png,31.4567,0.0364,0.0082,47.6915 -Kodak,12x12,ldr-rgb-kodak11.png,28.8572,0.0360,0.0114,34.5563 -Kodak,12x12,ldr-rgb-kodak12.png,32.1857,0.0307,0.0072,54.9335 -Kodak,12x12,ldr-rgb-kodak13.png,24.2396,0.0550,0.0290,13.5396 -Kodak,12x12,ldr-rgb-kodak14.png,27.4380,0.0403,0.0150,26.1481 -Kodak,12x12,ldr-rgb-kodak15.png,31.1533,0.0357,0.0092,42.8849 -Kodak,12x12,ldr-rgb-kodak16.png,31.3620,0.0318,0.0080,48.9615 -Kodak,12x12,ldr-rgb-kodak17.png,30.8364,0.0369,0.0085,46.1256 -Kodak,12x12,ldr-rgb-kodak18.png,27.3672,0.0444,0.0146,26.9567 -Kodak,12x12,ldr-rgb-kodak19.png,29.8648,0.0395,0.0108,36.3315 -Kodak,12x12,ldr-rgb-kodak20.png,30.9381,0.0322,0.0090,43.5025 -Kodak,12x12,ldr-rgb-kodak21.png,28.6166,0.0380,0.0133,29.6407 -Kodak,12x12,ldr-rgb-kodak22.png,29.7245,0.0364,0.0092,42.9184 -Kodak,12x12,ldr-rgb-kodak23.png,32.4842,0.0324,0.0073,53.8941 -Kodak,12x12,ldr-rgb-kodak24.png,26.6937,0.0440,0.0170,23.1058 diff --git a/Test/Images/Kodak/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/Kodak/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index fae29ae8871828710aad9cae490f56d1c327d74b..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.2910,0.1174,0.0994,3.9546 -Kodak,4x4,ldr-rgb-kodak02.png,45.3499,0.1594,0.1401,2.8069 -Kodak,4x4,ldr-rgb-kodak03.png,47.6132,0.0850,0.0686,5.7358 -Kodak,4x4,ldr-rgb-kodak04.png,45.4289,0.1290,0.1074,3.6614 -Kodak,4x4,ldr-rgb-kodak05.png,42.1296,0.1474,0.1284,3.0632 -Kodak,4x4,ldr-rgb-kodak06.png,45.1555,0.1114,0.0934,4.2107 -Kodak,4x4,ldr-rgb-kodak07.png,45.9745,0.1090,0.0879,4.4748 -Kodak,4x4,ldr-rgb-kodak08.png,42.5130,0.1643,0.1419,2.7712 -Kodak,4x4,ldr-rgb-kodak09.png,47.1616,0.1273,0.1069,3.6783 -Kodak,4x4,ldr-rgb-kodak10.png,46.8287,0.1315,0.1102,3.5698 -Kodak,4x4,ldr-rgb-kodak11.png,44.8668,0.1277,0.1097,3.5859 -Kodak,4x4,ldr-rgb-kodak12.png,47.9301,0.0961,0.0793,4.9613 -Kodak,4x4,ldr-rgb-kodak13.png,41.6152,0.1264,0.1072,3.6670 -Kodak,4x4,ldr-rgb-kodak14.png,42.6269,0.1365,0.1180,3.3331 -Kodak,4x4,ldr-rgb-kodak15.png,45.4386,0.1138,0.0938,4.1910 -Kodak,4x4,ldr-rgb-kodak16.png,47.8565,0.0981,0.0810,4.8534 -Kodak,4x4,ldr-rgb-kodak17.png,46.2901,0.1139,0.0924,4.2554 -Kodak,4x4,ldr-rgb-kodak18.png,41.9927,0.1670,0.1441,2.7278 -Kodak,4x4,ldr-rgb-kodak19.png,45.3392,0.1356,0.1135,3.4631 -Kodak,4x4,ldr-rgb-kodak20.png,46.8869,0.0832,0.0670,5.8712 -Kodak,4x4,ldr-rgb-kodak21.png,45.1510,0.1344,0.1166,3.3719 -Kodak,4x4,ldr-rgb-kodak22.png,43.7746,0.1666,0.1460,2.6931 -Kodak,4x4,ldr-rgb-kodak23.png,46.8184,0.1284,0.1102,3.5681 -Kodak,4x4,ldr-rgb-kodak24.png,42.2960,0.1333,0.1130,3.4806 -Kodak,5x5,ldr-rgb-kodak01.png,40.1121,0.1325,0.1129,3.4826 -Kodak,5x5,ldr-rgb-kodak02.png,41.6953,0.1416,0.1210,3.2506 -Kodak,5x5,ldr-rgb-kodak03.png,44.0360,0.0692,0.0513,7.6680 -Kodak,5x5,ldr-rgb-kodak04.png,42.0560,0.1135,0.0899,4.3716 -Kodak,5x5,ldr-rgb-kodak05.png,37.9816,0.1537,0.1331,2.9535 -Kodak,5x5,ldr-rgb-kodak06.png,40.9586,0.1067,0.0874,4.4972 -Kodak,5x5,ldr-rgb-kodak07.png,42.4607,0.0937,0.0710,5.5383 -Kodak,5x5,ldr-rgb-kodak08.png,38.3486,0.1678,0.1440,2.7302 -Kodak,5x5,ldr-rgb-kodak09.png,43.8038,0.0812,0.0592,6.6419 -Kodak,5x5,ldr-rgb-kodak10.png,43.4092,0.0916,0.0684,5.7500 -Kodak,5x5,ldr-rgb-kodak11.png,40.8377,0.1217,0.1023,3.8423 -Kodak,5x5,ldr-rgb-kodak12.png,44.3921,0.0702,0.0515,7.6329 -Kodak,5x5,ldr-rgb-kodak13.png,36.9078,0.1403,0.1192,3.2992 -Kodak,5x5,ldr-rgb-kodak14.png,38.6484,0.1374,0.1174,3.3493 -Kodak,5x5,ldr-rgb-kodak15.png,41.8912,0.1062,0.0847,4.6400 -Kodak,5x5,ldr-rgb-kodak16.png,44.1367,0.0767,0.0582,6.7603 -Kodak,5x5,ldr-rgb-kodak17.png,42.5213,0.0824,0.0589,6.6757 -Kodak,5x5,ldr-rgb-kodak18.png,38.3607,0.1511,0.1269,3.0998 -Kodak,5x5,ldr-rgb-kodak19.png,41.6469,0.1051,0.0818,4.8076 -Kodak,5x5,ldr-rgb-kodak20.png,42.9685,0.0753,0.0573,6.8682 -Kodak,5x5,ldr-rgb-kodak21.png,40.7620,0.1054,0.0859,4.5800 -Kodak,5x5,ldr-rgb-kodak22.png,40.2773,0.1440,0.1222,3.2171 -Kodak,5x5,ldr-rgb-kodak23.png,43.5488,0.0919,0.0723,5.4415 -Kodak,5x5,ldr-rgb-kodak24.png,38.1152,0.1239,0.1022,3.8465 -Kodak,6x6,ldr-rgb-kodak01.png,36.1951,0.1344,0.1142,3.4435 -Kodak,6x6,ldr-rgb-kodak02.png,39.0094,0.1106,0.0894,4.3989 -Kodak,6x6,ldr-rgb-kodak03.png,41.3262,0.0585,0.0398,9.8729 -Kodak,6x6,ldr-rgb-kodak04.png,39.3983,0.0968,0.0727,5.4106 -Kodak,6x6,ldr-rgb-kodak05.png,34.7867,0.1477,0.1264,3.1107 -Kodak,6x6,ldr-rgb-kodak06.png,37.6289,0.0939,0.0739,5.3213 -Kodak,6x6,ldr-rgb-kodak07.png,39.7726,0.0800,0.0570,6.9014 -Kodak,6x6,ldr-rgb-kodak08.png,34.9978,0.1644,0.1393,2.8238 -Kodak,6x6,ldr-rgb-kodak09.png,40.8821,0.0638,0.0414,9.5074 -Kodak,6x6,ldr-rgb-kodak10.png,40.5030,0.0678,0.0445,8.8379 -Kodak,6x6,ldr-rgb-kodak11.png,37.5798,0.1003,0.0805,4.8833 -Kodak,6x6,ldr-rgb-kodak12.png,41.4837,0.0554,0.0363,10.8190 -Kodak,6x6,ldr-rgb-kodak13.png,32.8829,0.1521,0.1307,3.0095 -Kodak,6x6,ldr-rgb-kodak14.png,35.8236,0.1244,0.1038,3.7896 -Kodak,6x6,ldr-rgb-kodak15.png,39.1953,0.0973,0.0756,5.2042 -Kodak,6x6,ldr-rgb-kodak16.png,41.0408,0.0629,0.0439,8.9497 -Kodak,6x6,ldr-rgb-kodak17.png,39.4928,0.0684,0.0448,8.7789 -Kodak,6x6,ldr-rgb-kodak18.png,35.3481,0.1332,0.1082,3.6338 -Kodak,6x6,ldr-rgb-kodak19.png,38.5316,0.0947,0.0707,5.5611 -Kodak,6x6,ldr-rgb-kodak20.png,39.7651,0.0694,0.0509,7.7313 -Kodak,6x6,ldr-rgb-kodak21.png,37.1926,0.0921,0.0721,5.4528 -Kodak,6x6,ldr-rgb-kodak22.png,37.4532,0.1203,0.0978,4.0207 -Kodak,6x6,ldr-rgb-kodak23.png,40.9705,0.0676,0.0471,8.3438 -Kodak,6x6,ldr-rgb-kodak24.png,35.0426,0.1099,0.0876,4.4912 -Kodak,8x8,ldr-rgb-kodak01.png,31.8012,0.1770,0.1531,2.5677 -Kodak,8x8,ldr-rgb-kodak02.png,35.7606,0.1071,0.0824,4.7745 -Kodak,8x8,ldr-rgb-kodak03.png,37.7459,0.0699,0.0478,8.2326 -Kodak,8x8,ldr-rgb-kodak04.png,36.0605,0.1055,0.0776,5.0656 -Kodak,8x8,ldr-rgb-kodak05.png,30.7416,0.1844,0.1595,2.4658 -Kodak,8x8,ldr-rgb-kodak06.png,33.4352,0.1170,0.0932,4.2212 -Kodak,8x8,ldr-rgb-kodak07.png,36.1304,0.0921,0.0652,6.0296 -Kodak,8x8,ldr-rgb-kodak08.png,30.5708,0.1872,0.1590,2.4732 -Kodak,8x8,ldr-rgb-kodak09.png,37.2646,0.0727,0.0467,8.4227 -Kodak,8x8,ldr-rgb-kodak10.png,36.9159,0.0751,0.0479,8.2012 -Kodak,8x8,ldr-rgb-kodak11.png,33.6569,0.1163,0.0923,4.2580 -Kodak,8x8,ldr-rgb-kodak12.png,37.8259,0.0670,0.0443,8.8830 -Kodak,8x8,ldr-rgb-kodak13.png,28.3927,0.2040,0.1789,2.1978 -Kodak,8x8,ldr-rgb-kodak14.png,32.1340,0.1491,0.1252,3.1416 -Kodak,8x8,ldr-rgb-kodak15.png,35.8359,0.0976,0.0720,5.4579 -Kodak,8x8,ldr-rgb-kodak16.png,37.0213,0.0771,0.0543,7.2435 -Kodak,8x8,ldr-rgb-kodak17.png,35.6807,0.0826,0.0552,7.1188 -Kodak,8x8,ldr-rgb-kodak18.png,31.5529,0.1503,0.1214,3.2391 -Kodak,8x8,ldr-rgb-kodak19.png,34.7649,0.1117,0.0836,4.7048 -Kodak,8x8,ldr-rgb-kodak20.png,35.8945,0.0842,0.0621,6.3292 -Kodak,8x8,ldr-rgb-kodak21.png,33.1150,0.1156,0.0916,4.2912 -Kodak,8x8,ldr-rgb-kodak22.png,34.0244,0.1268,0.1004,3.9148 -Kodak,8x8,ldr-rgb-kodak23.png,37.6470,0.0687,0.0447,8.8007 -Kodak,8x8,ldr-rgb-kodak24.png,31.1140,0.1304,0.1044,3.7653 -Kodak,12x12,ldr-rgb-kodak01.png,27.7578,0.1938,0.1613,2.4379 -Kodak,12x12,ldr-rgb-kodak02.png,32.4621,0.0836,0.0501,7.8431 -Kodak,12x12,ldr-rgb-kodak03.png,33.7766,0.0687,0.0381,10.3168 -Kodak,12x12,ldr-rgb-kodak04.png,32.4443,0.0801,0.0443,8.8842 -Kodak,12x12,ldr-rgb-kodak05.png,26.3986,0.2061,0.1731,2.2719 -Kodak,12x12,ldr-rgb-kodak06.png,29.3737,0.1269,0.0949,4.1453 -Kodak,12x12,ldr-rgb-kodak07.png,32.0414,0.0946,0.0594,6.6192 -Kodak,12x12,ldr-rgb-kodak08.png,26.0600,0.2085,0.1721,2.2846 -Kodak,12x12,ldr-rgb-kodak09.png,33.0989,0.0729,0.0386,10.1986 -Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0753,0.0395,9.9463 -Kodak,12x12,ldr-rgb-kodak11.png,29.7433,0.1145,0.0823,4.7767 -Kodak,12x12,ldr-rgb-kodak12.png,33.8819,0.0658,0.0347,11.3306 -Kodak,12x12,ldr-rgb-kodak13.png,24.5282,0.2346,0.2010,1.9561 -Kodak,12x12,ldr-rgb-kodak14.png,28.4176,0.1516,0.1191,3.3017 -Kodak,12x12,ldr-rgb-kodak15.png,32.2342,0.0908,0.0569,6.9104 -Kodak,12x12,ldr-rgb-kodak16.png,32.9807,0.0722,0.0410,9.5958 -Kodak,12x12,ldr-rgb-kodak17.png,31.7805,0.0804,0.0446,8.8068 -Kodak,12x12,ldr-rgb-kodak18.png,27.7783,0.1501,0.1134,3.4671 -Kodak,12x12,ldr-rgb-kodak19.png,30.8882,0.1004,0.0644,6.1055 -Kodak,12x12,ldr-rgb-kodak20.png,31.8562,0.0781,0.0478,8.2278 -Kodak,12x12,ldr-rgb-kodak21.png,29.1771,0.1353,0.1033,3.8072 -Kodak,12x12,ldr-rgb-kodak22.png,30.4983,0.1091,0.0745,5.2800 -Kodak,12x12,ldr-rgb-kodak23.png,33.5464,0.0638,0.0316,12.4613 -Kodak,12x12,ldr-rgb-kodak24.png,27.0976,0.1355,0.1013,3.8835 diff --git a/Test/Images/Kodak/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/Kodak/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index bdb66b4accafd21cfd24a6a2b14bc77c77f421ce..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.4944,0.3071,0.2885,1.3632 -Kodak,4x4,ldr-rgb-kodak02.png,45.6493,0.3620,0.3425,1.1481 -Kodak,4x4,ldr-rgb-kodak03.png,47.9884,0.3118,0.2948,1.3340 -Kodak,4x4,ldr-rgb-kodak04.png,45.6562,0.3425,0.3206,1.2266 -Kodak,4x4,ldr-rgb-kodak05.png,42.4063,0.3390,0.3199,1.2291 -Kodak,4x4,ldr-rgb-kodak06.png,45.3572,0.3047,0.2867,1.3713 -Kodak,4x4,ldr-rgb-kodak07.png,46.3419,0.3395,0.3177,1.2379 -Kodak,4x4,ldr-rgb-kodak08.png,42.8054,0.3640,0.3414,1.1519 -Kodak,4x4,ldr-rgb-kodak09.png,47.4208,0.3462,0.3254,1.2086 -Kodak,4x4,ldr-rgb-kodak10.png,47.0603,0.3450,0.3228,1.2183 -Kodak,4x4,ldr-rgb-kodak11.png,45.1121,0.3204,0.3026,1.2993 -Kodak,4x4,ldr-rgb-kodak12.png,48.2457,0.3182,0.3006,1.3080 -Kodak,4x4,ldr-rgb-kodak13.png,41.7174,0.3100,0.2907,1.3526 -Kodak,4x4,ldr-rgb-kodak14.png,42.9405,0.3301,0.3112,1.2635 -Kodak,4x4,ldr-rgb-kodak15.png,45.7858,0.3280,0.3077,1.2778 -Kodak,4x4,ldr-rgb-kodak16.png,48.0652,0.3160,0.2990,1.3151 -Kodak,4x4,ldr-rgb-kodak17.png,46.4610,0.3321,0.3106,1.2662 -Kodak,4x4,ldr-rgb-kodak18.png,42.1541,0.3619,0.3389,1.1603 -Kodak,4x4,ldr-rgb-kodak19.png,45.5439,0.3459,0.3240,1.2137 -Kodak,4x4,ldr-rgb-kodak20.png,47.1284,0.2186,0.2017,1.9495 -Kodak,4x4,ldr-rgb-kodak21.png,45.3018,0.3346,0.3166,1.2420 -Kodak,4x4,ldr-rgb-kodak22.png,43.9797,0.3679,0.3472,1.1324 -Kodak,4x4,ldr-rgb-kodak23.png,47.1533,0.3552,0.3368,1.1676 -Kodak,4x4,ldr-rgb-kodak24.png,42.5030,0.3316,0.3113,1.2630 -Kodak,5x5,ldr-rgb-kodak01.png,40.2326,0.3683,0.3481,1.1296 -Kodak,5x5,ldr-rgb-kodak02.png,41.9976,0.4272,0.4062,0.9681 -Kodak,5x5,ldr-rgb-kodak03.png,44.3239,0.3514,0.3329,1.1811 -Kodak,5x5,ldr-rgb-kodak04.png,42.2394,0.3900,0.3660,1.0744 -Kodak,5x5,ldr-rgb-kodak05.png,38.1756,0.4025,0.3820,1.0295 -Kodak,5x5,ldr-rgb-kodak06.png,41.0844,0.3501,0.3307,1.1890 -Kodak,5x5,ldr-rgb-kodak07.png,42.7249,0.3847,0.3619,1.0865 -Kodak,5x5,ldr-rgb-kodak08.png,38.5334,0.4128,0.3883,1.0126 -Kodak,5x5,ldr-rgb-kodak09.png,44.0288,0.3855,0.3632,1.0825 -Kodak,5x5,ldr-rgb-kodak10.png,43.5935,0.3918,0.3686,1.0669 -Kodak,5x5,ldr-rgb-kodak11.png,40.9987,0.3654,0.3462,1.1358 -Kodak,5x5,ldr-rgb-kodak12.png,44.5960,0.3597,0.3406,1.1544 -Kodak,5x5,ldr-rgb-kodak13.png,36.9510,0.3601,0.3392,1.1593 -Kodak,5x5,ldr-rgb-kodak14.png,38.8797,0.3856,0.3658,1.0751 -Kodak,5x5,ldr-rgb-kodak15.png,42.1246,0.3693,0.3474,1.1320 -Kodak,5x5,ldr-rgb-kodak16.png,44.2686,0.3576,0.3390,1.1600 -Kodak,5x5,ldr-rgb-kodak17.png,42.6009,0.3782,0.3549,1.1081 -Kodak,5x5,ldr-rgb-kodak18.png,38.4550,0.4186,0.3942,0.9975 -Kodak,5x5,ldr-rgb-kodak19.png,41.7719,0.3997,0.3761,1.0456 -Kodak,5x5,ldr-rgb-kodak20.png,43.2708,0.2539,0.2360,1.6660 -Kodak,5x5,ldr-rgb-kodak21.png,40.8630,0.3955,0.3760,1.0457 -Kodak,5x5,ldr-rgb-kodak22.png,40.4255,0.4260,0.4035,0.9744 -Kodak,5x5,ldr-rgb-kodak23.png,43.8841,0.4162,0.3965,0.9917 -Kodak,5x5,ldr-rgb-kodak24.png,38.2272,0.3812,0.3588,1.0958 -Kodak,6x6,ldr-rgb-kodak01.png,36.3116,0.4253,0.4049,0.9711 -Kodak,6x6,ldr-rgb-kodak02.png,39.3780,0.4874,0.4656,0.8444 -Kodak,6x6,ldr-rgb-kodak03.png,41.7331,0.3027,0.2838,1.3855 -Kodak,6x6,ldr-rgb-kodak04.png,39.6521,0.4248,0.4004,0.9822 -Kodak,6x6,ldr-rgb-kodak05.png,34.9741,0.4598,0.4384,0.8970 -Kodak,6x6,ldr-rgb-kodak06.png,37.7401,0.3812,0.3610,1.0893 -Kodak,6x6,ldr-rgb-kodak07.png,40.1032,0.3498,0.3260,1.2063 -Kodak,6x6,ldr-rgb-kodak08.png,35.1660,0.4647,0.4397,0.8942 -Kodak,6x6,ldr-rgb-kodak09.png,41.2613,0.4253,0.4030,0.9758 -Kodak,6x6,ldr-rgb-kodak10.png,40.8141,0.4333,0.4094,0.9604 -Kodak,6x6,ldr-rgb-kodak11.png,37.7541,0.3923,0.3722,1.0565 -Kodak,6x6,ldr-rgb-kodak12.png,41.8249,0.3665,0.3470,1.1333 -Kodak,6x6,ldr-rgb-kodak13.png,32.9256,0.4290,0.4073,0.9653 -Kodak,6x6,ldr-rgb-kodak14.png,36.0210,0.4456,0.4247,0.9259 -Kodak,6x6,ldr-rgb-kodak15.png,39.4514,0.3630,0.3405,1.1547 -Kodak,6x6,ldr-rgb-kodak16.png,41.2290,0.3540,0.3349,1.1740 -Kodak,6x6,ldr-rgb-kodak17.png,39.6521,0.4072,0.3837,1.0248 -Kodak,6x6,ldr-rgb-kodak18.png,35.4328,0.4882,0.4629,0.8494 -Kodak,6x6,ldr-rgb-kodak19.png,38.6954,0.4585,0.4343,0.9054 -Kodak,6x6,ldr-rgb-kodak20.png,40.0953,0.2829,0.2642,1.4886 -Kodak,6x6,ldr-rgb-kodak21.png,37.3344,0.4522,0.4314,0.9115 -Kodak,6x6,ldr-rgb-kodak22.png,37.6231,0.4924,0.4696,0.8374 -Kodak,6x6,ldr-rgb-kodak23.png,41.4033,0.4221,0.4015,0.9794 -Kodak,6x6,ldr-rgb-kodak24.png,35.1417,0.4048,0.3816,1.0303 -Kodak,8x8,ldr-rgb-kodak01.png,31.9071,0.5014,0.4760,0.8260 -Kodak,8x8,ldr-rgb-kodak02.png,36.1354,0.4438,0.4173,0.9423 -Kodak,8x8,ldr-rgb-kodak03.png,38.1744,0.2366,0.2124,1.8515 -Kodak,8x8,ldr-rgb-kodak04.png,36.3637,0.3795,0.3504,1.1222 -Kodak,8x8,ldr-rgb-kodak05.png,30.9009,0.5102,0.4837,0.8129 -Kodak,8x8,ldr-rgb-kodak06.png,33.5749,0.4135,0.3886,1.0119 -Kodak,8x8,ldr-rgb-kodak07.png,36.4888,0.2852,0.2569,1.5305 -Kodak,8x8,ldr-rgb-kodak08.png,30.7484,0.5461,0.5166,0.7612 -Kodak,8x8,ldr-rgb-kodak09.png,37.5499,0.2655,0.2376,1.6552 -Kodak,8x8,ldr-rgb-kodak10.png,37.2288,0.2978,0.2686,1.4639 -Kodak,8x8,ldr-rgb-kodak11.png,33.8276,0.4467,0.4214,0.9331 -Kodak,8x8,ldr-rgb-kodak12.png,38.2490,0.2786,0.2544,1.5456 -Kodak,8x8,ldr-rgb-kodak13.png,28.4502,0.5532,0.5267,0.7465 -Kodak,8x8,ldr-rgb-kodak14.png,32.3258,0.5107,0.4851,0.8105 -Kodak,8x8,ldr-rgb-kodak15.png,36.0605,0.3476,0.3207,1.2261 -Kodak,8x8,ldr-rgb-kodak16.png,37.2636,0.3277,0.3031,1.2973 -Kodak,8x8,ldr-rgb-kodak17.png,35.8722,0.3226,0.2936,1.3394 -Kodak,8x8,ldr-rgb-kodak18.png,31.6495,0.5213,0.4908,0.8012 -Kodak,8x8,ldr-rgb-kodak19.png,34.9142,0.3550,0.3261,1.2060 -Kodak,8x8,ldr-rgb-kodak20.png,36.1470,0.2724,0.2490,1.5792 -Kodak,8x8,ldr-rgb-kodak21.png,33.2221,0.3637,0.3384,1.1619 -Kodak,8x8,ldr-rgb-kodak22.png,34.2197,0.4615,0.4336,0.9068 -Kodak,8x8,ldr-rgb-kodak23.png,38.1768,0.2633,0.2377,1.6541 -Kodak,8x8,ldr-rgb-kodak24.png,31.2175,0.4210,0.3931,1.0004 -Kodak,12x12,ldr-rgb-kodak01.png,27.9058,0.5787,0.5435,0.7235 -Kodak,12x12,ldr-rgb-kodak02.png,32.9642,0.3910,0.3547,1.1085 -Kodak,12x12,ldr-rgb-kodak03.png,34.4219,0.2410,0.2068,1.9018 -Kodak,12x12,ldr-rgb-kodak04.png,32.9599,0.3496,0.3106,1.2660 -Kodak,12x12,ldr-rgb-kodak05.png,26.5927,0.6081,0.5713,0.6883 -Kodak,12x12,ldr-rgb-kodak06.png,29.5304,0.4335,0.3985,0.9868 -Kodak,12x12,ldr-rgb-kodak07.png,32.6109,0.2937,0.2558,1.5371 -Kodak,12x12,ldr-rgb-kodak08.png,26.2744,0.5969,0.5574,0.7055 -Kodak,12x12,ldr-rgb-kodak09.png,33.6251,0.2653,0.2278,1.7265 -Kodak,12x12,ldr-rgb-kodak10.png,32.9833,0.2631,0.2245,1.7519 -Kodak,12x12,ldr-rgb-kodak11.png,30.0468,0.4287,0.3930,1.0005 -Kodak,12x12,ldr-rgb-kodak12.png,34.4395,0.2355,0.2012,1.9540 -Kodak,12x12,ldr-rgb-kodak13.png,24.5820,0.6810,0.6443,0.6103 -Kodak,12x12,ldr-rgb-kodak14.png,28.6287,0.5464,0.5106,0.7701 -Kodak,12x12,ldr-rgb-kodak15.png,32.7197,0.3364,0.2995,1.3131 -Kodak,12x12,ldr-rgb-kodak16.png,33.3355,0.3194,0.2853,1.3784 -Kodak,12x12,ldr-rgb-kodak17.png,32.1409,0.2951,0.2561,1.5355 -Kodak,12x12,ldr-rgb-kodak18.png,27.9217,0.5240,0.4838,0.8127 -Kodak,12x12,ldr-rgb-kodak19.png,31.1006,0.4176,0.3786,1.0387 -Kodak,12x12,ldr-rgb-kodak20.png,32.1470,0.3093,0.2756,1.4266 -Kodak,12x12,ldr-rgb-kodak21.png,29.3170,0.3950,0.3604,1.0911 -Kodak,12x12,ldr-rgb-kodak22.png,30.7805,0.4519,0.4144,0.9490 -Kodak,12x12,ldr-rgb-kodak23.png,34.3635,0.2249,0.1894,2.0761 -Kodak,12x12,ldr-rgb-kodak24.png,27.2253,0.4728,0.4354,0.9032 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index bc18ecdf2442e99ecf148a543283fd2d5434c6b7..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.8489,0.0410,0.0236,16.6722 -Kodak,4x4,ldr-rgb-kodak02.png,44.2380,0.0519,0.0328,11.9748 -Kodak,4x4,ldr-rgb-kodak03.png,46.6338,0.0357,0.0196,20.0458 -Kodak,4x4,ldr-rgb-kodak04.png,44.5665,0.0508,0.0296,13.2753 -Kodak,4x4,ldr-rgb-kodak05.png,41.5682,0.0622,0.0432,9.1079 -Kodak,4x4,ldr-rgb-kodak06.png,44.7452,0.0409,0.0233,16.8473 -Kodak,4x4,ldr-rgb-kodak07.png,45.0418,0.0467,0.0260,15.1260 -Kodak,4x4,ldr-rgb-kodak08.png,42.0821,0.0672,0.0451,8.7126 -Kodak,4x4,ldr-rgb-kodak09.png,46.2551,0.0381,0.0181,21.7235 -Kodak,4x4,ldr-rgb-kodak10.png,46.0288,0.0399,0.0192,20.5089 -Kodak,4x4,ldr-rgb-kodak11.png,44.2450,0.0453,0.0280,14.0269 -Kodak,4x4,ldr-rgb-kodak12.png,47.0135,0.0348,0.0179,21.9440 -Kodak,4x4,ldr-rgb-kodak13.png,41.4309,0.0577,0.0386,10.1864 -Kodak,4x4,ldr-rgb-kodak14.png,41.8065,0.0541,0.0356,11.0323 -Kodak,4x4,ldr-rgb-kodak15.png,44.5942,0.0511,0.0317,12.3859 -Kodak,4x4,ldr-rgb-kodak16.png,47.1801,0.0328,0.0161,24.4311 -Kodak,4x4,ldr-rgb-kodak17.png,45.7548,0.0383,0.0173,22.7147 -Kodak,4x4,ldr-rgb-kodak18.png,41.6128,0.0655,0.0429,9.1606 -Kodak,4x4,ldr-rgb-kodak19.png,44.8023,0.0444,0.0229,17.1845 -Kodak,4x4,ldr-rgb-kodak20.png,46.3894,0.0364,0.0202,19.4468 -Kodak,4x4,ldr-rgb-kodak21.png,44.5781,0.0419,0.0240,16.3909 -Kodak,4x4,ldr-rgb-kodak22.png,43.1599,0.0561,0.0360,10.9306 -Kodak,4x4,ldr-rgb-kodak23.png,45.5706,0.0411,0.0231,17.0275 -Kodak,4x4,ldr-rgb-kodak24.png,41.8541,0.0555,0.0356,11.0562 -Kodak,5x5,ldr-rgb-kodak01.png,39.6106,0.0423,0.0235,16.7398 -Kodak,5x5,ldr-rgb-kodak02.png,40.6312,0.0422,0.0221,17.7936 -Kodak,5x5,ldr-rgb-kodak03.png,43.0303,0.0327,0.0156,25.2209 -Kodak,5x5,ldr-rgb-kodak04.png,41.2378,0.0435,0.0209,18.7784 -Kodak,5x5,ldr-rgb-kodak05.png,37.4134,0.0601,0.0399,9.8531 -Kodak,5x5,ldr-rgb-kodak06.png,40.5758,0.0381,0.0194,20.2722 -Kodak,5x5,ldr-rgb-kodak07.png,41.4746,0.0411,0.0199,19.8082 -Kodak,5x5,ldr-rgb-kodak08.png,37.7544,0.0640,0.0410,9.5885 -Kodak,5x5,ldr-rgb-kodak09.png,42.9020,0.0350,0.0141,27.9651 -Kodak,5x5,ldr-rgb-kodak10.png,42.6178,0.0366,0.0149,26.4048 -Kodak,5x5,ldr-rgb-kodak11.png,40.2886,0.0405,0.0219,17.9953 -Kodak,5x5,ldr-rgb-kodak12.png,43.4048,0.0309,0.0133,29.5875 -Kodak,5x5,ldr-rgb-kodak13.png,36.8038,0.0567,0.0363,10.8178 -Kodak,5x5,ldr-rgb-kodak14.png,37.9374,0.0537,0.0343,11.4670 -Kodak,5x5,ldr-rgb-kodak15.png,41.1606,0.0420,0.0215,18.2475 -Kodak,5x5,ldr-rgb-kodak16.png,43.4729,0.0301,0.0121,32.5428 -Kodak,5x5,ldr-rgb-kodak17.png,42.0129,0.0357,0.0140,28.0626 -Kodak,5x5,ldr-rgb-kodak18.png,38.0842,0.0549,0.0313,12.5657 -Kodak,5x5,ldr-rgb-kodak19.png,41.1186,0.0394,0.0174,22.6626 -Kodak,5x5,ldr-rgb-kodak20.png,42.3441,0.0325,0.0158,24.8571 -Kodak,5x5,ldr-rgb-kodak21.png,40.4026,0.0395,0.0209,18.8404 -Kodak,5x5,ldr-rgb-kodak22.png,39.7574,0.0457,0.0243,16.1710 -Kodak,5x5,ldr-rgb-kodak23.png,42.4861,0.0351,0.0161,24.4568 -Kodak,5x5,ldr-rgb-kodak24.png,37.7908,0.0497,0.0293,13.4410 -Kodak,6x6,ldr-rgb-kodak01.png,35.7514,0.0540,0.0346,11.3692 -Kodak,6x6,ldr-rgb-kodak02.png,38.1633,0.0444,0.0236,16.6618 -Kodak,6x6,ldr-rgb-kodak03.png,40.5315,0.0333,0.0158,24.9424 -Kodak,6x6,ldr-rgb-kodak04.png,38.5310,0.0450,0.0222,17.7165 -Kodak,6x6,ldr-rgb-kodak05.png,34.3246,0.0706,0.0499,7.8749 -Kodak,6x6,ldr-rgb-kodak06.png,37.2781,0.0434,0.0240,16.3512 -Kodak,6x6,ldr-rgb-kodak07.png,38.8424,0.0437,0.0218,18.0252 -Kodak,6x6,ldr-rgb-kodak08.png,34.4294,0.0752,0.0517,7.6068 -Kodak,6x6,ldr-rgb-kodak09.png,39.9499,0.0378,0.0165,23.8069 -Kodak,6x6,ldr-rgb-kodak10.png,39.7100,0.0385,0.0162,24.2190 -Kodak,6x6,ldr-rgb-kodak11.png,37.1255,0.0456,0.0262,15.0271 -Kodak,6x6,ldr-rgb-kodak12.png,40.7229,0.0323,0.0139,28.2158 -Kodak,6x6,ldr-rgb-kodak13.png,32.7806,0.0766,0.0553,7.1073 -Kodak,6x6,ldr-rgb-kodak14.png,35.2350,0.0612,0.0412,9.5434 -Kodak,6x6,ldr-rgb-kodak15.png,38.5238,0.0438,0.0233,16.8415 -Kodak,6x6,ldr-rgb-kodak16.png,40.4988,0.0317,0.0139,28.3808 -Kodak,6x6,ldr-rgb-kodak17.png,38.9257,0.0393,0.0170,23.1645 -Kodak,6x6,ldr-rgb-kodak18.png,35.0961,0.0603,0.0367,10.7278 -Kodak,6x6,ldr-rgb-kodak19.png,37.9622,0.0453,0.0228,17.2409 -Kodak,6x6,ldr-rgb-kodak20.png,39.1651,0.0360,0.0187,21.0524 -Kodak,6x6,ldr-rgb-kodak21.png,36.8830,0.0469,0.0276,14.2227 -Kodak,6x6,ldr-rgb-kodak22.png,36.9688,0.0496,0.0277,14.1920 -Kodak,6x6,ldr-rgb-kodak23.png,40.0315,0.0356,0.0165,23.8371 -Kodak,6x6,ldr-rgb-kodak24.png,34.7652,0.0562,0.0347,11.3212 -Kodak,8x8,ldr-rgb-kodak01.png,31.3198,0.0725,0.0490,8.0183 -Kodak,8x8,ldr-rgb-kodak02.png,34.8859,0.0484,0.0242,16.2815 -Kodak,8x8,ldr-rgb-kodak03.png,36.5587,0.0401,0.0185,21.2916 -Kodak,8x8,ldr-rgb-kodak04.png,35.1631,0.0495,0.0228,17.2796 -Kodak,8x8,ldr-rgb-kodak05.png,30.2290,0.0919,0.0671,5.8628 -Kodak,8x8,ldr-rgb-kodak06.png,32.8875,0.0577,0.0343,11.4600 -Kodak,8x8,ldr-rgb-kodak07.png,34.9574,0.0517,0.0256,15.3792 -Kodak,8x8,ldr-rgb-kodak08.png,29.9727,0.1012,0.0735,5.3487 -Kodak,8x8,ldr-rgb-kodak09.png,36.0644,0.0452,0.0200,19.7003 -Kodak,8x8,ldr-rgb-kodak10.png,35.8574,0.0454,0.0192,20.5143 -Kodak,8x8,ldr-rgb-kodak11.png,32.9724,0.0568,0.0336,11.6955 -Kodak,8x8,ldr-rgb-kodak12.png,36.6491,0.0395,0.0174,22.5442 -Kodak,8x8,ldr-rgb-kodak13.png,28.2115,0.1062,0.0813,4.8349 -Kodak,8x8,ldr-rgb-kodak14.png,31.4868,0.0767,0.0527,7.4662 -Kodak,8x8,ldr-rgb-kodak15.png,34.9071,0.0497,0.0253,15.5643 -Kodak,8x8,ldr-rgb-kodak16.png,36.0183,0.0420,0.0199,19.7399 -Kodak,8x8,ldr-rgb-kodak17.png,34.8533,0.0475,0.0217,18.0789 -Kodak,8x8,ldr-rgb-kodak18.png,31.2426,0.0731,0.0451,8.7242 -Kodak,8x8,ldr-rgb-kodak19.png,34.0758,0.0550,0.0279,14.0807 -Kodak,8x8,ldr-rgb-kodak20.png,35.2054,0.0435,0.0221,17.8241 -Kodak,8x8,ldr-rgb-kodak21.png,32.7363,0.0588,0.0352,11.1747 -Kodak,8x8,ldr-rgb-kodak22.png,33.4351,0.0562,0.0303,12.9663 -Kodak,8x8,ldr-rgb-kodak23.png,36.4996,0.0395,0.0165,23.8471 -Kodak,8x8,ldr-rgb-kodak24.png,30.8082,0.0696,0.0441,8.9135 -Kodak,12x12,ldr-rgb-kodak01.png,27.1019,0.0660,0.0356,11.0408 -Kodak,12x12,ldr-rgb-kodak02.png,31.0998,0.0435,0.0128,30.6504 -Kodak,12x12,ldr-rgb-kodak03.png,32.6801,0.0397,0.0115,34.2584 -Kodak,12x12,ldr-rgb-kodak04.png,31.5605,0.0444,0.0111,35.3420 -Kodak,12x12,ldr-rgb-kodak05.png,25.8046,0.0746,0.0436,9.0214 -Kodak,12x12,ldr-rgb-kodak06.png,28.6329,0.0556,0.0261,15.0676 -Kodak,12x12,ldr-rgb-kodak07.png,30.8575,0.0469,0.0143,27.4878 -Kodak,12x12,ldr-rgb-kodak08.png,25.3858,0.0874,0.0531,7.3991 -Kodak,12x12,ldr-rgb-kodak09.png,31.8332,0.0441,0.0130,30.3403 -Kodak,12x12,ldr-rgb-kodak10.png,31.5261,0.0464,0.0137,28.7860 -Kodak,12x12,ldr-rgb-kodak11.png,28.9305,0.0501,0.0206,19.0475 -Kodak,12x12,ldr-rgb-kodak12.png,32.2648,0.0399,0.0113,34.8285 -Kodak,12x12,ldr-rgb-kodak13.png,24.3204,0.0915,0.0603,6.5249 -Kodak,12x12,ldr-rgb-kodak14.png,27.5269,0.0594,0.0287,13.7004 -Kodak,12x12,ldr-rgb-kodak15.png,31.2436,0.0472,0.0157,25.0409 -Kodak,12x12,ldr-rgb-kodak16.png,31.4839,0.0421,0.0133,29.6050 -Kodak,12x12,ldr-rgb-kodak17.png,30.8893,0.0473,0.0144,27.2197 -Kodak,12x12,ldr-rgb-kodak18.png,27.4177,0.0622,0.0283,13.9029 -Kodak,12x12,ldr-rgb-kodak19.png,30.1727,0.0523,0.0195,20.1280 -Kodak,12x12,ldr-rgb-kodak20.png,31.0405,0.0435,0.0154,25.4938 -Kodak,12x12,ldr-rgb-kodak21.png,28.7196,0.0546,0.0253,15.5625 -Kodak,12x12,ldr-rgb-kodak22.png,29.8238,0.0475,0.0158,24.8384 -Kodak,12x12,ldr-rgb-kodak23.png,32.5185,0.0415,0.0116,33.9593 -Kodak,12x12,ldr-rgb-kodak24.png,26.7652,0.0653,0.0335,11.7273 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index 3a7314960aa8619e2d5fe1499b252598af03423d..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.5072,0.0352,0.0182,21.5661 -Kodak,4x4,ldr-rgb-kodak02.png,43.8025,0.0406,0.0226,17.3797 -Kodak,4x4,ldr-rgb-kodak03.png,46.0406,0.0303,0.0147,26.6695 -Kodak,4x4,ldr-rgb-kodak04.png,44.1429,0.0416,0.0210,18.7138 -Kodak,4x4,ldr-rgb-kodak05.png,40.9879,0.0464,0.0279,14.0892 -Kodak,4x4,ldr-rgb-kodak06.png,44.4296,0.0352,0.0182,21.6266 -Kodak,4x4,ldr-rgb-kodak07.png,44.6051,0.0383,0.0187,21.0624 -Kodak,4x4,ldr-rgb-kodak08.png,41.5000,0.0504,0.0287,13.6976 -Kodak,4x4,ldr-rgb-kodak09.png,45.9005,0.0333,0.0145,27.1542 -Kodak,4x4,ldr-rgb-kodak10.png,45.6663,0.0354,0.0152,25.9327 -Kodak,4x4,ldr-rgb-kodak11.png,43.8292,0.0370,0.0201,19.5980 -Kodak,4x4,ldr-rgb-kodak12.png,46.4729,0.0303,0.0142,27.6992 -Kodak,4x4,ldr-rgb-kodak13.png,41.1509,0.0467,0.0285,13.7937 -Kodak,4x4,ldr-rgb-kodak14.png,41.0931,0.0404,0.0224,17.5230 -Kodak,4x4,ldr-rgb-kodak15.png,44.1027,0.0400,0.0212,18.5515 -Kodak,4x4,ldr-rgb-kodak16.png,47.0422,0.0296,0.0136,28.8747 -Kodak,4x4,ldr-rgb-kodak17.png,45.4973,0.0344,0.0143,27.5263 -Kodak,4x4,ldr-rgb-kodak18.png,41.2449,0.0506,0.0286,13.7725 -Kodak,4x4,ldr-rgb-kodak19.png,44.5301,0.0383,0.0177,22.2723 -Kodak,4x4,ldr-rgb-kodak20.png,45.8602,0.0309,0.0154,25.5649 -Kodak,4x4,ldr-rgb-kodak21.png,44.2614,0.0353,0.0183,21.4639 -Kodak,4x4,ldr-rgb-kodak22.png,42.7742,0.0435,0.0244,16.0976 -Kodak,4x4,ldr-rgb-kodak23.png,45.2565,0.0341,0.0170,23.0641 -Kodak,4x4,ldr-rgb-kodak24.png,41.2205,0.0430,0.0239,16.4767 -Kodak,5x5,ldr-rgb-kodak01.png,39.3652,0.0377,0.0198,19.8695 -Kodak,5x5,ldr-rgb-kodak02.png,40.3762,0.0361,0.0178,22.1417 -Kodak,5x5,ldr-rgb-kodak03.png,42.6004,0.0286,0.0124,31.6394 -Kodak,5x5,ldr-rgb-kodak04.png,40.7711,0.0383,0.0171,22.9709 -Kodak,5x5,ldr-rgb-kodak05.png,36.9823,0.0480,0.0291,13.4959 -Kodak,5x5,ldr-rgb-kodak06.png,40.4008,0.0342,0.0168,23.3670 -Kodak,5x5,ldr-rgb-kodak07.png,41.1154,0.0367,0.0163,24.0692 -Kodak,5x5,ldr-rgb-kodak08.png,37.3666,0.0518,0.0296,13.2681 -Kodak,5x5,ldr-rgb-kodak09.png,42.5422,0.0317,0.0120,32.6808 -Kodak,5x5,ldr-rgb-kodak10.png,42.3455,0.0337,0.0127,31.0398 -Kodak,5x5,ldr-rgb-kodak11.png,40.0401,0.0349,0.0175,22.4555 -Kodak,5x5,ldr-rgb-kodak12.png,43.1448,0.0280,0.0113,34.6660 -Kodak,5x5,ldr-rgb-kodak13.png,36.6876,0.0485,0.0296,13.2709 -Kodak,5x5,ldr-rgb-kodak14.png,37.3962,0.0413,0.0227,17.2995 -Kodak,5x5,ldr-rgb-kodak15.png,40.8535,0.0360,0.0167,23.5233 -Kodak,5x5,ldr-rgb-kodak16.png,43.3795,0.0279,0.0111,35.4346 -Kodak,5x5,ldr-rgb-kodak17.png,41.8560,0.0328,0.0122,32.2469 -Kodak,5x5,ldr-rgb-kodak18.png,37.9129,0.0464,0.0242,16.2728 -Kodak,5x5,ldr-rgb-kodak19.png,40.8503,0.0367,0.0155,25.3636 -Kodak,5x5,ldr-rgb-kodak20.png,42.0160,0.0291,0.0129,30.3760 -Kodak,5x5,ldr-rgb-kodak21.png,40.1806,0.0350,0.0174,22.5779 -Kodak,5x5,ldr-rgb-kodak22.png,39.4506,0.0391,0.0192,20.4993 -Kodak,5x5,ldr-rgb-kodak23.png,42.1119,0.0314,0.0137,28.6640 -Kodak,5x5,ldr-rgb-kodak24.png,37.5517,0.0414,0.0217,18.0912 -Kodak,6x6,ldr-rgb-kodak01.png,35.6562,0.0435,0.0250,15.7073 -Kodak,6x6,ldr-rgb-kodak02.png,38.0339,0.0361,0.0171,23.0409 -Kodak,6x6,ldr-rgb-kodak03.png,40.3032,0.0283,0.0118,33.2500 -Kodak,6x6,ldr-rgb-kodak04.png,38.2918,0.0381,0.0161,24.4144 -Kodak,6x6,ldr-rgb-kodak05.png,34.0896,0.0508,0.0312,12.5906 -Kodak,6x6,ldr-rgb-kodak06.png,37.2222,0.0360,0.0181,21.6755 -Kodak,6x6,ldr-rgb-kodak07.png,38.6336,0.0367,0.0159,24.8055 -Kodak,6x6,ldr-rgb-kodak08.png,34.2253,0.0550,0.0324,12.1367 -Kodak,6x6,ldr-rgb-kodak09.png,39.7573,0.0326,0.0126,31.2592 -Kodak,6x6,ldr-rgb-kodak10.png,39.5669,0.0338,0.0123,31.9663 -Kodak,6x6,ldr-rgb-kodak11.png,36.9968,0.0363,0.0186,21.0896 -Kodak,6x6,ldr-rgb-kodak12.png,40.5658,0.0284,0.0110,35.7860 -Kodak,6x6,ldr-rgb-kodak13.png,32.7154,0.0566,0.0369,10.6490 -Kodak,6x6,ldr-rgb-kodak14.png,34.8624,0.0433,0.0244,16.1047 -Kodak,6x6,ldr-rgb-kodak15.png,38.3699,0.0362,0.0168,23.4028 -Kodak,6x6,ldr-rgb-kodak16.png,40.4581,0.0286,0.0116,34.0216 -Kodak,6x6,ldr-rgb-kodak17.png,38.8420,0.0344,0.0131,29.9643 -Kodak,6x6,ldr-rgb-kodak18.png,35.0034,0.0482,0.0251,15.6572 -Kodak,6x6,ldr-rgb-kodak19.png,37.8298,0.0393,0.0176,22.3493 -Kodak,6x6,ldr-rgb-kodak20.png,39.0123,0.0304,0.0139,28.3725 -Kodak,6x6,ldr-rgb-kodak21.png,36.8075,0.0374,0.0196,20.0446 -Kodak,6x6,ldr-rgb-kodak22.png,36.8498,0.0394,0.0194,20.2396 -Kodak,6x6,ldr-rgb-kodak23.png,39.8307,0.0305,0.0127,30.8719 -Kodak,6x6,ldr-rgb-kodak24.png,34.6916,0.0435,0.0237,16.6068 -Kodak,8x8,ldr-rgb-kodak01.png,31.1792,0.0569,0.0349,11.2524 -Kodak,8x8,ldr-rgb-kodak02.png,34.7811,0.0409,0.0183,21.4695 -Kodak,8x8,ldr-rgb-kodak03.png,36.4262,0.0343,0.0142,27.6116 -Kodak,8x8,ldr-rgb-kodak04.png,35.0547,0.0425,0.0173,22.7175 -Kodak,8x8,ldr-rgb-kodak05.png,30.0205,0.0666,0.0438,8.9853 -Kodak,8x8,ldr-rgb-kodak06.png,32.7989,0.0469,0.0252,15.5766 -Kodak,8x8,ldr-rgb-kodak07.png,34.8360,0.0435,0.0194,20.2929 -Kodak,8x8,ldr-rgb-kodak08.png,29.7069,0.0721,0.0466,8.4347 -Kodak,8x8,ldr-rgb-kodak09.png,35.8914,0.0388,0.0154,25.5803 -Kodak,8x8,ldr-rgb-kodak10.png,35.7051,0.0393,0.0147,26.6932 -Kodak,8x8,ldr-rgb-kodak11.png,32.8451,0.0454,0.0239,16.4622 -Kodak,8x8,ldr-rgb-kodak12.png,36.5111,0.0347,0.0139,28.2704 -Kodak,8x8,ldr-rgb-kodak13.png,28.1364,0.0783,0.0551,7.1301 -Kodak,8x8,ldr-rgb-kodak14.png,31.2591,0.0560,0.0336,11.7123 -Kodak,8x8,ldr-rgb-kodak15.png,34.7599,0.0414,0.0186,21.1407 -Kodak,8x8,ldr-rgb-kodak16.png,35.9616,0.0363,0.0158,24.9172 -Kodak,8x8,ldr-rgb-kodak17.png,34.7164,0.0412,0.0165,23.7595 -Kodak,8x8,ldr-rgb-kodak18.png,31.1666,0.0579,0.0318,12.3843 -Kodak,8x8,ldr-rgb-kodak19.png,33.8904,0.0462,0.0211,18.6527 -Kodak,8x8,ldr-rgb-kodak20.png,35.0191,0.0363,0.0165,23.7907 -Kodak,8x8,ldr-rgb-kodak21.png,32.6198,0.0468,0.0253,15.5146 -Kodak,8x8,ldr-rgb-kodak22.png,33.3242,0.0460,0.0222,17.6822 -Kodak,8x8,ldr-rgb-kodak23.png,36.3894,0.0348,0.0133,29.4786 -Kodak,8x8,ldr-rgb-kodak24.png,30.7268,0.0546,0.0307,12.8059 -Kodak,12x12,ldr-rgb-kodak01.png,26.9930,0.0531,0.0267,14.7211 -Kodak,12x12,ldr-rgb-kodak02.png,31.0354,0.0375,0.0109,36.1713 -Kodak,12x12,ldr-rgb-kodak03.png,32.6215,0.0340,0.0097,40.4718 -Kodak,12x12,ldr-rgb-kodak04.png,31.4774,0.0389,0.0096,41.0756 -Kodak,12x12,ldr-rgb-kodak05.png,25.6941,0.0588,0.0320,12.2839 -Kodak,12x12,ldr-rgb-kodak06.png,28.4895,0.0459,0.0204,19.2433 -Kodak,12x12,ldr-rgb-kodak07.png,30.8016,0.0402,0.0119,32.9570 -Kodak,12x12,ldr-rgb-kodak08.png,25.2157,0.0678,0.0373,10.5417 -Kodak,12x12,ldr-rgb-kodak09.png,31.6339,0.0383,0.0108,36.5513 -Kodak,12x12,ldr-rgb-kodak10.png,31.4567,0.0398,0.0112,35.2031 -Kodak,12x12,ldr-rgb-kodak11.png,28.8572,0.0413,0.0160,24.5928 -Kodak,12x12,ldr-rgb-kodak12.png,32.1857,0.0345,0.0098,40.0755 -Kodak,12x12,ldr-rgb-kodak13.png,24.2396,0.0700,0.0424,9.2693 -Kodak,12x12,ldr-rgb-kodak14.png,27.4380,0.0477,0.0213,18.4445 -Kodak,12x12,ldr-rgb-kodak15.png,31.1533,0.0397,0.0128,30.8044 -Kodak,12x12,ldr-rgb-kodak16.png,31.3620,0.0358,0.0112,34.9680 -Kodak,12x12,ldr-rgb-kodak17.png,30.8364,0.0406,0.0117,33.6998 -Kodak,12x12,ldr-rgb-kodak18.png,27.3672,0.0513,0.0211,18.6032 -Kodak,12x12,ldr-rgb-kodak19.png,29.8648,0.0444,0.0156,25.2645 -Kodak,12x12,ldr-rgb-kodak20.png,30.9381,0.0364,0.0126,31.0866 -Kodak,12x12,ldr-rgb-kodak21.png,28.6166,0.0447,0.0194,20.2857 -Kodak,12x12,ldr-rgb-kodak22.png,29.7245,0.0409,0.0130,30.3102 -Kodak,12x12,ldr-rgb-kodak23.png,32.4842,0.0358,0.0101,38.9511 -Kodak,12x12,ldr-rgb-kodak24.png,26.6937,0.0522,0.0242,16.2218 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index ba5ad4072c1d5e65452767f58ab95fdedba651df..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.2910,0.1572,0.1386,2.8364 -Kodak,4x4,ldr-rgb-kodak02.png,45.3499,0.2118,0.1921,2.0474 -Kodak,4x4,ldr-rgb-kodak03.png,47.6132,0.1130,0.0958,4.1040 -Kodak,4x4,ldr-rgb-kodak04.png,45.4289,0.1709,0.1482,2.6526 -Kodak,4x4,ldr-rgb-kodak05.png,42.1296,0.1972,0.1769,2.2226 -Kodak,4x4,ldr-rgb-kodak06.png,45.1555,0.1498,0.1310,3.0019 -Kodak,4x4,ldr-rgb-kodak07.png,45.9745,0.1440,0.1223,3.2163 -Kodak,4x4,ldr-rgb-kodak08.png,42.5130,0.2190,0.1958,2.0082 -Kodak,4x4,ldr-rgb-kodak09.png,47.1616,0.1704,0.1497,2.6273 -Kodak,4x4,ldr-rgb-kodak10.png,46.8287,0.1749,0.1530,2.5696 -Kodak,4x4,ldr-rgb-kodak11.png,44.8668,0.1700,0.1511,2.6017 -Kodak,4x4,ldr-rgb-kodak12.png,47.9301,0.1286,0.1106,3.5552 -Kodak,4x4,ldr-rgb-kodak13.png,41.6152,0.1694,0.1494,2.6328 -Kodak,4x4,ldr-rgb-kodak14.png,42.6269,0.1819,0.1628,2.4147 -Kodak,4x4,ldr-rgb-kodak15.png,45.4386,0.1510,0.1305,3.0123 -Kodak,4x4,ldr-rgb-kodak16.png,47.8565,0.1319,0.1142,3.4445 -Kodak,4x4,ldr-rgb-kodak17.png,46.2901,0.1502,0.1280,3.0721 -Kodak,4x4,ldr-rgb-kodak18.png,41.9927,0.2219,0.1987,1.9790 -Kodak,4x4,ldr-rgb-kodak19.png,45.3392,0.1803,0.1575,2.4967 -Kodak,4x4,ldr-rgb-kodak20.png,46.8869,0.1105,0.0936,4.2021 -Kodak,4x4,ldr-rgb-kodak21.png,45.1510,0.1803,0.1614,2.4358 -Kodak,4x4,ldr-rgb-kodak22.png,43.7746,0.2231,0.2022,1.9450 -Kodak,4x4,ldr-rgb-kodak23.png,46.8184,0.1720,0.1534,2.5637 -Kodak,4x4,ldr-rgb-kodak24.png,42.2960,0.1761,0.1554,2.5299 -Kodak,5x5,ldr-rgb-kodak01.png,40.1121,0.1895,0.1693,2.3222 -Kodak,5x5,ldr-rgb-kodak02.png,41.6953,0.2006,0.1792,2.1947 -Kodak,5x5,ldr-rgb-kodak03.png,44.0360,0.0941,0.0750,5.2427 -Kodak,5x5,ldr-rgb-kodak04.png,42.0560,0.1571,0.1330,2.9575 -Kodak,5x5,ldr-rgb-kodak05.png,37.9816,0.2195,0.1977,1.9894 -Kodak,5x5,ldr-rgb-kodak06.png,40.9586,0.1509,0.1309,3.0034 -Kodak,5x5,ldr-rgb-kodak07.png,42.4607,0.1278,0.1046,3.7591 -Kodak,5x5,ldr-rgb-kodak08.png,38.3486,0.2388,0.2144,1.8339 -Kodak,5x5,ldr-rgb-kodak09.png,43.8038,0.1103,0.0879,4.4712 -Kodak,5x5,ldr-rgb-kodak10.png,43.4092,0.1244,0.1010,3.8916 -Kodak,5x5,ldr-rgb-kodak11.png,40.8377,0.1723,0.1521,2.5851 -Kodak,5x5,ldr-rgb-kodak12.png,44.3921,0.0952,0.0760,5.1748 -Kodak,5x5,ldr-rgb-kodak13.png,36.9078,0.2029,0.1813,2.1694 -Kodak,5x5,ldr-rgb-kodak14.png,38.6484,0.1957,0.1748,2.2491 -Kodak,5x5,ldr-rgb-kodak15.png,41.8912,0.1458,0.1241,3.1676 -Kodak,5x5,ldr-rgb-kodak16.png,44.1367,0.1065,0.0871,4.5140 -Kodak,5x5,ldr-rgb-kodak17.png,42.5213,0.1117,0.0880,4.4683 -Kodak,5x5,ldr-rgb-kodak18.png,38.3607,0.2141,0.1889,2.0813 -Kodak,5x5,ldr-rgb-kodak19.png,41.6469,0.1469,0.1229,3.1997 -Kodak,5x5,ldr-rgb-kodak20.png,42.9685,0.1045,0.0858,4.5855 -Kodak,5x5,ldr-rgb-kodak21.png,40.7620,0.1484,0.1281,3.0702 -Kodak,5x5,ldr-rgb-kodak22.png,40.2773,0.2028,0.1803,2.1811 -Kodak,5x5,ldr-rgb-kodak23.png,43.5488,0.1273,0.1071,3.6710 -Kodak,5x5,ldr-rgb-kodak24.png,38.1152,0.1738,0.1515,2.5950 -Kodak,6x6,ldr-rgb-kodak01.png,36.1951,0.1957,0.1748,2.2496 -Kodak,6x6,ldr-rgb-kodak02.png,39.0094,0.1554,0.1331,2.9533 -Kodak,6x6,ldr-rgb-kodak03.png,41.3262,0.0790,0.0597,6.5812 -Kodak,6x6,ldr-rgb-kodak04.png,39.3983,0.1336,0.1090,3.6074 -Kodak,6x6,ldr-rgb-kodak05.png,34.7867,0.2140,0.1919,2.0492 -Kodak,6x6,ldr-rgb-kodak06.png,37.6289,0.1337,0.1130,3.4785 -Kodak,6x6,ldr-rgb-kodak07.png,39.7726,0.1100,0.0864,4.5534 -Kodak,6x6,ldr-rgb-kodak08.png,34.9978,0.2367,0.2114,1.8598 -Kodak,6x6,ldr-rgb-kodak09.png,40.8821,0.0849,0.0623,6.3129 -Kodak,6x6,ldr-rgb-kodak10.png,40.5030,0.0911,0.0670,5.8729 -Kodak,6x6,ldr-rgb-kodak11.png,37.5798,0.1433,0.1227,3.2060 -Kodak,6x6,ldr-rgb-kodak12.png,41.4837,0.0744,0.0545,7.2129 -Kodak,6x6,ldr-rgb-kodak13.png,32.8829,0.2215,0.1996,1.9696 -Kodak,6x6,ldr-rgb-kodak14.png,35.8236,0.1789,0.1576,2.4943 -Kodak,6x6,ldr-rgb-kodak15.png,39.1953,0.1344,0.1122,3.5038 -Kodak,6x6,ldr-rgb-kodak16.png,41.0408,0.0870,0.0673,5.8468 -Kodak,6x6,ldr-rgb-kodak17.png,39.4928,0.0926,0.0684,5.7515 -Kodak,6x6,ldr-rgb-kodak18.png,35.3481,0.1891,0.1636,2.4037 -Kodak,6x6,ldr-rgb-kodak19.png,38.5316,0.1332,0.1084,3.6276 -Kodak,6x6,ldr-rgb-kodak20.png,39.7651,0.0956,0.0764,5.1471 -Kodak,6x6,ldr-rgb-kodak21.png,37.1926,0.1315,0.1106,3.5543 -Kodak,6x6,ldr-rgb-kodak22.png,37.4532,0.1686,0.1457,2.6988 -Kodak,6x6,ldr-rgb-kodak23.png,40.9705,0.0903,0.0694,5.6681 -Kodak,6x6,ldr-rgb-kodak24.png,35.0426,0.1559,0.1330,2.9559 -Kodak,8x8,ldr-rgb-kodak01.png,31.8012,0.2638,0.2393,1.6434 -Kodak,8x8,ldr-rgb-kodak02.png,35.7606,0.1516,0.1257,3.1280 -Kodak,8x8,ldr-rgb-kodak03.png,37.7459,0.0960,0.0729,5.3971 -Kodak,8x8,ldr-rgb-kodak04.png,36.0605,0.1462,0.1182,3.3278 -Kodak,8x8,ldr-rgb-kodak05.png,30.7416,0.2737,0.2478,1.5866 -Kodak,8x8,ldr-rgb-kodak06.png,33.4352,0.1694,0.1453,2.7065 -Kodak,8x8,ldr-rgb-kodak07.png,36.1304,0.1293,0.1017,3.8653 -Kodak,8x8,ldr-rgb-kodak08.png,30.5708,0.2757,0.2470,1.5918 -Kodak,8x8,ldr-rgb-kodak09.png,37.2646,0.0983,0.0716,5.4919 -Kodak,8x8,ldr-rgb-kodak10.png,36.9159,0.1019,0.0739,5.3214 -Kodak,8x8,ldr-rgb-kodak11.png,33.6569,0.1670,0.1426,2.7580 -Kodak,8x8,ldr-rgb-kodak12.png,37.8259,0.0918,0.0684,5.7511 -Kodak,8x8,ldr-rgb-kodak13.png,28.3927,0.3063,0.2805,1.4020 -Kodak,8x8,ldr-rgb-kodak14.png,32.1340,0.2180,0.1930,2.0369 -Kodak,8x8,ldr-rgb-kodak15.png,35.8359,0.1355,0.1096,3.5878 -Kodak,8x8,ldr-rgb-kodak16.png,37.0213,0.1075,0.0841,4.6754 -Kodak,8x8,ldr-rgb-kodak17.png,35.6807,0.1127,0.0850,4.6255 -Kodak,8x8,ldr-rgb-kodak18.png,31.5529,0.2194,0.1900,2.0694 -Kodak,8x8,ldr-rgb-kodak19.png,34.7649,0.1566,0.1279,3.0738 -Kodak,8x8,ldr-rgb-kodak20.png,35.8945,0.1173,0.0944,4.1675 -Kodak,8x8,ldr-rgb-kodak21.png,33.1150,0.1665,0.1422,2.7659 -Kodak,8x8,ldr-rgb-kodak22.png,34.0244,0.1827,0.1560,2.5211 -Kodak,8x8,ldr-rgb-kodak23.png,37.6470,0.0922,0.0675,5.8229 -Kodak,8x8,ldr-rgb-kodak24.png,31.1140,0.1886,0.1615,2.4343 -Kodak,12x12,ldr-rgb-kodak01.png,27.7578,0.2813,0.2480,1.5856 -Kodak,12x12,ldr-rgb-kodak02.png,32.4621,0.1102,0.0762,5.1581 -Kodak,12x12,ldr-rgb-kodak03.png,33.7766,0.0890,0.0576,6.8214 -Kodak,12x12,ldr-rgb-kodak04.png,32.4443,0.1043,0.0676,5.8164 -Kodak,12x12,ldr-rgb-kodak05.png,26.3986,0.2996,0.2656,1.4804 -Kodak,12x12,ldr-rgb-kodak06.png,29.3737,0.1796,0.1469,2.6762 -Kodak,12x12,ldr-rgb-kodak07.png,32.0414,0.1261,0.0902,4.3610 -Kodak,12x12,ldr-rgb-kodak08.png,26.0600,0.3002,0.2635,1.4925 -Kodak,12x12,ldr-rgb-kodak09.png,33.0989,0.0939,0.0590,6.6622 -Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0965,0.0606,6.4909 -Kodak,12x12,ldr-rgb-kodak11.png,29.7433,0.1592,0.1266,3.1053 -Kodak,12x12,ldr-rgb-kodak12.png,33.8819,0.0847,0.0527,7.4588 -Kodak,12x12,ldr-rgb-kodak13.png,24.5282,0.3432,0.3092,1.2718 -Kodak,12x12,ldr-rgb-kodak14.png,28.4176,0.2150,0.1818,2.1625 -Kodak,12x12,ldr-rgb-kodak15.png,32.2342,0.1199,0.0857,4.5858 -Kodak,12x12,ldr-rgb-kodak16.png,32.9807,0.0944,0.0626,6.2826 -Kodak,12x12,ldr-rgb-kodak17.png,31.7805,0.1050,0.0690,5.6984 -Kodak,12x12,ldr-rgb-kodak18.png,27.7783,0.2126,0.1750,2.2466 -Kodak,12x12,ldr-rgb-kodak19.png,30.8882,0.1364,0.0998,3.9415 -Kodak,12x12,ldr-rgb-kodak20.png,31.8562,0.1047,0.0732,5.3682 -Kodak,12x12,ldr-rgb-kodak21.png,29.1771,0.1910,0.1584,2.4823 -Kodak,12x12,ldr-rgb-kodak22.png,30.4983,0.1482,0.1131,3.4758 -Kodak,12x12,ldr-rgb-kodak23.png,33.5464,0.0802,0.0475,8.2701 -Kodak,12x12,ldr-rgb-kodak24.png,27.0976,0.1918,0.1567,2.5086 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index 1ae4037ae87971d9b559f7338aff621319f237e4..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.4944,0.4098,0.3911,1.0055 -Kodak,4x4,ldr-rgb-kodak02.png,45.6493,0.4895,0.4697,0.8372 -Kodak,4x4,ldr-rgb-kodak03.png,47.9884,0.4219,0.4046,0.9719 -Kodak,4x4,ldr-rgb-kodak04.png,45.6562,0.4617,0.4391,0.8956 -Kodak,4x4,ldr-rgb-kodak05.png,42.4063,0.4574,0.4372,0.8993 -Kodak,4x4,ldr-rgb-kodak06.png,45.3572,0.4090,0.3905,1.0071 -Kodak,4x4,ldr-rgb-kodak07.png,46.3419,0.4590,0.4371,0.8995 -Kodak,4x4,ldr-rgb-kodak08.png,42.8054,0.4859,0.4626,0.8500 -Kodak,4x4,ldr-rgb-kodak09.png,47.4208,0.4680,0.4469,0.8799 -Kodak,4x4,ldr-rgb-kodak10.png,47.0603,0.4647,0.4428,0.8881 -Kodak,4x4,ldr-rgb-kodak11.png,45.1121,0.4325,0.4136,0.9507 -Kodak,4x4,ldr-rgb-kodak12.png,48.2457,0.4337,0.4159,0.9454 -Kodak,4x4,ldr-rgb-kodak13.png,41.7174,0.4160,0.3959,0.9933 -Kodak,4x4,ldr-rgb-kodak14.png,42.9405,0.4440,0.4248,0.9256 -Kodak,4x4,ldr-rgb-kodak15.png,45.7858,0.4420,0.4215,0.9330 -Kodak,4x4,ldr-rgb-kodak16.png,48.0652,0.4279,0.4096,0.9600 -Kodak,4x4,ldr-rgb-kodak17.png,46.4610,0.4467,0.4245,0.9263 -Kodak,4x4,ldr-rgb-kodak18.png,42.1541,0.4868,0.4631,0.8491 -Kodak,4x4,ldr-rgb-kodak19.png,45.5439,0.4639,0.4411,0.8914 -Kodak,4x4,ldr-rgb-kodak20.png,47.1284,0.2937,0.2766,1.4214 -Kodak,4x4,ldr-rgb-kodak21.png,45.3018,0.4541,0.4351,0.9038 -Kodak,4x4,ldr-rgb-kodak22.png,43.9797,0.4945,0.4733,0.8308 -Kodak,4x4,ldr-rgb-kodak23.png,47.1533,0.4800,0.4612,0.8527 -Kodak,4x4,ldr-rgb-kodak24.png,42.5030,0.4462,0.4254,0.9244 -Kodak,5x5,ldr-rgb-kodak01.png,40.2326,0.5264,0.5062,0.7769 -Kodak,5x5,ldr-rgb-kodak02.png,41.9976,0.6133,0.5915,0.6647 -Kodak,5x5,ldr-rgb-kodak03.png,44.3239,0.5081,0.4892,0.8039 -Kodak,5x5,ldr-rgb-kodak04.png,42.2394,0.5551,0.5313,0.7401 -Kodak,5x5,ldr-rgb-kodak05.png,38.1756,0.5761,0.5548,0.7088 -Kodak,5x5,ldr-rgb-kodak06.png,41.0844,0.5040,0.4835,0.8133 -Kodak,5x5,ldr-rgb-kodak07.png,42.7249,0.5528,0.5296,0.7424 -Kodak,5x5,ldr-rgb-kodak08.png,38.5334,0.5896,0.5649,0.6961 -Kodak,5x5,ldr-rgb-kodak09.png,44.0288,0.5546,0.5318,0.7394 -Kodak,5x5,ldr-rgb-kodak10.png,43.5935,0.5625,0.5385,0.7302 -Kodak,5x5,ldr-rgb-kodak11.png,40.9987,0.5261,0.5052,0.7783 -Kodak,5x5,ldr-rgb-kodak12.png,44.5960,0.5166,0.4972,0.7908 -Kodak,5x5,ldr-rgb-kodak13.png,36.9510,0.5165,0.4949,0.7945 -Kodak,5x5,ldr-rgb-kodak14.png,38.8797,0.5528,0.5313,0.7401 -Kodak,5x5,ldr-rgb-kodak15.png,42.1246,0.5281,0.5063,0.7767 -Kodak,5x5,ldr-rgb-kodak16.png,44.2686,0.5183,0.4991,0.7878 -Kodak,5x5,ldr-rgb-kodak17.png,42.6009,0.5407,0.5170,0.7606 -Kodak,5x5,ldr-rgb-kodak18.png,38.4550,0.5980,0.5726,0.6867 -Kodak,5x5,ldr-rgb-kodak19.png,41.7719,0.5753,0.5515,0.7130 -Kodak,5x5,ldr-rgb-kodak20.png,43.2708,0.3636,0.3448,1.1405 -Kodak,5x5,ldr-rgb-kodak21.png,40.8630,0.5701,0.5497,0.7154 -Kodak,5x5,ldr-rgb-kodak22.png,40.4255,0.6132,0.5907,0.6657 -Kodak,5x5,ldr-rgb-kodak23.png,43.8841,0.5957,0.5751,0.6837 -Kodak,5x5,ldr-rgb-kodak24.png,38.2272,0.5480,0.5257,0.7480 -Kodak,6x6,ldr-rgb-kodak01.png,36.3116,0.6281,0.6072,0.6476 -Kodak,6x6,ldr-rgb-kodak02.png,39.3780,0.7153,0.6933,0.5672 -Kodak,6x6,ldr-rgb-kodak03.png,41.7331,0.4458,0.4262,0.9227 -Kodak,6x6,ldr-rgb-kodak04.png,39.6521,0.6231,0.5987,0.6568 -Kodak,6x6,ldr-rgb-kodak05.png,34.9741,0.6786,0.6563,0.5991 -Kodak,6x6,ldr-rgb-kodak06.png,37.7401,0.5643,0.5433,0.7238 -Kodak,6x6,ldr-rgb-kodak07.png,40.1032,0.5147,0.4905,0.8016 -Kodak,6x6,ldr-rgb-kodak08.png,35.1660,0.6866,0.6611,0.5948 -Kodak,6x6,ldr-rgb-kodak09.png,41.2613,0.6273,0.6041,0.6509 -Kodak,6x6,ldr-rgb-kodak10.png,40.8141,0.6426,0.6185,0.6358 -Kodak,6x6,ldr-rgb-kodak11.png,37.7541,0.5795,0.5588,0.7037 -Kodak,6x6,ldr-rgb-kodak12.png,41.8249,0.5422,0.5220,0.7533 -Kodak,6x6,ldr-rgb-kodak13.png,32.9256,0.6354,0.6125,0.6420 -Kodak,6x6,ldr-rgb-kodak14.png,36.0210,0.6551,0.6335,0.6207 -Kodak,6x6,ldr-rgb-kodak15.png,39.4514,0.5306,0.5080,0.7741 -Kodak,6x6,ldr-rgb-kodak16.png,41.2290,0.5256,0.5056,0.7777 -Kodak,6x6,ldr-rgb-kodak17.png,39.6521,0.6038,0.5797,0.6783 -Kodak,6x6,ldr-rgb-kodak18.png,35.4328,0.7180,0.6923,0.5680 -Kodak,6x6,ldr-rgb-kodak19.png,38.6954,0.6789,0.6536,0.6016 -Kodak,6x6,ldr-rgb-kodak20.png,40.0953,0.4182,0.3985,0.9869 -Kodak,6x6,ldr-rgb-kodak21.png,37.3344,0.6675,0.6462,0.6085 -Kodak,6x6,ldr-rgb-kodak22.png,37.6231,0.7261,0.7028,0.5595 -Kodak,6x6,ldr-rgb-kodak23.png,41.4033,0.6239,0.6027,0.6525 -Kodak,6x6,ldr-rgb-kodak24.png,35.1417,0.5973,0.5740,0.6850 -Kodak,8x8,ldr-rgb-kodak01.png,31.9071,0.7634,0.7373,0.5333 -Kodak,8x8,ldr-rgb-kodak02.png,36.1354,0.6667,0.6392,0.6152 -Kodak,8x8,ldr-rgb-kodak03.png,38.1744,0.3553,0.3302,1.1909 -Kodak,8x8,ldr-rgb-kodak04.png,36.3637,0.5707,0.5407,0.7273 -Kodak,8x8,ldr-rgb-kodak05.png,30.9009,0.7740,0.7468,0.5265 -Kodak,8x8,ldr-rgb-kodak06.png,33.5749,0.6285,0.6025,0.6527 -Kodak,8x8,ldr-rgb-kodak07.png,36.4888,0.4268,0.3974,0.9894 -Kodak,8x8,ldr-rgb-kodak08.png,30.7484,0.8272,0.7968,0.4935 -Kodak,8x8,ldr-rgb-kodak09.png,37.5499,0.4015,0.3730,1.0542 -Kodak,8x8,ldr-rgb-kodak10.png,37.2288,0.4474,0.4180,0.9407 -Kodak,8x8,ldr-rgb-kodak11.png,33.8276,0.6812,0.6549,0.6004 -Kodak,8x8,ldr-rgb-kodak12.png,38.2490,0.4203,0.3954,0.9945 -Kodak,8x8,ldr-rgb-kodak13.png,28.4502,0.8473,0.8190,0.4801 -Kodak,8x8,ldr-rgb-kodak14.png,32.3258,0.7754,0.7485,0.5253 -Kodak,8x8,ldr-rgb-kodak15.png,36.0605,0.5259,0.4985,0.7888 -Kodak,8x8,ldr-rgb-kodak16.png,37.2636,0.4983,0.4728,0.8316 -Kodak,8x8,ldr-rgb-kodak17.png,35.8722,0.4829,0.4533,0.8674 -Kodak,8x8,ldr-rgb-kodak18.png,31.6495,0.7859,0.7549,0.5209 -Kodak,8x8,ldr-rgb-kodak19.png,34.9142,0.5389,0.5095,0.7718 -Kodak,8x8,ldr-rgb-kodak20.png,36.1470,0.4117,0.3872,1.0156 -Kodak,8x8,ldr-rgb-kodak21.png,33.2221,0.5529,0.5265,0.7469 -Kodak,8x8,ldr-rgb-kodak22.png,34.2197,0.6997,0.6711,0.5860 -Kodak,8x8,ldr-rgb-kodak23.png,38.1768,0.3932,0.3665,1.0728 -Kodak,8x8,ldr-rgb-kodak24.png,31.2175,0.6389,0.6108,0.6438 -Kodak,12x12,ldr-rgb-kodak01.png,27.9058,0.8665,0.8304,0.4735 -Kodak,12x12,ldr-rgb-kodak02.png,32.9642,0.5741,0.5372,0.7320 -Kodak,12x12,ldr-rgb-kodak03.png,34.4219,0.3530,0.3185,1.2346 -Kodak,12x12,ldr-rgb-kodak04.png,32.9599,0.5146,0.4749,0.8280 -Kodak,12x12,ldr-rgb-kodak05.png,26.5927,0.9079,0.8714,0.4513 -Kodak,12x12,ldr-rgb-kodak06.png,29.5304,0.6499,0.6142,0.6402 -Kodak,12x12,ldr-rgb-kodak07.png,32.6109,0.4292,0.3906,1.0068 -Kodak,12x12,ldr-rgb-kodak08.png,26.2744,0.8942,0.8539,0.4605 -Kodak,12x12,ldr-rgb-kodak09.png,33.6251,0.3877,0.3497,1.1245 -Kodak,12x12,ldr-rgb-kodak10.png,32.9833,0.3845,0.3449,1.1400 -Kodak,12x12,ldr-rgb-kodak11.png,30.0468,0.6591,0.6234,0.6307 -Kodak,12x12,ldr-rgb-kodak12.png,34.4395,0.3650,0.3298,1.1924 -Kodak,12x12,ldr-rgb-kodak13.png,24.5820,1.0253,0.9882,0.3979 -Kodak,12x12,ldr-rgb-kodak14.png,28.6287,0.8154,0.7792,0.5047 -Kodak,12x12,ldr-rgb-kodak15.png,32.7197,0.4926,0.4555,0.8632 -Kodak,12x12,ldr-rgb-kodak16.png,33.3355,0.4772,0.4421,0.8895 -Kodak,12x12,ldr-rgb-kodak17.png,32.1409,0.4333,0.3944,0.9970 -Kodak,12x12,ldr-rgb-kodak18.png,27.9217,0.7837,0.7423,0.5297 -Kodak,12x12,ldr-rgb-kodak19.png,31.1006,0.6179,0.5790,0.6791 -Kodak,12x12,ldr-rgb-kodak20.png,32.1470,0.4558,0.4221,0.9316 -Kodak,12x12,ldr-rgb-kodak21.png,29.3170,0.5895,0.5539,0.7100 -Kodak,12x12,ldr-rgb-kodak22.png,30.7805,0.6694,0.6312,0.6230 -Kodak,12x12,ldr-rgb-kodak23.png,34.3635,0.3280,0.2920,1.3467 -Kodak,12x12,ldr-rgb-kodak24.png,27.2253,0.7025,0.6647,0.5915 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index 5f3e7badb3bc902bacf940cdce022df0f41d9536..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.8489,0.0384,0.0211,18.6482 -Kodak,4x4,ldr-rgb-kodak02.png,44.2380,0.0476,0.0292,13.4553 -Kodak,4x4,ldr-rgb-kodak03.png,46.6338,0.0334,0.0177,22.2067 -Kodak,4x4,ldr-rgb-kodak04.png,44.5665,0.0473,0.0264,14.8968 -Kodak,4x4,ldr-rgb-kodak05.png,41.5682,0.0563,0.0383,10.2676 -Kodak,4x4,ldr-rgb-kodak06.png,44.7452,0.0378,0.0208,18.9156 -Kodak,4x4,ldr-rgb-kodak07.png,45.0418,0.0435,0.0227,17.2857 -Kodak,4x4,ldr-rgb-kodak08.png,42.0821,0.0624,0.0399,9.8508 -Kodak,4x4,ldr-rgb-kodak09.png,46.2551,0.0359,0.0166,23.6678 -Kodak,4x4,ldr-rgb-kodak10.png,46.0288,0.0380,0.0173,22.7015 -Kodak,4x4,ldr-rgb-kodak11.png,44.2450,0.0417,0.0247,15.9210 -Kodak,4x4,ldr-rgb-kodak12.png,47.0135,0.0321,0.0162,24.2875 -Kodak,4x4,ldr-rgb-kodak13.png,41.4309,0.0526,0.0340,11.5539 -Kodak,4x4,ldr-rgb-kodak14.png,41.8065,0.0490,0.0313,12.5428 -Kodak,4x4,ldr-rgb-kodak15.png,44.5942,0.0475,0.0282,13.9612 -Kodak,4x4,ldr-rgb-kodak16.png,47.1801,0.0304,0.0145,27.2008 -Kodak,4x4,ldr-rgb-kodak17.png,45.7548,0.0366,0.0158,24.8227 -Kodak,4x4,ldr-rgb-kodak18.png,41.6128,0.0605,0.0380,10.3600 -Kodak,4x4,ldr-rgb-kodak19.png,44.8023,0.0416,0.0205,19.1784 -Kodak,4x4,ldr-rgb-kodak20.png,46.3894,0.0335,0.0182,21.6136 -Kodak,4x4,ldr-rgb-kodak21.png,44.5781,0.0386,0.0216,18.1836 -Kodak,4x4,ldr-rgb-kodak22.png,43.1599,0.0519,0.0319,12.3196 -Kodak,4x4,ldr-rgb-kodak23.png,45.5706,0.0384,0.0205,19.1635 -Kodak,4x4,ldr-rgb-kodak24.png,41.8541,0.0513,0.0315,12.4878 -Kodak,5x5,ldr-rgb-kodak01.png,39.6106,0.0393,0.0205,19.1802 -Kodak,5x5,ldr-rgb-kodak02.png,40.6312,0.0394,0.0200,19.6845 -Kodak,5x5,ldr-rgb-kodak03.png,43.0303,0.0303,0.0138,28.4754 -Kodak,5x5,ldr-rgb-kodak04.png,41.2378,0.0411,0.0190,20.7481 -Kodak,5x5,ldr-rgb-kodak05.png,37.4134,0.0540,0.0345,11.3913 -Kodak,5x5,ldr-rgb-kodak06.png,40.5758,0.0350,0.0173,22.7357 -Kodak,5x5,ldr-rgb-kodak07.png,41.4746,0.0391,0.0176,22.3584 -Kodak,5x5,ldr-rgb-kodak08.png,37.7544,0.0587,0.0357,11.0077 -Kodak,5x5,ldr-rgb-kodak09.png,42.9020,0.0331,0.0126,31.1435 -Kodak,5x5,ldr-rgb-kodak10.png,42.6178,0.0350,0.0134,29.3929 -Kodak,5x5,ldr-rgb-kodak11.png,40.2886,0.0369,0.0192,20.4299 -Kodak,5x5,ldr-rgb-kodak12.png,43.4048,0.0287,0.0118,33.3772 -Kodak,5x5,ldr-rgb-kodak13.png,36.8038,0.0511,0.0319,12.3293 -Kodak,5x5,ldr-rgb-kodak14.png,37.9374,0.0486,0.0300,13.1186 -Kodak,5x5,ldr-rgb-kodak15.png,41.1606,0.0391,0.0193,20.3951 -Kodak,5x5,ldr-rgb-kodak16.png,43.4729,0.0279,0.0109,35.9302 -Kodak,5x5,ldr-rgb-kodak17.png,42.0129,0.0341,0.0123,31.8983 -Kodak,5x5,ldr-rgb-kodak18.png,38.0842,0.0510,0.0275,14.3102 -Kodak,5x5,ldr-rgb-kodak19.png,41.1186,0.0377,0.0155,25.3068 -Kodak,5x5,ldr-rgb-kodak20.png,42.3441,0.0304,0.0142,27.6523 -Kodak,5x5,ldr-rgb-kodak21.png,40.4026,0.0362,0.0185,21.2872 -Kodak,5x5,ldr-rgb-kodak22.png,39.7574,0.0425,0.0219,17.9167 -Kodak,5x5,ldr-rgb-kodak23.png,42.4861,0.0330,0.0145,27.0678 -Kodak,5x5,ldr-rgb-kodak24.png,37.7908,0.0462,0.0252,15.5983 -Kodak,6x6,ldr-rgb-kodak01.png,35.7514,0.0497,0.0302,13.0285 -Kodak,6x6,ldr-rgb-kodak02.png,38.1633,0.0414,0.0212,18.5831 -Kodak,6x6,ldr-rgb-kodak03.png,40.5315,0.0312,0.0141,27.9508 -Kodak,6x6,ldr-rgb-kodak04.png,38.5310,0.0424,0.0198,19.8434 -Kodak,6x6,ldr-rgb-kodak05.png,34.3246,0.0639,0.0438,8.9851 -Kodak,6x6,ldr-rgb-kodak06.png,37.2781,0.0397,0.0210,18.7024 -Kodak,6x6,ldr-rgb-kodak07.png,38.8424,0.0413,0.0193,20.4110 -Kodak,6x6,ldr-rgb-kodak08.png,34.4294,0.0683,0.0446,8.8116 -Kodak,6x6,ldr-rgb-kodak09.png,39.9499,0.0356,0.0148,26.6570 -Kodak,6x6,ldr-rgb-kodak10.png,39.7100,0.0364,0.0142,27.7734 -Kodak,6x6,ldr-rgb-kodak11.png,37.1255,0.0417,0.0232,16.9739 -Kodak,6x6,ldr-rgb-kodak12.png,40.7229,0.0301,0.0122,32.1175 -Kodak,6x6,ldr-rgb-kodak13.png,32.7806,0.0683,0.0483,8.1487 -Kodak,6x6,ldr-rgb-kodak14.png,35.2350,0.0551,0.0359,10.9616 -Kodak,6x6,ldr-rgb-kodak15.png,38.5238,0.0411,0.0205,19.2131 -Kodak,6x6,ldr-rgb-kodak16.png,40.4988,0.0296,0.0122,32.1702 -Kodak,6x6,ldr-rgb-kodak17.png,38.9257,0.0369,0.0148,26.6514 -Kodak,6x6,ldr-rgb-kodak18.png,35.0961,0.0560,0.0317,12.3999 -Kodak,6x6,ldr-rgb-kodak19.png,37.9622,0.0427,0.0202,19.4778 -Kodak,6x6,ldr-rgb-kodak20.png,39.1651,0.0335,0.0167,23.5076 -Kodak,6x6,ldr-rgb-kodak21.png,36.8830,0.0425,0.0244,16.1280 -Kodak,6x6,ldr-rgb-kodak22.png,36.9688,0.0458,0.0244,16.0845 -Kodak,6x6,ldr-rgb-kodak23.png,40.0315,0.0335,0.0145,27.2085 -Kodak,6x6,ldr-rgb-kodak24.png,34.7652,0.0515,0.0303,12.9680 -Kodak,8x8,ldr-rgb-kodak01.png,31.3198,0.0661,0.0427,9.2101 -Kodak,8x8,ldr-rgb-kodak02.png,34.8859,0.0456,0.0216,18.1808 -Kodak,8x8,ldr-rgb-kodak03.png,36.5587,0.0369,0.0161,24.3931 -Kodak,8x8,ldr-rgb-kodak04.png,35.1631,0.0468,0.0200,19.6215 -Kodak,8x8,ldr-rgb-kodak05.png,30.2290,0.0824,0.0584,6.7293 -Kodak,8x8,ldr-rgb-kodak06.png,32.8875,0.0528,0.0301,13.0685 -Kodak,8x8,ldr-rgb-kodak07.png,34.9574,0.0480,0.0229,17.1838 -Kodak,8x8,ldr-rgb-kodak08.png,29.9727,0.0918,0.0640,6.1405 -Kodak,8x8,ldr-rgb-kodak09.png,36.0644,0.0426,0.0176,22.3040 -Kodak,8x8,ldr-rgb-kodak10.png,35.8574,0.0427,0.0166,23.7219 -Kodak,8x8,ldr-rgb-kodak11.png,32.9724,0.0519,0.0299,13.1357 -Kodak,8x8,ldr-rgb-kodak12.png,36.6491,0.0370,0.0157,25.0443 -Kodak,8x8,ldr-rgb-kodak13.png,28.2115,0.0954,0.0715,5.5019 -Kodak,8x8,ldr-rgb-kodak14.png,31.4868,0.0689,0.0456,8.6302 -Kodak,8x8,ldr-rgb-kodak15.png,34.9071,0.0469,0.0224,17.5785 -Kodak,8x8,ldr-rgb-kodak16.png,36.0183,0.0390,0.0177,22.2585 -Kodak,8x8,ldr-rgb-kodak17.png,34.8533,0.0454,0.0192,20.4525 -Kodak,8x8,ldr-rgb-kodak18.png,31.2426,0.0677,0.0398,9.8734 -Kodak,8x8,ldr-rgb-kodak19.png,34.0758,0.0519,0.0248,15.8364 -Kodak,8x8,ldr-rgb-kodak20.png,35.2054,0.0403,0.0194,20.2812 -Kodak,8x8,ldr-rgb-kodak21.png,32.7363,0.0530,0.0309,12.7180 -Kodak,8x8,ldr-rgb-kodak22.png,33.4351,0.0525,0.0267,14.7289 -Kodak,8x8,ldr-rgb-kodak23.png,36.4996,0.0376,0.0145,27.1203 -Kodak,8x8,ldr-rgb-kodak24.png,30.8082,0.0638,0.0387,10.1543 -Kodak,12x12,ldr-rgb-kodak01.png,27.1019,0.0619,0.0317,12.4153 -Kodak,12x12,ldr-rgb-kodak02.png,31.0998,0.0423,0.0115,34.2669 -Kodak,12x12,ldr-rgb-kodak03.png,32.6801,0.0379,0.0102,38.4597 -Kodak,12x12,ldr-rgb-kodak04.png,31.5605,0.0435,0.0100,39.3376 -Kodak,12x12,ldr-rgb-kodak05.png,25.8046,0.0693,0.0385,10.2107 -Kodak,12x12,ldr-rgb-kodak06.png,28.6329,0.0522,0.0233,16.9059 -Kodak,12x12,ldr-rgb-kodak07.png,30.8575,0.0453,0.0128,30.7080 -Kodak,12x12,ldr-rgb-kodak08.png,25.3858,0.0812,0.0464,8.4753 -Kodak,12x12,ldr-rgb-kodak09.png,31.8332,0.0430,0.0116,33.9272 -Kodak,12x12,ldr-rgb-kodak10.png,31.5261,0.0452,0.0121,32.5004 -Kodak,12x12,ldr-rgb-kodak11.png,28.9305,0.0471,0.0183,21.5084 -Kodak,12x12,ldr-rgb-kodak12.png,32.2648,0.0382,0.0102,38.3961 -Kodak,12x12,ldr-rgb-kodak13.png,24.3204,0.0844,0.0532,7.3974 -Kodak,12x12,ldr-rgb-kodak14.png,27.5269,0.0553,0.0258,15.2250 -Kodak,12x12,ldr-rgb-kodak15.png,31.2436,0.0452,0.0141,27.7949 -Kodak,12x12,ldr-rgb-kodak16.png,31.4839,0.0401,0.0118,33.2078 -Kodak,12x12,ldr-rgb-kodak17.png,30.8893,0.0461,0.0132,29.8661 -Kodak,12x12,ldr-rgb-kodak18.png,27.4177,0.0595,0.0253,15.5434 -Kodak,12x12,ldr-rgb-kodak19.png,30.1727,0.0509,0.0174,22.5649 -Kodak,12x12,ldr-rgb-kodak20.png,31.0405,0.0412,0.0138,28.5187 -Kodak,12x12,ldr-rgb-kodak21.png,28.7196,0.0517,0.0225,17.4531 -Kodak,12x12,ldr-rgb-kodak22.png,29.8238,0.0460,0.0142,27.7109 -Kodak,12x12,ldr-rgb-kodak23.png,32.5185,0.0401,0.0106,36.9426 -Kodak,12x12,ldr-rgb-kodak24.png,26.7652,0.0613,0.0296,13.2813 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 8192a51fd65a64d29a8ec5d5f5ea9284c41ff051..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,44.5072,0.0328,0.0160,24.5961 -Kodak,4x4,ldr-rgb-kodak02.png,43.8025,0.0379,0.0202,19.4643 -Kodak,4x4,ldr-rgb-kodak03.png,46.0406,0.0281,0.0132,29.7439 -Kodak,4x4,ldr-rgb-kodak04.png,44.1429,0.0394,0.0189,20.8338 -Kodak,4x4,ldr-rgb-kodak05.png,40.9879,0.0425,0.0247,15.8875 -Kodak,4x4,ldr-rgb-kodak06.png,44.4296,0.0323,0.0162,24.2907 -Kodak,4x4,ldr-rgb-kodak07.png,44.6051,0.0362,0.0167,23.5600 -Kodak,4x4,ldr-rgb-kodak08.png,41.5000,0.0468,0.0254,15.4797 -Kodak,4x4,ldr-rgb-kodak09.png,45.9005,0.0316,0.0128,30.6248 -Kodak,4x4,ldr-rgb-kodak10.png,45.6663,0.0337,0.0135,29.0476 -Kodak,4x4,ldr-rgb-kodak11.png,43.8292,0.0340,0.0179,21.9245 -Kodak,4x4,ldr-rgb-kodak12.png,46.4729,0.0281,0.0127,30.9495 -Kodak,4x4,ldr-rgb-kodak13.png,41.1509,0.0425,0.0249,15.7873 -Kodak,4x4,ldr-rgb-kodak14.png,41.0931,0.0370,0.0202,19.5087 -Kodak,4x4,ldr-rgb-kodak15.png,44.1027,0.0373,0.0190,20.7207 -Kodak,4x4,ldr-rgb-kodak16.png,47.0422,0.0273,0.0120,32.6723 -Kodak,4x4,ldr-rgb-kodak17.png,45.4973,0.0326,0.0125,31.4200 -Kodak,4x4,ldr-rgb-kodak18.png,41.2449,0.0468,0.0253,15.5427 -Kodak,4x4,ldr-rgb-kodak19.png,44.5301,0.0365,0.0157,24.9870 -Kodak,4x4,ldr-rgb-kodak20.png,45.8602,0.0285,0.0137,28.6520 -Kodak,4x4,ldr-rgb-kodak21.png,44.2614,0.0325,0.0164,23.9316 -Kodak,4x4,ldr-rgb-kodak22.png,42.7742,0.0410,0.0216,18.2288 -Kodak,4x4,ldr-rgb-kodak23.png,45.2565,0.0320,0.0153,25.7103 -Kodak,4x4,ldr-rgb-kodak24.png,41.2205,0.0400,0.0210,18.7183 -Kodak,5x5,ldr-rgb-kodak01.png,39.3652,0.0351,0.0174,22.6221 -Kodak,5x5,ldr-rgb-kodak02.png,40.3762,0.0342,0.0155,25.3753 -Kodak,5x5,ldr-rgb-kodak03.png,42.6004,0.0264,0.0110,35.6429 -Kodak,5x5,ldr-rgb-kodak04.png,40.7711,0.0361,0.0150,26.1274 -Kodak,5x5,ldr-rgb-kodak05.png,36.9823,0.0434,0.0248,15.8773 -Kodak,5x5,ldr-rgb-kodak06.png,40.4008,0.0314,0.0144,27.3429 -Kodak,5x5,ldr-rgb-kodak07.png,41.1154,0.0344,0.0141,27.8998 -Kodak,5x5,ldr-rgb-kodak08.png,37.3666,0.0478,0.0256,15.3330 -Kodak,5x5,ldr-rgb-kodak09.png,42.5422,0.0301,0.0108,36.5618 -Kodak,5x5,ldr-rgb-kodak10.png,42.3455,0.0321,0.0112,35.0714 -Kodak,5x5,ldr-rgb-kodak11.png,40.0401,0.0319,0.0154,25.5336 -Kodak,5x5,ldr-rgb-kodak12.png,43.1448,0.0262,0.0102,38.7061 -Kodak,5x5,ldr-rgb-kodak13.png,36.6876,0.0436,0.0255,15.4221 -Kodak,5x5,ldr-rgb-kodak14.png,37.3962,0.0374,0.0200,19.6559 -Kodak,5x5,ldr-rgb-kodak15.png,40.8535,0.0337,0.0147,26.7638 -Kodak,5x5,ldr-rgb-kodak16.png,43.3795,0.0261,0.0101,38.9824 -Kodak,5x5,ldr-rgb-kodak17.png,41.8560,0.0317,0.0111,35.4475 -Kodak,5x5,ldr-rgb-kodak18.png,37.9129,0.0431,0.0210,18.6810 -Kodak,5x5,ldr-rgb-kodak19.png,40.8503,0.0349,0.0135,29.0200 -Kodak,5x5,ldr-rgb-kodak20.png,42.0160,0.0271,0.0117,33.5476 -Kodak,5x5,ldr-rgb-kodak21.png,40.1806,0.0323,0.0152,25.8134 -Kodak,5x5,ldr-rgb-kodak22.png,39.4506,0.0367,0.0168,23.3806 -Kodak,5x5,ldr-rgb-kodak23.png,42.1119,0.0299,0.0123,31.8576 -Kodak,5x5,ldr-rgb-kodak24.png,37.5517,0.0386,0.0191,20.5863 -Kodak,6x6,ldr-rgb-kodak01.png,35.6562,0.0399,0.0219,17.9706 -Kodak,6x6,ldr-rgb-kodak02.png,38.0339,0.0342,0.0153,25.7071 -Kodak,6x6,ldr-rgb-kodak03.png,40.3032,0.0264,0.0105,37.4136 -Kodak,6x6,ldr-rgb-kodak04.png,38.2918,0.0360,0.0143,27.4553 -Kodak,6x6,ldr-rgb-kodak05.png,34.0896,0.0460,0.0276,14.2258 -Kodak,6x6,ldr-rgb-kodak06.png,37.2222,0.0334,0.0162,24.2397 -Kodak,6x6,ldr-rgb-kodak07.png,38.6336,0.0348,0.0142,27.6969 -Kodak,6x6,ldr-rgb-kodak08.png,34.2253,0.0505,0.0285,13.8029 -Kodak,6x6,ldr-rgb-kodak09.png,39.7573,0.0311,0.0112,35.1589 -Kodak,6x6,ldr-rgb-kodak10.png,39.5669,0.0325,0.0112,34.9562 -Kodak,6x6,ldr-rgb-kodak11.png,36.9968,0.0335,0.0164,24.0292 -Kodak,6x6,ldr-rgb-kodak12.png,40.5658,0.0262,0.0101,39.1035 -Kodak,6x6,ldr-rgb-kodak13.png,32.7154,0.0511,0.0324,12.1506 -Kodak,6x6,ldr-rgb-kodak14.png,34.8624,0.0394,0.0213,18.4393 -Kodak,6x6,ldr-rgb-kodak15.png,38.3699,0.0341,0.0148,26.4917 -Kodak,6x6,ldr-rgb-kodak16.png,40.4581,0.0266,0.0103,38.1801 -Kodak,6x6,ldr-rgb-kodak17.png,38.8420,0.0327,0.0118,33.4537 -Kodak,6x6,ldr-rgb-kodak18.png,35.0034,0.0449,0.0224,17.5152 -Kodak,6x6,ldr-rgb-kodak19.png,37.8298,0.0371,0.0154,25.5170 -Kodak,6x6,ldr-rgb-kodak20.png,39.0123,0.0280,0.0125,31.4626 -Kodak,6x6,ldr-rgb-kodak21.png,36.8075,0.0343,0.0173,22.7674 -Kodak,6x6,ldr-rgb-kodak22.png,36.8498,0.0372,0.0173,22.7266 -Kodak,6x6,ldr-rgb-kodak23.png,39.8307,0.0290,0.0113,34.8410 -Kodak,6x6,ldr-rgb-kodak24.png,34.6916,0.0408,0.0209,18.8195 -Kodak,8x8,ldr-rgb-kodak01.png,31.1792,0.0521,0.0304,12.9364 -Kodak,8x8,ldr-rgb-kodak02.png,34.7811,0.0387,0.0164,24.0058 -Kodak,8x8,ldr-rgb-kodak03.png,36.4262,0.0319,0.0125,31.4050 -Kodak,8x8,ldr-rgb-kodak04.png,35.0547,0.0404,0.0155,25.4328 -Kodak,8x8,ldr-rgb-kodak05.png,30.0205,0.0602,0.0379,10.3641 -Kodak,8x8,ldr-rgb-kodak06.png,32.7989,0.0429,0.0223,17.6226 -Kodak,8x8,ldr-rgb-kodak07.png,34.8360,0.0412,0.0173,22.6675 -Kodak,8x8,ldr-rgb-kodak08.png,29.7069,0.0665,0.0407,9.6723 -Kodak,8x8,ldr-rgb-kodak09.png,35.8914,0.0371,0.0137,28.7459 -Kodak,8x8,ldr-rgb-kodak10.png,35.7051,0.0378,0.0132,29.8208 -Kodak,8x8,ldr-rgb-kodak11.png,32.8451,0.0417,0.0212,18.5384 -Kodak,8x8,ldr-rgb-kodak12.png,36.5111,0.0320,0.0124,31.8109 -Kodak,8x8,ldr-rgb-kodak13.png,28.1364,0.0699,0.0474,8.2901 -Kodak,8x8,ldr-rgb-kodak14.png,31.2591,0.0510,0.0295,13.3374 -Kodak,8x8,ldr-rgb-kodak15.png,34.7599,0.0393,0.0166,23.6552 -Kodak,8x8,ldr-rgb-kodak16.png,35.9616,0.0336,0.0139,28.2100 -Kodak,8x8,ldr-rgb-kodak17.png,34.7164,0.0390,0.0146,26.9920 -Kodak,8x8,ldr-rgb-kodak18.png,31.1666,0.0541,0.0277,14.1822 -Kodak,8x8,ldr-rgb-kodak19.png,33.8904,0.0437,0.0186,21.1692 -Kodak,8x8,ldr-rgb-kodak20.png,35.0191,0.0336,0.0147,26.7222 -Kodak,8x8,ldr-rgb-kodak21.png,32.6198,0.0428,0.0223,17.6313 -Kodak,8x8,ldr-rgb-kodak22.png,33.3242,0.0432,0.0197,19.9560 -Kodak,8x8,ldr-rgb-kodak23.png,36.3894,0.0331,0.0118,33.2165 -Kodak,8x8,ldr-rgb-kodak24.png,30.7268,0.0503,0.0271,14.4868 -Kodak,12x12,ldr-rgb-kodak01.png,26.9930,0.0498,0.0243,16.1710 -Kodak,12x12,ldr-rgb-kodak02.png,31.0354,0.0363,0.0098,39.9851 -Kodak,12x12,ldr-rgb-kodak03.png,32.6215,0.0322,0.0088,44.7186 -Kodak,12x12,ldr-rgb-kodak04.png,31.4774,0.0377,0.0084,46.8608 -Kodak,12x12,ldr-rgb-kodak05.png,25.6941,0.0547,0.0286,13.7580 -Kodak,12x12,ldr-rgb-kodak06.png,28.4895,0.0430,0.0184,21.3938 -Kodak,12x12,ldr-rgb-kodak07.png,30.8016,0.0389,0.0107,36.5983 -Kodak,12x12,ldr-rgb-kodak08.png,25.2157,0.0633,0.0335,11.7333 -Kodak,12x12,ldr-rgb-kodak09.png,31.6339,0.0370,0.0095,41.1792 -Kodak,12x12,ldr-rgb-kodak10.png,31.4567,0.0389,0.0100,39.1843 -Kodak,12x12,ldr-rgb-kodak11.png,28.8572,0.0389,0.0142,27.6579 -Kodak,12x12,ldr-rgb-kodak12.png,32.1857,0.0327,0.0085,46.0342 -Kodak,12x12,ldr-rgb-kodak13.png,24.2396,0.0644,0.0377,10.4309 -Kodak,12x12,ldr-rgb-kodak14.png,27.4380,0.0445,0.0190,20.7153 -Kodak,12x12,ldr-rgb-kodak15.png,31.1533,0.0382,0.0114,34.5744 -Kodak,12x12,ldr-rgb-kodak16.png,31.3620,0.0338,0.0100,39.3770 -Kodak,12x12,ldr-rgb-kodak17.png,30.8364,0.0395,0.0106,36.9534 -Kodak,12x12,ldr-rgb-kodak18.png,27.3672,0.0491,0.0189,20.8062 -Kodak,12x12,ldr-rgb-kodak19.png,29.8648,0.0431,0.0139,28.2278 -Kodak,12x12,ldr-rgb-kodak20.png,30.9381,0.0347,0.0113,34.8380 -Kodak,12x12,ldr-rgb-kodak21.png,28.6166,0.0418,0.0173,22.6847 -Kodak,12x12,ldr-rgb-kodak22.png,29.7245,0.0392,0.0115,34.1188 -Kodak,12x12,ldr-rgb-kodak23.png,32.4842,0.0344,0.0091,43.2958 -Kodak,12x12,ldr-rgb-kodak24.png,26.6937,0.0492,0.0217,18.0872 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 25297c310ae69d0334a248d19bc2205890065297..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.2910,0.1376,0.1193,3.2949 -Kodak,4x4,ldr-rgb-kodak02.png,45.3499,0.1867,0.1671,2.3533 -Kodak,4x4,ldr-rgb-kodak03.png,47.6132,0.1002,0.0834,4.7169 -Kodak,4x4,ldr-rgb-kodak04.png,45.4289,0.1508,0.1283,3.0637 -Kodak,4x4,ldr-rgb-kodak05.png,42.1296,0.1729,0.1538,2.5568 -Kodak,4x4,ldr-rgb-kodak06.png,45.1555,0.1312,0.1133,3.4697 -Kodak,4x4,ldr-rgb-kodak07.png,45.9745,0.1280,0.1065,3.6933 -Kodak,4x4,ldr-rgb-kodak08.png,42.5130,0.1922,0.1693,2.3222 -Kodak,4x4,ldr-rgb-kodak09.png,47.1616,0.1495,0.1287,3.0564 -Kodak,4x4,ldr-rgb-kodak10.png,46.8287,0.1543,0.1319,2.9816 -Kodak,4x4,ldr-rgb-kodak11.png,44.8668,0.1486,0.1307,3.0075 -Kodak,4x4,ldr-rgb-kodak12.png,47.9301,0.1128,0.0956,4.1114 -Kodak,4x4,ldr-rgb-kodak13.png,41.6152,0.1479,0.1284,3.0627 -Kodak,4x4,ldr-rgb-kodak14.png,42.6269,0.1601,0.1415,2.7798 -Kodak,4x4,ldr-rgb-kodak15.png,45.4386,0.1330,0.1132,3.4747 -Kodak,4x4,ldr-rgb-kodak16.png,47.8565,0.1150,0.0979,4.0181 -Kodak,4x4,ldr-rgb-kodak17.png,46.2901,0.1329,0.1109,3.5452 -Kodak,4x4,ldr-rgb-kodak18.png,41.9927,0.1953,0.1717,2.2907 -Kodak,4x4,ldr-rgb-kodak19.png,45.3392,0.1592,0.1366,2.8785 -Kodak,4x4,ldr-rgb-kodak20.png,46.8869,0.0973,0.0808,4.8669 -Kodak,4x4,ldr-rgb-kodak21.png,45.1510,0.1574,0.1395,2.8195 -Kodak,4x4,ldr-rgb-kodak22.png,43.7746,0.1958,0.1746,2.2527 -Kodak,4x4,ldr-rgb-kodak23.png,46.8184,0.1507,0.1319,2.9815 -Kodak,4x4,ldr-rgb-kodak24.png,42.2960,0.1548,0.1344,2.9264 -Kodak,5x5,ldr-rgb-kodak01.png,40.1121,0.1640,0.1439,2.7334 -Kodak,5x5,ldr-rgb-kodak02.png,41.6953,0.1737,0.1524,2.5802 -Kodak,5x5,ldr-rgb-kodak03.png,44.0360,0.0823,0.0642,6.1210 -Kodak,5x5,ldr-rgb-kodak04.png,42.0560,0.1377,0.1137,3.4571 -Kodak,5x5,ldr-rgb-kodak05.png,37.9816,0.1895,0.1687,2.3313 -Kodak,5x5,ldr-rgb-kodak06.png,40.9586,0.1310,0.1111,3.5392 -Kodak,5x5,ldr-rgb-kodak07.png,42.4607,0.1132,0.0902,4.3593 -Kodak,5x5,ldr-rgb-kodak08.png,38.3486,0.2082,0.1831,2.1470 -Kodak,5x5,ldr-rgb-kodak09.png,43.8038,0.0976,0.0754,5.2139 -Kodak,5x5,ldr-rgb-kodak10.png,43.4092,0.1107,0.0870,4.5171 -Kodak,5x5,ldr-rgb-kodak11.png,40.8377,0.1498,0.1305,3.0131 -Kodak,5x5,ldr-rgb-kodak12.png,44.3921,0.0839,0.0653,6.0197 -Kodak,5x5,ldr-rgb-kodak13.png,36.9078,0.1742,0.1534,2.5629 -Kodak,5x5,ldr-rgb-kodak14.png,38.6484,0.1702,0.1500,2.6209 -Kodak,5x5,ldr-rgb-kodak15.png,41.8912,0.1283,0.1063,3.6991 -Kodak,5x5,ldr-rgb-kodak16.png,44.1367,0.0939,0.0753,5.2228 -Kodak,5x5,ldr-rgb-kodak17.png,42.5213,0.0990,0.0754,5.2134 -Kodak,5x5,ldr-rgb-kodak18.png,38.3607,0.1872,0.1622,2.4248 -Kodak,5x5,ldr-rgb-kodak19.png,41.6469,0.1292,0.1052,3.7383 -Kodak,5x5,ldr-rgb-kodak20.png,42.9685,0.0913,0.0734,5.3553 -Kodak,5x5,ldr-rgb-kodak21.png,40.7620,0.1289,0.1095,3.5901 -Kodak,5x5,ldr-rgb-kodak22.png,40.2773,0.1765,0.1538,2.5559 -Kodak,5x5,ldr-rgb-kodak23.png,43.5488,0.1111,0.0909,4.3248 -Kodak,5x5,ldr-rgb-kodak24.png,38.1152,0.1524,0.1301,3.0227 -Kodak,6x6,ldr-rgb-kodak01.png,36.1951,0.1720,0.1511,2.6029 -Kodak,6x6,ldr-rgb-kodak02.png,39.0094,0.1369,0.1148,3.4258 -Kodak,6x6,ldr-rgb-kodak03.png,41.3262,0.0704,0.0516,7.6213 -Kodak,6x6,ldr-rgb-kodak04.png,39.3983,0.1184,0.0936,4.1988 -Kodak,6x6,ldr-rgb-kodak05.png,34.7867,0.1868,0.1654,2.3770 -Kodak,6x6,ldr-rgb-kodak06.png,37.6289,0.1179,0.0977,4.0249 -Kodak,6x6,ldr-rgb-kodak07.png,39.7726,0.0977,0.0743,5.2932 -Kodak,6x6,ldr-rgb-kodak08.png,34.9978,0.2092,0.1841,2.1362 -Kodak,6x6,ldr-rgb-kodak09.png,40.8821,0.0769,0.0539,7.2912 -Kodak,6x6,ldr-rgb-kodak10.png,40.5030,0.0822,0.0582,6.7575 -Kodak,6x6,ldr-rgb-kodak11.png,37.5798,0.1261,0.1063,3.7002 -Kodak,6x6,ldr-rgb-kodak12.png,41.4837,0.0666,0.0472,8.3383 -Kodak,6x6,ldr-rgb-kodak13.png,32.8829,0.1934,0.1719,2.2871 -Kodak,6x6,ldr-rgb-kodak14.png,35.8236,0.1575,0.1368,2.8754 -Kodak,6x6,ldr-rgb-kodak15.png,39.1953,0.1195,0.0973,4.0395 -Kodak,6x6,ldr-rgb-kodak16.png,41.0408,0.0774,0.0583,6.7484 -Kodak,6x6,ldr-rgb-kodak17.png,39.4928,0.0838,0.0597,6.5824 -Kodak,6x6,ldr-rgb-kodak18.png,35.3481,0.1665,0.1412,2.7858 -Kodak,6x6,ldr-rgb-kodak19.png,38.5316,0.1174,0.0929,4.2332 -Kodak,6x6,ldr-rgb-kodak20.png,39.7651,0.0841,0.0656,5.9971 -Kodak,6x6,ldr-rgb-kodak21.png,37.1926,0.1151,0.0953,4.1282 -Kodak,6x6,ldr-rgb-kodak22.png,37.4532,0.1499,0.1266,3.1052 -Kodak,6x6,ldr-rgb-kodak23.png,40.9705,0.0815,0.0607,6.4768 -Kodak,6x6,ldr-rgb-kodak24.png,35.0426,0.1379,0.1147,3.4270 -Kodak,8x8,ldr-rgb-kodak01.png,31.8012,0.2348,0.2104,1.8692 -Kodak,8x8,ldr-rgb-kodak02.png,35.7606,0.1367,0.1110,3.5434 -Kodak,8x8,ldr-rgb-kodak03.png,37.7459,0.0863,0.0639,6.1546 -Kodak,8x8,ldr-rgb-kodak04.png,36.0605,0.1334,0.1049,3.7493 -Kodak,8x8,ldr-rgb-kodak05.png,30.7416,0.2430,0.2182,1.8022 -Kodak,8x8,ldr-rgb-kodak06.png,33.4352,0.1512,0.1274,3.0857 -Kodak,8x8,ldr-rgb-kodak07.png,36.1304,0.1157,0.0884,4.4500 -Kodak,8x8,ldr-rgb-kodak08.png,30.5708,0.2448,0.2163,1.8181 -Kodak,8x8,ldr-rgb-kodak09.png,37.2646,0.0890,0.0625,6.2953 -Kodak,8x8,ldr-rgb-kodak10.png,36.9159,0.0926,0.0647,6.0747 -Kodak,8x8,ldr-rgb-kodak11.png,33.6569,0.1495,0.1257,3.1270 -Kodak,8x8,ldr-rgb-kodak12.png,37.8259,0.0826,0.0597,6.5879 -Kodak,8x8,ldr-rgb-kodak13.png,28.3927,0.2704,0.2454,1.6022 -Kodak,8x8,ldr-rgb-kodak14.png,32.1340,0.1937,0.1695,2.3197 -Kodak,8x8,ldr-rgb-kodak15.png,35.8359,0.1224,0.0965,4.0750 -Kodak,8x8,ldr-rgb-kodak16.png,37.0213,0.0968,0.0739,5.3229 -Kodak,8x8,ldr-rgb-kodak17.png,35.6807,0.1028,0.0749,5.2514 -Kodak,8x8,ldr-rgb-kodak18.png,31.5529,0.1948,0.1652,2.3799 -Kodak,8x8,ldr-rgb-kodak19.png,34.7649,0.1419,0.1133,3.4707 -Kodak,8x8,ldr-rgb-kodak20.png,35.8945,0.1045,0.0825,4.7667 -Kodak,8x8,ldr-rgb-kodak21.png,33.1150,0.1486,0.1246,3.1567 -Kodak,8x8,ldr-rgb-kodak22.png,34.0244,0.1634,0.1366,2.8782 -Kodak,8x8,ldr-rgb-kodak23.png,37.6470,0.0842,0.0599,6.5653 -Kodak,8x8,ldr-rgb-kodak24.png,31.1140,0.1710,0.1440,2.7304 -Kodak,12x12,ldr-rgb-kodak01.png,27.7578,0.2518,0.2191,1.7948 -Kodak,12x12,ldr-rgb-kodak02.png,32.4621,0.1012,0.0677,5.8044 -Kodak,12x12,ldr-rgb-kodak03.png,33.7766,0.0822,0.0512,7.6758 -Kodak,12x12,ldr-rgb-kodak04.png,32.4443,0.0964,0.0598,6.5726 -Kodak,12x12,ldr-rgb-kodak05.png,26.3986,0.2678,0.2345,1.6772 -Kodak,12x12,ldr-rgb-kodak06.png,29.3737,0.1622,0.1302,3.0202 -Kodak,12x12,ldr-rgb-kodak07.png,32.0414,0.1160,0.0805,4.8853 -Kodak,12x12,ldr-rgb-kodak08.png,26.0600,0.2698,0.2329,1.6884 -Kodak,12x12,ldr-rgb-kodak09.png,33.0989,0.0882,0.0531,7.4020 -Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0894,0.0533,7.3757 -Kodak,12x12,ldr-rgb-kodak11.png,29.7433,0.1448,0.1126,3.4914 -Kodak,12x12,ldr-rgb-kodak12.png,33.8819,0.0779,0.0469,8.3881 -Kodak,12x12,ldr-rgb-kodak13.png,24.5282,0.3059,0.2723,1.4443 -Kodak,12x12,ldr-rgb-kodak14.png,28.4176,0.1936,0.1607,2.4466 -Kodak,12x12,ldr-rgb-kodak15.png,32.2342,0.1105,0.0764,5.1475 -Kodak,12x12,ldr-rgb-kodak16.png,32.9807,0.0869,0.0556,7.0767 -Kodak,12x12,ldr-rgb-kodak17.png,31.7805,0.0969,0.0608,6.4689 -Kodak,12x12,ldr-rgb-kodak18.png,27.7783,0.1927,0.1553,2.5324 -Kodak,12x12,ldr-rgb-kodak19.png,30.8882,0.1252,0.0884,4.4483 -Kodak,12x12,ldr-rgb-kodak20.png,31.8562,0.0952,0.0649,6.0568 -Kodak,12x12,ldr-rgb-kodak21.png,29.1771,0.1726,0.1406,2.7961 -Kodak,12x12,ldr-rgb-kodak22.png,30.4983,0.1351,0.1001,3.9269 -Kodak,12x12,ldr-rgb-kodak23.png,33.5464,0.0749,0.0423,9.3067 -Kodak,12x12,ldr-rgb-kodak24.png,27.0976,0.1732,0.1386,2.8365 diff --git a/Test/Images/Kodak/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/Kodak/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 4264ae8bfd58f05ced1cdecf407928caf5ec16af..0000000000000000000000000000000000000000 --- a/Test/Images/Kodak/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,121 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Kodak,4x4,ldr-rgb-kodak01.png,45.4944,0.3616,0.3424,1.1485 -Kodak,4x4,ldr-rgb-kodak02.png,45.6493,0.4293,0.4095,0.9603 -Kodak,4x4,ldr-rgb-kodak03.png,47.9884,0.3696,0.3527,1.1150 -Kodak,4x4,ldr-rgb-kodak04.png,45.6562,0.4057,0.3826,1.0278 -Kodak,4x4,ldr-rgb-kodak05.png,42.4063,0.4001,0.3807,1.0328 -Kodak,4x4,ldr-rgb-kodak06.png,45.3572,0.3604,0.3420,1.1496 -Kodak,4x4,ldr-rgb-kodak07.png,46.3419,0.4036,0.3822,1.0288 -Kodak,4x4,ldr-rgb-kodak08.png,42.8054,0.4300,0.4066,0.9672 -Kodak,4x4,ldr-rgb-kodak09.png,47.4208,0.4108,0.3897,1.0090 -Kodak,4x4,ldr-rgb-kodak10.png,47.0603,0.4109,0.3885,1.0120 -Kodak,4x4,ldr-rgb-kodak11.png,45.1121,0.3790,0.3608,1.0900 -Kodak,4x4,ldr-rgb-kodak12.png,48.2457,0.3793,0.3622,1.0857 -Kodak,4x4,ldr-rgb-kodak13.png,41.7174,0.3648,0.3450,1.1399 -Kodak,4x4,ldr-rgb-kodak14.png,42.9405,0.3901,0.3710,1.0599 -Kodak,4x4,ldr-rgb-kodak15.png,45.7858,0.3883,0.3682,1.0680 -Kodak,4x4,ldr-rgb-kodak16.png,48.0652,0.3751,0.3577,1.0993 -Kodak,4x4,ldr-rgb-kodak17.png,46.4610,0.3937,0.3716,1.0583 -Kodak,4x4,ldr-rgb-kodak18.png,42.1541,0.4274,0.4037,0.9739 -Kodak,4x4,ldr-rgb-kodak19.png,45.5439,0.4082,0.3855,1.0200 -Kodak,4x4,ldr-rgb-kodak20.png,47.1284,0.2580,0.2415,1.6282 -Kodak,4x4,ldr-rgb-kodak21.png,45.3018,0.3986,0.3800,1.0347 -Kodak,4x4,ldr-rgb-kodak22.png,43.9797,0.4354,0.4141,0.9495 -Kodak,4x4,ldr-rgb-kodak23.png,47.1533,0.4225,0.4036,0.9743 -Kodak,4x4,ldr-rgb-kodak24.png,42.5030,0.3923,0.3716,1.0583 -Kodak,5x5,ldr-rgb-kodak01.png,40.2326,0.4602,0.4398,0.8940 -Kodak,5x5,ldr-rgb-kodak02.png,41.9976,0.5338,0.5127,0.7670 -Kodak,5x5,ldr-rgb-kodak03.png,44.3239,0.4411,0.4229,0.9298 -Kodak,5x5,ldr-rgb-kodak04.png,42.2394,0.4885,0.4642,0.8471 -Kodak,5x5,ldr-rgb-kodak05.png,38.1756,0.5028,0.4821,0.8157 -Kodak,5x5,ldr-rgb-kodak06.png,41.0844,0.4381,0.4182,0.9402 -Kodak,5x5,ldr-rgb-kodak07.png,42.7249,0.4815,0.4584,0.8577 -Kodak,5x5,ldr-rgb-kodak08.png,38.5334,0.5155,0.4908,0.8012 -Kodak,5x5,ldr-rgb-kodak09.png,44.0288,0.4842,0.4618,0.8515 -Kodak,5x5,ldr-rgb-kodak10.png,43.5935,0.4895,0.4657,0.8443 -Kodak,5x5,ldr-rgb-kodak11.png,40.9987,0.4578,0.4385,0.8966 -Kodak,5x5,ldr-rgb-kodak12.png,44.5960,0.4503,0.4312,0.9119 -Kodak,5x5,ldr-rgb-kodak13.png,36.9510,0.4522,0.4308,0.9128 -Kodak,5x5,ldr-rgb-kodak14.png,38.8797,0.4807,0.4605,0.8539 -Kodak,5x5,ldr-rgb-kodak15.png,42.1246,0.4597,0.4382,0.8973 -Kodak,5x5,ldr-rgb-kodak16.png,44.2686,0.4487,0.4301,0.9142 -Kodak,5x5,ldr-rgb-kodak17.png,42.6009,0.4744,0.4506,0.8727 -Kodak,5x5,ldr-rgb-kodak18.png,38.4550,0.5223,0.4972,0.7908 -Kodak,5x5,ldr-rgb-kodak19.png,41.7719,0.5023,0.4783,0.8221 -Kodak,5x5,ldr-rgb-kodak20.png,43.2708,0.3156,0.2978,1.3203 -Kodak,5x5,ldr-rgb-kodak21.png,40.8630,0.4953,0.4759,0.8263 -Kodak,5x5,ldr-rgb-kodak22.png,40.4255,0.5340,0.5117,0.7685 -Kodak,5x5,ldr-rgb-kodak23.png,43.8841,0.5193,0.4990,0.7881 -Kodak,5x5,ldr-rgb-kodak24.png,38.2272,0.4763,0.4540,0.8660 -Kodak,6x6,ldr-rgb-kodak01.png,36.3116,0.5504,0.5295,0.7426 -Kodak,6x6,ldr-rgb-kodak02.png,39.3780,0.6270,0.6044,0.6506 -Kodak,6x6,ldr-rgb-kodak03.png,41.7331,0.3903,0.3715,1.0584 -Kodak,6x6,ldr-rgb-kodak04.png,39.6521,0.5495,0.5243,0.7500 -Kodak,6x6,ldr-rgb-kodak05.png,34.9741,0.5935,0.5717,0.6878 -Kodak,6x6,ldr-rgb-kodak06.png,37.7401,0.4948,0.4745,0.8287 -Kodak,6x6,ldr-rgb-kodak07.png,40.1032,0.4495,0.4258,0.9234 -Kodak,6x6,ldr-rgb-kodak08.png,35.1660,0.6030,0.5775,0.6809 -Kodak,6x6,ldr-rgb-kodak09.png,41.2613,0.5508,0.5277,0.7451 -Kodak,6x6,ldr-rgb-kodak10.png,40.8141,0.5634,0.5389,0.7296 -Kodak,6x6,ldr-rgb-kodak11.png,37.7541,0.5065,0.4863,0.8087 -Kodak,6x6,ldr-rgb-kodak12.png,41.8249,0.4748,0.4546,0.8650 -Kodak,6x6,ldr-rgb-kodak13.png,32.9256,0.5560,0.5341,0.7362 -Kodak,6x6,ldr-rgb-kodak14.png,36.0210,0.5756,0.5549,0.7086 -Kodak,6x6,ldr-rgb-kodak15.png,39.4514,0.4663,0.4442,0.8853 -Kodak,6x6,ldr-rgb-kodak16.png,41.2290,0.4600,0.4405,0.8926 -Kodak,6x6,ldr-rgb-kodak17.png,39.6521,0.5310,0.5059,0.7773 -Kodak,6x6,ldr-rgb-kodak18.png,35.4328,0.6295,0.6039,0.6512 -Kodak,6x6,ldr-rgb-kodak19.png,38.6954,0.5947,0.5698,0.6902 -Kodak,6x6,ldr-rgb-kodak20.png,40.0953,0.3685,0.3494,1.1254 -Kodak,6x6,ldr-rgb-kodak21.png,37.3344,0.5848,0.5645,0.6966 -Kodak,6x6,ldr-rgb-kodak22.png,37.6231,0.6351,0.6120,0.6426 -Kodak,6x6,ldr-rgb-kodak23.png,41.4033,0.5453,0.5245,0.7497 -Kodak,6x6,ldr-rgb-kodak24.png,35.1417,0.5210,0.4982,0.7893 -Kodak,8x8,ldr-rgb-kodak01.png,31.9071,0.6763,0.6498,0.6051 -Kodak,8x8,ldr-rgb-kodak02.png,36.1354,0.5901,0.5632,0.6982 -Kodak,8x8,ldr-rgb-kodak03.png,38.1744,0.3113,0.2871,1.3698 -Kodak,8x8,ldr-rgb-kodak04.png,36.3637,0.5037,0.4740,0.8295 -Kodak,8x8,ldr-rgb-kodak05.png,30.9009,0.6860,0.6595,0.5963 -Kodak,8x8,ldr-rgb-kodak06.png,33.5749,0.5544,0.5288,0.7436 -Kodak,8x8,ldr-rgb-kodak07.png,36.4888,0.3805,0.3506,1.1214 -Kodak,8x8,ldr-rgb-kodak08.png,30.7484,0.7355,0.7047,0.5580 -Kodak,8x8,ldr-rgb-kodak09.png,37.5499,0.3555,0.3274,1.2010 -Kodak,8x8,ldr-rgb-kodak10.png,37.2288,0.3953,0.3659,1.0748 -Kodak,8x8,ldr-rgb-kodak11.png,33.8276,0.6013,0.5759,0.6828 -Kodak,8x8,ldr-rgb-kodak12.png,38.2490,0.3712,0.3465,1.1350 -Kodak,8x8,ldr-rgb-kodak13.png,28.4502,0.7471,0.7205,0.5458 -Kodak,8x8,ldr-rgb-kodak14.png,32.3258,0.6828,0.6571,0.5984 -Kodak,8x8,ldr-rgb-kodak15.png,36.0605,0.4675,0.4400,0.8938 -Kodak,8x8,ldr-rgb-kodak16.png,37.2636,0.4405,0.4154,0.9466 -Kodak,8x8,ldr-rgb-kodak17.png,35.8722,0.4248,0.3955,0.9941 -Kodak,8x8,ldr-rgb-kodak18.png,31.6495,0.6972,0.6661,0.5903 -Kodak,8x8,ldr-rgb-kodak19.png,34.9142,0.4758,0.4457,0.8823 -Kodak,8x8,ldr-rgb-kodak20.png,36.1470,0.3640,0.3400,1.1564 -Kodak,8x8,ldr-rgb-kodak21.png,33.2221,0.4870,0.4617,0.8517 -Kodak,8x8,ldr-rgb-kodak22.png,34.2197,0.6164,0.5883,0.6684 -Kodak,8x8,ldr-rgb-kodak23.png,38.1768,0.3478,0.3221,1.2209 -Kodak,8x8,ldr-rgb-kodak24.png,31.2175,0.5629,0.5346,0.7356 -Kodak,12x12,ldr-rgb-kodak01.png,27.9058,0.7718,0.7362,0.5341 -Kodak,12x12,ldr-rgb-kodak02.png,32.9642,0.5152,0.4778,0.8230 -Kodak,12x12,ldr-rgb-kodak03.png,34.4219,0.3155,0.2822,1.3935 -Kodak,12x12,ldr-rgb-kodak04.png,32.9599,0.4600,0.4208,0.9345 -Kodak,12x12,ldr-rgb-kodak05.png,26.5927,0.8084,0.7720,0.5093 -Kodak,12x12,ldr-rgb-kodak06.png,29.5304,0.5796,0.5441,0.7227 -Kodak,12x12,ldr-rgb-kodak07.png,32.6109,0.3845,0.3464,1.1352 -Kodak,12x12,ldr-rgb-kodak08.png,26.2744,0.8005,0.7603,0.5172 -Kodak,12x12,ldr-rgb-kodak09.png,33.6251,0.3488,0.3109,1.2647 -Kodak,12x12,ldr-rgb-kodak10.png,32.9833,0.3465,0.3076,1.2784 -Kodak,12x12,ldr-rgb-kodak11.png,30.0468,0.5686,0.5340,0.7364 -Kodak,12x12,ldr-rgb-kodak12.png,34.4395,0.3089,0.2746,1.4321 -Kodak,12x12,ldr-rgb-kodak13.png,24.5820,0.9118,0.8757,0.4491 -Kodak,12x12,ldr-rgb-kodak14.png,28.6287,0.7280,0.6922,0.5681 -Kodak,12x12,ldr-rgb-kodak15.png,32.7197,0.4445,0.4069,0.9663 -Kodak,12x12,ldr-rgb-kodak16.png,33.3355,0.4265,0.3920,1.0031 -Kodak,12x12,ldr-rgb-kodak17.png,32.1409,0.3887,0.3499,1.1237 -Kodak,12x12,ldr-rgb-kodak18.png,27.9217,0.6959,0.6559,0.5995 -Kodak,12x12,ldr-rgb-kodak19.png,31.1006,0.5518,0.5125,0.7672 -Kodak,12x12,ldr-rgb-kodak20.png,32.1470,0.4064,0.3727,1.0550 -Kodak,12x12,ldr-rgb-kodak21.png,29.3170,0.5272,0.4916,0.7998 -Kodak,12x12,ldr-rgb-kodak22.png,30.7805,0.5966,0.5587,0.7037 -Kodak,12x12,ldr-rgb-kodak23.png,34.3635,0.2927,0.2568,1.5311 -Kodak,12x12,ldr-rgb-kodak24.png,27.2253,0.6296,0.5920,0.6642 diff --git a/Test/Images/Kodak/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/Kodak/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..b84638986e1a55c0210e52eb9e25b007263a5b13 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.8820,0.0302,0.0138,28.4156 +Kodak,4x4,ldr-rgb-kodak02.png,44.2873,0.0376,0.0205,19.1439 +Kodak,4x4,ldr-rgb-kodak03.png,46.7875,0.0267,0.0112,35.1716 +Kodak,4x4,ldr-rgb-kodak04.png,44.6627,0.0353,0.0181,21.7392 +Kodak,4x4,ldr-rgb-kodak05.png,41.6532,0.0446,0.0275,14.3018 +Kodak,4x4,ldr-rgb-kodak06.png,44.7930,0.0295,0.0136,28.8243 +Kodak,4x4,ldr-rgb-kodak07.png,45.1555,0.0325,0.0154,25.4524 +Kodak,4x4,ldr-rgb-kodak08.png,42.1261,0.0466,0.0284,13.8219 +Kodak,4x4,ldr-rgb-kodak09.png,46.3501,0.0272,0.0102,38.5848 +Kodak,4x4,ldr-rgb-kodak10.png,46.1138,0.0282,0.0108,36.3051 +Kodak,4x4,ldr-rgb-kodak11.png,44.3024,0.0328,0.0168,23.3766 +Kodak,4x4,ldr-rgb-kodak12.png,47.1128,0.0256,0.0100,39.2430 +Kodak,4x4,ldr-rgb-kodak13.png,41.4830,0.0407,0.0234,16.8336 +Kodak,4x4,ldr-rgb-kodak14.png,41.9274,0.0395,0.0228,17.2631 +Kodak,4x4,ldr-rgb-kodak15.png,44.7388,0.0367,0.0198,19.8875 +Kodak,4x4,ldr-rgb-kodak16.png,47.2478,0.0239,0.0086,45.5737 +Kodak,4x4,ldr-rgb-kodak17.png,45.8440,0.0270,0.0098,39.9939 +Kodak,4x4,ldr-rgb-kodak18.png,41.6843,0.0451,0.0271,14.5173 +Kodak,4x4,ldr-rgb-kodak19.png,44.8511,0.0308,0.0135,29.1766 +Kodak,4x4,ldr-rgb-kodak20.png,46.4186,0.0272,0.0115,34.3026 +Kodak,4x4,ldr-rgb-kodak21.png,44.6411,0.0303,0.0142,27.7342 +Kodak,4x4,ldr-rgb-kodak22.png,43.2351,0.0402,0.0227,17.3115 +Kodak,4x4,ldr-rgb-kodak23.png,45.6659,0.0301,0.0136,28.8768 +Kodak,4x4,ldr-rgb-kodak24.png,41.9807,0.0393,0.0219,17.9173 +Kodak,5x5,ldr-rgb-kodak01.png,39.6135,0.0292,0.0127,31.0013 +Kodak,5x5,ldr-rgb-kodak02.png,40.6534,0.0301,0.0126,31.2669 +Kodak,5x5,ldr-rgb-kodak03.png,43.0540,0.0244,0.0086,45.5851 +Kodak,5x5,ldr-rgb-kodak04.png,41.2613,0.0293,0.0116,33.9097 +Kodak,5x5,ldr-rgb-kodak05.png,37.4541,0.0396,0.0223,17.6108 +Kodak,5x5,ldr-rgb-kodak06.png,40.5884,0.0265,0.0104,37.9884 +Kodak,5x5,ldr-rgb-kodak07.png,41.4931,0.0284,0.0110,35.8318 +Kodak,5x5,ldr-rgb-kodak08.png,37.7792,0.0407,0.0223,17.6432 +Kodak,5x5,ldr-rgb-kodak09.png,42.9214,0.0248,0.0074,52.7867 +Kodak,5x5,ldr-rgb-kodak10.png,42.6313,0.0253,0.0079,49.7502 +Kodak,5x5,ldr-rgb-kodak11.png,40.3040,0.0285,0.0122,32.1645 +Kodak,5x5,ldr-rgb-kodak12.png,43.4157,0.0230,0.0071,55.5777 +Kodak,5x5,ldr-rgb-kodak13.png,36.8276,0.0364,0.0190,20.6999 +Kodak,5x5,ldr-rgb-kodak14.png,38.0242,0.0370,0.0202,19.4739 +Kodak,5x5,ldr-rgb-kodak15.png,41.1917,0.0290,0.0122,32.2860 +Kodak,5x5,ldr-rgb-kodak16.png,43.4667,0.0224,0.0065,60.7197 +Kodak,5x5,ldr-rgb-kodak17.png,42.0469,0.0250,0.0074,53.1816 +Kodak,5x5,ldr-rgb-kodak18.png,38.1147,0.0351,0.0171,23.0544 +Kodak,5x5,ldr-rgb-kodak19.png,41.1276,0.0270,0.0093,42.4227 +Kodak,5x5,ldr-rgb-kodak20.png,42.3603,0.0241,0.0083,47.4609 +Kodak,5x5,ldr-rgb-kodak21.png,40.4227,0.0275,0.0112,35.0930 +Kodak,5x5,ldr-rgb-kodak22.png,39.7897,0.0315,0.0137,28.6162 +Kodak,5x5,ldr-rgb-kodak23.png,42.5143,0.0260,0.0092,42.8159 +Kodak,5x5,ldr-rgb-kodak24.png,37.8892,0.0333,0.0159,24.6822 +Kodak,6x6,ldr-rgb-kodak01.png,35.7507,0.0337,0.0177,22.2408 +Kodak,6x6,ldr-rgb-kodak02.png,38.1712,0.0292,0.0124,31.6424 +Kodak,6x6,ldr-rgb-kodak03.png,40.5686,0.0232,0.0080,49.1219 +Kodak,6x6,ldr-rgb-kodak04.png,38.5433,0.0287,0.0115,34.2976 +Kodak,6x6,ldr-rgb-kodak05.png,34.3631,0.0421,0.0255,15.4367 +Kodak,6x6,ldr-rgb-kodak06.png,37.3004,0.0277,0.0122,32.3234 +Kodak,6x6,ldr-rgb-kodak07.png,38.8820,0.0279,0.0111,35.4376 +Kodak,6x6,ldr-rgb-kodak08.png,34.4474,0.0434,0.0253,15.5219 +Kodak,6x6,ldr-rgb-kodak09.png,39.9734,0.0249,0.0085,46.2822 +Kodak,6x6,ldr-rgb-kodak10.png,39.7372,0.0252,0.0083,47.5883 +Kodak,6x6,ldr-rgb-kodak11.png,37.1533,0.0293,0.0135,29.1875 +Kodak,6x6,ldr-rgb-kodak12.png,40.7387,0.0225,0.0072,54.3577 +Kodak,6x6,ldr-rgb-kodak13.png,32.8130,0.0430,0.0259,15.1950 +Kodak,6x6,ldr-rgb-kodak14.png,35.3037,0.0386,0.0222,17.7108 +Kodak,6x6,ldr-rgb-kodak15.png,38.5680,0.0288,0.0120,32.6808 +Kodak,6x6,ldr-rgb-kodak16.png,40.4942,0.0222,0.0070,56.0861 +Kodak,6x6,ldr-rgb-kodak17.png,38.9398,0.0254,0.0084,46.6778 +Kodak,6x6,ldr-rgb-kodak18.png,35.1209,0.0359,0.0181,21.7513 +Kodak,6x6,ldr-rgb-kodak19.png,37.9783,0.0290,0.0117,33.6915 +Kodak,6x6,ldr-rgb-kodak20.png,39.1839,0.0245,0.0093,42.1000 +Kodak,6x6,ldr-rgb-kodak21.png,36.9075,0.0295,0.0136,28.9386 +Kodak,6x6,ldr-rgb-kodak22.png,36.9849,0.0315,0.0143,27.5070 +Kodak,6x6,ldr-rgb-kodak23.png,40.0615,0.0249,0.0085,46.0715 +Kodak,6x6,ldr-rgb-kodak24.png,34.7936,0.0338,0.0166,23.6336 +Kodak,8x8,ldr-rgb-kodak01.png,31.3361,0.0412,0.0251,15.6779 +Kodak,8x8,ldr-rgb-kodak02.png,34.9328,0.0289,0.0122,32.1884 +Kodak,8x8,ldr-rgb-kodak03.png,36.5952,0.0246,0.0090,43.5738 +Kodak,8x8,ldr-rgb-kodak04.png,35.1760,0.0292,0.0118,33.3630 +Kodak,8x8,ldr-rgb-kodak05.png,30.2523,0.0480,0.0309,12.7111 +Kodak,8x8,ldr-rgb-kodak06.png,32.9457,0.0332,0.0176,22.2961 +Kodak,8x8,ldr-rgb-kodak07.png,34.9951,0.0302,0.0132,29.7171 +Kodak,8x8,ldr-rgb-kodak08.png,29.9694,0.0498,0.0317,12.4101 +Kodak,8x8,ldr-rgb-kodak09.png,36.1703,0.0268,0.0098,40.0784 +Kodak,8x8,ldr-rgb-kodak10.png,35.8857,0.0267,0.0093,42.2857 +Kodak,8x8,ldr-rgb-kodak11.png,33.0088,0.0325,0.0165,23.8227 +Kodak,8x8,ldr-rgb-kodak12.png,36.7290,0.0241,0.0087,45.2536 +Kodak,8x8,ldr-rgb-kodak13.png,28.2209,0.0545,0.0371,10.5925 +Kodak,8x8,ldr-rgb-kodak14.png,31.5032,0.0415,0.0251,15.6954 +Kodak,8x8,ldr-rgb-kodak15.png,34.9394,0.0294,0.0123,31.9217 +Kodak,8x8,ldr-rgb-kodak16.png,36.0527,0.0261,0.0107,36.8494 +Kodak,8x8,ldr-rgb-kodak17.png,34.9073,0.0283,0.0107,36.8700 +Kodak,8x8,ldr-rgb-kodak18.png,31.2398,0.0398,0.0218,17.9978 +Kodak,8x8,ldr-rgb-kodak19.png,34.2235,0.0319,0.0143,27.5825 +Kodak,8x8,ldr-rgb-kodak20.png,35.2317,0.0262,0.0107,36.8074 +Kodak,8x8,ldr-rgb-kodak21.png,32.7551,0.0334,0.0174,22.6377 +Kodak,8x8,ldr-rgb-kodak22.png,33.4546,0.0332,0.0157,25.0359 +Kodak,8x8,ldr-rgb-kodak23.png,36.5268,0.0251,0.0084,46.5724 +Kodak,8x8,ldr-rgb-kodak24.png,30.8238,0.0374,0.0201,19.5970 +Kodak,12x12,ldr-rgb-kodak01.png,27.1080,0.0389,0.0210,18.7174 +Kodak,12x12,ldr-rgb-kodak02.png,31.1083,0.0255,0.0068,57.8244 +Kodak,12x12,ldr-rgb-kodak03.png,32.6856,0.0232,0.0059,66.2543 +Kodak,12x12,ldr-rgb-kodak04.png,31.5645,0.0246,0.0056,69.9672 +Kodak,12x12,ldr-rgb-kodak05.png,25.8227,0.0429,0.0241,16.3065 +Kodak,12x12,ldr-rgb-kodak06.png,28.6373,0.0327,0.0148,26.5130 +Kodak,12x12,ldr-rgb-kodak07.png,30.8590,0.0268,0.0079,49.8690 +Kodak,12x12,ldr-rgb-kodak08.png,25.4179,0.0474,0.0274,14.3421 +Kodak,12x12,ldr-rgb-kodak09.png,31.8377,0.0256,0.0067,58.9087 +Kodak,12x12,ldr-rgb-kodak10.png,31.5385,0.0257,0.0066,59.2814 +Kodak,12x12,ldr-rgb-kodak11.png,28.9359,0.0290,0.0112,35.0990 +Kodak,12x12,ldr-rgb-kodak12.png,32.2823,0.0231,0.0057,68.9119 +Kodak,12x12,ldr-rgb-kodak13.png,24.3217,0.0492,0.0302,13.0040 +Kodak,12x12,ldr-rgb-kodak14.png,27.5443,0.0339,0.0159,24.7928 +Kodak,12x12,ldr-rgb-kodak15.png,31.2551,0.0270,0.0084,46.8010 +Kodak,12x12,ldr-rgb-kodak16.png,31.4853,0.0244,0.0073,54.2362 +Kodak,12x12,ldr-rgb-kodak17.png,30.8975,0.0263,0.0072,54.7275 +Kodak,12x12,ldr-rgb-kodak18.png,27.4230,0.0344,0.0149,26.4615 +Kodak,12x12,ldr-rgb-kodak19.png,30.1902,0.0304,0.0110,35.7992 +Kodak,12x12,ldr-rgb-kodak20.png,31.0526,0.0250,0.0080,49.0051 +Kodak,12x12,ldr-rgb-kodak21.png,28.7136,0.0321,0.0144,27.3960 +Kodak,12x12,ldr-rgb-kodak22.png,29.8371,0.0279,0.0088,44.8878 +Kodak,12x12,ldr-rgb-kodak23.png,32.5213,0.0243,0.0059,66.3556 +Kodak,12x12,ldr-rgb-kodak24.png,26.7723,0.0346,0.0153,25.6233 diff --git a/Test/Images/Kodak/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..03d2ef7472097ec7e0ae66b9b49dcc45d977dada --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5460,0.0254,0.0099,39.6354 +Kodak,4x4,ldr-rgb-kodak02.png,43.8803,0.0295,0.0133,29.5737 +Kodak,4x4,ldr-rgb-kodak03.png,46.1873,0.0226,0.0080,49.4607 +Kodak,4x4,ldr-rgb-kodak04.png,44.2426,0.0288,0.0119,32.9110 +Kodak,4x4,ldr-rgb-kodak05.png,41.1063,0.0326,0.0163,24.1562 +Kodak,4x4,ldr-rgb-kodak06.png,44.5076,0.0252,0.0098,40.0104 +Kodak,4x4,ldr-rgb-kodak07.png,44.7021,0.0265,0.0103,38.0507 +Kodak,4x4,ldr-rgb-kodak08.png,41.5547,0.0341,0.0167,23.5347 +Kodak,4x4,ldr-rgb-kodak09.png,46.0133,0.0237,0.0076,51.6834 +Kodak,4x4,ldr-rgb-kodak10.png,45.7710,0.0245,0.0080,49.4044 +Kodak,4x4,ldr-rgb-kodak11.png,43.9057,0.0267,0.0113,34.7793 +Kodak,4x4,ldr-rgb-kodak12.png,46.5477,0.0223,0.0075,52.3810 +Kodak,4x4,ldr-rgb-kodak13.png,41.2213,0.0321,0.0156,25.2726 +Kodak,4x4,ldr-rgb-kodak14.png,41.2633,0.0289,0.0134,29.3642 +Kodak,4x4,ldr-rgb-kodak15.png,44.2793,0.0287,0.0125,31.4728 +Kodak,4x4,ldr-rgb-kodak16.png,47.1118,0.0219,0.0071,55.3371 +Kodak,4x4,ldr-rgb-kodak17.png,45.6149,0.0242,0.0074,52.9732 +Kodak,4x4,ldr-rgb-kodak18.png,41.3441,0.0335,0.0162,24.2098 +Kodak,4x4,ldr-rgb-kodak19.png,44.5863,0.0264,0.0095,41.3081 +Kodak,4x4,ldr-rgb-kodak20.png,45.9269,0.0229,0.0082,47.9647 +Kodak,4x4,ldr-rgb-kodak21.png,44.3216,0.0254,0.0100,39.1536 +Kodak,4x4,ldr-rgb-kodak22.png,42.8634,0.0308,0.0141,27.8720 +Kodak,4x4,ldr-rgb-kodak23.png,45.3579,0.0253,0.0096,41.0705 +Kodak,4x4,ldr-rgb-kodak24.png,41.4243,0.0301,0.0134,29.4150 +Kodak,5x5,ldr-rgb-kodak01.png,39.3930,0.0262,0.0105,37.3391 +Kodak,5x5,ldr-rgb-kodak02.png,40.4266,0.0258,0.0096,40.7821 +Kodak,5x5,ldr-rgb-kodak03.png,42.6948,0.0215,0.0067,58.9719 +Kodak,5x5,ldr-rgb-kodak04.png,40.8613,0.0257,0.0090,43.4830 +Kodak,5x5,ldr-rgb-kodak05.png,37.1066,0.0318,0.0155,25.4375 +Kodak,5x5,ldr-rgb-kodak06.png,40.4306,0.0240,0.0086,45.5159 +Kodak,5x5,ldr-rgb-kodak07.png,41.1804,0.0248,0.0085,46.0973 +Kodak,5x5,ldr-rgb-kodak08.png,37.4468,0.0329,0.0158,24.9379 +Kodak,5x5,ldr-rgb-kodak09.png,42.6180,0.0228,0.0064,61.5743 +Kodak,5x5,ldr-rgb-kodak10.png,42.4264,0.0235,0.0066,59.7517 +Kodak,5x5,ldr-rgb-kodak11.png,40.0808,0.0248,0.0093,42.2542 +Kodak,5x5,ldr-rgb-kodak12.png,43.2020,0.0211,0.0060,65.2323 +Kodak,5x5,ldr-rgb-kodak13.png,36.7364,0.0316,0.0149,26.3163 +Kodak,5x5,ldr-rgb-kodak14.png,37.5843,0.0286,0.0129,30.4416 +Kodak,5x5,ldr-rgb-kodak15.png,40.9222,0.0253,0.0090,43.7054 +Kodak,5x5,ldr-rgb-kodak16.png,43.3847,0.0207,0.0059,66.8504 +Kodak,5x5,ldr-rgb-kodak17.png,41.9201,0.0230,0.0064,61.7102 +Kodak,5x5,ldr-rgb-kodak18.png,37.9619,0.0299,0.0126,31.1212 +Kodak,5x5,ldr-rgb-kodak19.png,40.8871,0.0248,0.0080,48.9266 +Kodak,5x5,ldr-rgb-kodak20.png,42.0751,0.0214,0.0068,58.1588 +Kodak,5x5,ldr-rgb-kodak21.png,40.2318,0.0245,0.0091,43.4052 +Kodak,5x5,ldr-rgb-kodak22.png,39.5098,0.0273,0.0103,38.1695 +Kodak,5x5,ldr-rgb-kodak23.png,42.2176,0.0232,0.0074,52.8730 +Kodak,5x5,ldr-rgb-kodak24.png,37.6858,0.0283,0.0114,34.3512 +Kodak,6x6,ldr-rgb-kodak01.png,35.6604,0.0286,0.0134,29.3840 +Kodak,6x6,ldr-rgb-kodak02.png,38.0761,0.0251,0.0093,42.4456 +Kodak,6x6,ldr-rgb-kodak03.png,40.4029,0.0207,0.0062,63.4114 +Kodak,6x6,ldr-rgb-kodak04.png,38.3307,0.0250,0.0086,45.7609 +Kodak,6x6,ldr-rgb-kodak05.png,34.1621,0.0329,0.0169,23.2714 +Kodak,6x6,ldr-rgb-kodak06.png,37.2413,0.0243,0.0095,41.4962 +Kodak,6x6,ldr-rgb-kodak07.png,38.6918,0.0243,0.0083,47.1192 +Kodak,6x6,ldr-rgb-kodak08.png,34.2562,0.0344,0.0173,22.7542 +Kodak,6x6,ldr-rgb-kodak09.png,39.8018,0.0224,0.0066,59.2005 +Kodak,6x6,ldr-rgb-kodak10.png,39.6065,0.0229,0.0066,59.3368 +Kodak,6x6,ldr-rgb-kodak11.png,37.0350,0.0249,0.0099,39.8480 +Kodak,6x6,ldr-rgb-kodak12.png,40.6117,0.0204,0.0059,66.9400 +Kodak,6x6,ldr-rgb-kodak13.png,32.7512,0.0349,0.0187,20.9961 +Kodak,6x6,ldr-rgb-kodak14.png,35.0163,0.0289,0.0136,28.9213 +Kodak,6x6,ldr-rgb-kodak15.png,38.4450,0.0246,0.0088,44.5519 +Kodak,6x6,ldr-rgb-kodak16.png,40.4576,0.0204,0.0060,65.2323 +Kodak,6x6,ldr-rgb-kodak17.png,38.8609,0.0231,0.0068,57.4538 +Kodak,6x6,ldr-rgb-kodak18.png,35.0294,0.0302,0.0132,29.7331 +Kodak,6x6,ldr-rgb-kodak19.png,37.8582,0.0258,0.0092,42.8014 +Kodak,6x6,ldr-rgb-kodak20.png,39.0412,0.0217,0.0072,54.4169 +Kodak,6x6,ldr-rgb-kodak21.png,36.8328,0.0253,0.0102,38.5136 +Kodak,6x6,ldr-rgb-kodak22.png,36.8810,0.0269,0.0105,37.2926 +Kodak,6x6,ldr-rgb-kodak23.png,39.9091,0.0222,0.0067,58.8835 +Kodak,6x6,ldr-rgb-kodak24.png,34.7176,0.0283,0.0121,32.4838 +Kodak,8x8,ldr-rgb-kodak01.png,31.2005,0.0348,0.0187,21.0613 +Kodak,8x8,ldr-rgb-kodak02.png,34.7312,0.0261,0.0095,41.5841 +Kodak,8x8,ldr-rgb-kodak03.png,36.4659,0.0225,0.0072,54.8640 +Kodak,8x8,ldr-rgb-kodak04.png,35.0660,0.0263,0.0091,43.3915 +Kodak,8x8,ldr-rgb-kodak05.png,30.0650,0.0398,0.0228,17.2714 +Kodak,8x8,ldr-rgb-kodak06.png,32.8162,0.0292,0.0134,29.4502 +Kodak,8x8,ldr-rgb-kodak07.png,34.8365,0.0271,0.0102,38.5352 +Kodak,8x8,ldr-rgb-kodak08.png,29.7191,0.0418,0.0238,16.5259 +Kodak,8x8,ldr-rgb-kodak09.png,35.9333,0.0248,0.0078,50.4641 +Kodak,8x8,ldr-rgb-kodak10.png,35.7348,0.0246,0.0074,53.1165 +Kodak,8x8,ldr-rgb-kodak11.png,32.8802,0.0286,0.0126,31.3073 +Kodak,8x8,ldr-rgb-kodak12.png,36.5229,0.0224,0.0071,55.6339 +Kodak,8x8,ldr-rgb-kodak13.png,28.1448,0.0442,0.0270,14.5388 +Kodak,8x8,ldr-rgb-kodak14.png,31.3242,0.0342,0.0180,21.8007 +Kodak,8x8,ldr-rgb-kodak15.png,34.7681,0.0262,0.0094,41.6313 +Kodak,8x8,ldr-rgb-kodak16.png,35.9653,0.0236,0.0084,46.8782 +Kodak,8x8,ldr-rgb-kodak17.png,34.7354,0.0257,0.0084,46.8449 +Kodak,8x8,ldr-rgb-kodak18.png,31.1735,0.0340,0.0162,24.3402 +Kodak,8x8,ldr-rgb-kodak19.png,33.9079,0.0286,0.0112,35.0118 +Kodak,8x8,ldr-rgb-kodak20.png,35.0719,0.0238,0.0084,47.0681 +Kodak,8x8,ldr-rgb-kodak21.png,32.6481,0.0289,0.0131,29.9731 +Kodak,8x8,ldr-rgb-kodak22.png,33.3422,0.0292,0.0119,33.1072 +Kodak,8x8,ldr-rgb-kodak23.png,36.4038,0.0231,0.0068,58.0748 +Kodak,8x8,ldr-rgb-kodak24.png,30.7489,0.0324,0.0152,25.9001 +Kodak,12x12,ldr-rgb-kodak01.png,26.9943,0.0327,0.0152,25.7964 +Kodak,12x12,ldr-rgb-kodak02.png,31.0366,0.0238,0.0055,71.0554 +Kodak,12x12,ldr-rgb-kodak03.png,32.6255,0.0214,0.0049,80.7752 +Kodak,12x12,ldr-rgb-kodak04.png,31.4723,0.0232,0.0047,83.3426 +Kodak,12x12,ldr-rgb-kodak05.png,25.7076,0.0356,0.0174,22.5970 +Kodak,12x12,ldr-rgb-kodak06.png,28.4878,0.0282,0.0110,35.6044 +Kodak,12x12,ldr-rgb-kodak07.png,30.8029,0.0243,0.0063,62.8652 +Kodak,12x12,ldr-rgb-kodak08.png,25.2189,0.0393,0.0202,19.4505 +Kodak,12x12,ldr-rgb-kodak09.png,31.6427,0.0236,0.0054,72.3617 +Kodak,12x12,ldr-rgb-kodak10.png,31.4531,0.0239,0.0053,74.2345 +Kodak,12x12,ldr-rgb-kodak11.png,28.8669,0.0257,0.0085,46.4582 +Kodak,12x12,ldr-rgb-kodak12.png,32.1856,0.0215,0.0047,82.9737 +Kodak,12x12,ldr-rgb-kodak13.png,24.2460,0.0398,0.0216,18.1759 +Kodak,12x12,ldr-rgb-kodak14.png,27.4553,0.0293,0.0117,33.5824 +Kodak,12x12,ldr-rgb-kodak15.png,31.1581,0.0247,0.0065,60.2274 +Kodak,12x12,ldr-rgb-kodak16.png,31.3640,0.0224,0.0058,67.8543 +Kodak,12x12,ldr-rgb-kodak17.png,30.8429,0.0242,0.0057,68.5652 +Kodak,12x12,ldr-rgb-kodak18.png,27.3755,0.0300,0.0110,35.7697 +Kodak,12x12,ldr-rgb-kodak19.png,29.8756,0.0273,0.0085,46.3486 +Kodak,12x12,ldr-rgb-kodak20.png,30.9402,0.0229,0.0064,61.6987 +Kodak,12x12,ldr-rgb-kodak21.png,28.6181,0.0278,0.0106,37.0964 +Kodak,12x12,ldr-rgb-kodak22.png,29.7383,0.0254,0.0068,57.6486 +Kodak,12x12,ldr-rgb-kodak23.png,32.4823,0.0226,0.0049,79.7943 +Kodak,12x12,ldr-rgb-kodak24.png,26.7030,0.0302,0.0116,33.9418 diff --git a/Test/Images/Kodak/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/Kodak/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ccfd7119bfa59c7221bb4a2b0c9c087c5b1a1b40 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3120,0.0828,0.0656,5.9921 +Kodak,4x4,ldr-rgb-kodak02.png,45.4397,0.1215,0.1036,3.7952 +Kodak,4x4,ldr-rgb-kodak03.png,47.6879,0.0637,0.0474,8.2934 +Kodak,4x4,ldr-rgb-kodak04.png,45.5017,0.0948,0.0767,5.1297 +Kodak,4x4,ldr-rgb-kodak05.png,42.1778,0.1065,0.0887,4.4322 +Kodak,4x4,ldr-rgb-kodak06.png,45.1998,0.0783,0.0615,6.3971 +Kodak,4x4,ldr-rgb-kodak07.png,46.0247,0.0791,0.0611,6.4361 +Kodak,4x4,ldr-rgb-kodak08.png,42.5327,0.1137,0.0949,4.1424 +Kodak,4x4,ldr-rgb-kodak09.png,47.1830,0.0920,0.0742,5.2985 +Kodak,4x4,ldr-rgb-kodak10.png,46.8614,0.0936,0.0756,5.1994 +Kodak,4x4,ldr-rgb-kodak11.png,44.8994,0.0925,0.0757,5.1947 +Kodak,4x4,ldr-rgb-kodak12.png,47.9784,0.0712,0.0547,7.1823 +Kodak,4x4,ldr-rgb-kodak13.png,41.6520,0.0891,0.0710,5.5376 +Kodak,4x4,ldr-rgb-kodak14.png,42.7319,0.0993,0.0819,4.8035 +Kodak,4x4,ldr-rgb-kodak15.png,45.5485,0.0848,0.0671,5.8588 +Kodak,4x4,ldr-rgb-kodak16.png,47.8885,0.0709,0.0545,7.2164 +Kodak,4x4,ldr-rgb-kodak17.png,46.3480,0.0807,0.0626,6.2853 +Kodak,4x4,ldr-rgb-kodak18.png,42.0493,0.1207,0.1018,3.8639 +Kodak,4x4,ldr-rgb-kodak19.png,45.3597,0.0961,0.0778,5.0559 +Kodak,4x4,ldr-rgb-kodak20.png,46.9280,0.0623,0.0461,8.5313 +Kodak,4x4,ldr-rgb-kodak21.png,45.1814,0.0974,0.0806,4.8815 +Kodak,4x4,ldr-rgb-kodak22.png,43.8216,0.1221,0.1039,3.7847 +Kodak,4x4,ldr-rgb-kodak23.png,46.8701,0.0971,0.0798,4.9281 +Kodak,4x4,ldr-rgb-kodak24.png,42.3775,0.0952,0.0772,5.0926 +Kodak,5x5,ldr-rgb-kodak01.png,40.1116,0.0851,0.0672,5.8536 +Kodak,5x5,ldr-rgb-kodak02.png,41.7670,0.0974,0.0789,4.9812 +Kodak,5x5,ldr-rgb-kodak03.png,44.0723,0.0500,0.0330,11.9211 +Kodak,5x5,ldr-rgb-kodak04.png,42.0904,0.0765,0.0577,6.8159 +Kodak,5x5,ldr-rgb-kodak05.png,37.9986,0.1011,0.0826,4.7600 +Kodak,5x5,ldr-rgb-kodak06.png,40.9739,0.0695,0.0520,7.5688 +Kodak,5x5,ldr-rgb-kodak07.png,42.4746,0.0637,0.0452,8.6968 +Kodak,5x5,ldr-rgb-kodak08.png,38.3608,0.1061,0.0864,4.5491 +Kodak,5x5,ldr-rgb-kodak09.png,43.8088,0.0562,0.0377,10.4238 +Kodak,5x5,ldr-rgb-kodak10.png,43.4231,0.0618,0.0428,9.1927 +Kodak,5x5,ldr-rgb-kodak11.png,40.8590,0.0807,0.0630,6.2457 +Kodak,5x5,ldr-rgb-kodak12.png,44.4017,0.0499,0.0331,11.8686 +Kodak,5x5,ldr-rgb-kodak13.png,36.9301,0.0869,0.0681,5.7737 +Kodak,5x5,ldr-rgb-kodak14.png,38.6960,0.0916,0.0738,5.3307 +Kodak,5x5,ldr-rgb-kodak15.png,41.9491,0.0728,0.0545,7.2164 +Kodak,5x5,ldr-rgb-kodak16.png,44.1356,0.0526,0.0357,11.0062 +Kodak,5x5,ldr-rgb-kodak17.png,42.5454,0.0551,0.0365,10.7742 +Kodak,5x5,ldr-rgb-kodak18.png,38.3941,0.0958,0.0764,5.1498 +Kodak,5x5,ldr-rgb-kodak19.png,41.6442,0.0680,0.0490,8.0327 +Kodak,5x5,ldr-rgb-kodak20.png,42.9823,0.0514,0.0345,11.3863 +Kodak,5x5,ldr-rgb-kodak21.png,40.7705,0.0700,0.0520,7.5565 +Kodak,5x5,ldr-rgb-kodak22.png,40.2982,0.0939,0.0749,5.2519 +Kodak,5x5,ldr-rgb-kodak23.png,43.5860,0.0665,0.0485,8.1141 +Kodak,5x5,ldr-rgb-kodak24.png,38.2072,0.0808,0.0618,6.3658 +Kodak,6x6,ldr-rgb-kodak01.png,36.1963,0.0836,0.0663,5.9320 +Kodak,6x6,ldr-rgb-kodak02.png,39.0475,0.0771,0.0592,6.6376 +Kodak,6x6,ldr-rgb-kodak03.png,41.3520,0.0424,0.0259,15.1998 +Kodak,6x6,ldr-rgb-kodak04.png,39.4032,0.0658,0.0475,8.2824 +Kodak,6x6,ldr-rgb-kodak05.png,34.7993,0.0949,0.0770,5.1086 +Kodak,6x6,ldr-rgb-kodak06.png,37.6376,0.0614,0.0445,8.8290 +Kodak,6x6,ldr-rgb-kodak07.png,39.7936,0.0549,0.0371,10.5916 +Kodak,6x6,ldr-rgb-kodak08.png,34.9845,0.1003,0.0813,4.8345 +Kodak,6x6,ldr-rgb-kodak09.png,40.8865,0.0454,0.0273,14.3820 +Kodak,6x6,ldr-rgb-kodak10.png,40.5154,0.0473,0.0291,13.5126 +Kodak,6x6,ldr-rgb-kodak11.png,37.5965,0.0679,0.0509,7.7228 +Kodak,6x6,ldr-rgb-kodak12.png,41.4939,0.0408,0.0243,16.1823 +Kodak,6x6,ldr-rgb-kodak13.png,32.9110,0.0901,0.0719,5.4682 +Kodak,6x6,ldr-rgb-kodak14.png,35.8527,0.0845,0.0670,5.8648 +Kodak,6x6,ldr-rgb-kodak15.png,39.2227,0.0651,0.0473,8.3164 +Kodak,6x6,ldr-rgb-kodak16.png,41.0391,0.0441,0.0278,14.1557 +Kodak,6x6,ldr-rgb-kodak17.png,39.4992,0.0467,0.0285,13.8009 +Kodak,6x6,ldr-rgb-kodak18.png,35.3684,0.0843,0.0656,5.9981 +Kodak,6x6,ldr-rgb-kodak19.png,38.5288,0.0602,0.0418,9.4030 +Kodak,6x6,ldr-rgb-kodak20.png,39.7703,0.0465,0.0301,13.0593 +Kodak,6x6,ldr-rgb-kodak21.png,37.2034,0.0606,0.0437,8.9972 +Kodak,6x6,ldr-rgb-kodak22.png,37.4752,0.0784,0.0598,6.5720 +Kodak,6x6,ldr-rgb-kodak23.png,40.9962,0.0502,0.0327,12.0209 +Kodak,6x6,ldr-rgb-kodak24.png,35.0626,0.0708,0.0523,7.5254 +Kodak,8x8,ldr-rgb-kodak01.png,31.8007,0.1101,0.0922,4.2626 +Kodak,8x8,ldr-rgb-kodak02.png,35.7971,0.0768,0.0582,6.7526 +Kodak,8x8,ldr-rgb-kodak03.png,37.7637,0.0501,0.0332,11.8395 +Kodak,8x8,ldr-rgb-kodak04.png,36.0993,0.0710,0.0522,7.5384 +Kodak,8x8,ldr-rgb-kodak05.png,30.7474,0.1206,0.1019,3.8605 +Kodak,8x8,ldr-rgb-kodak06.png,33.4449,0.0754,0.0579,6.7876 +Kodak,8x8,ldr-rgb-kodak07.png,36.1506,0.0649,0.0462,8.5143 +Kodak,8x8,ldr-rgb-kodak08.png,30.5414,0.1219,0.1020,3.8532 +Kodak,8x8,ldr-rgb-kodak09.png,37.2629,0.0514,0.0329,11.9541 +Kodak,8x8,ldr-rgb-kodak10.png,36.9234,0.0520,0.0332,11.8364 +Kodak,8x8,ldr-rgb-kodak11.png,33.6680,0.0781,0.0605,6.4945 +Kodak,8x8,ldr-rgb-kodak12.png,37.8337,0.0486,0.0315,12.4965 +Kodak,8x8,ldr-rgb-kodak13.png,28.3966,0.1187,0.0997,3.9458 +Kodak,8x8,ldr-rgb-kodak14.png,32.1516,0.1032,0.0851,4.6219 +Kodak,8x8,ldr-rgb-kodak15.png,35.8462,0.0659,0.0474,8.2978 +Kodak,8x8,ldr-rgb-kodak16.png,37.0251,0.0537,0.0367,10.7140 +Kodak,8x8,ldr-rgb-kodak17.png,35.6698,0.0553,0.0365,10.7810 +Kodak,8x8,ldr-rgb-kodak18.png,31.5577,0.0966,0.0768,5.1204 +Kodak,8x8,ldr-rgb-kodak19.png,34.7618,0.0696,0.0504,7.8052 +Kodak,8x8,ldr-rgb-kodak20.png,35.9030,0.0554,0.0383,10.2705 +Kodak,8x8,ldr-rgb-kodak21.png,33.1158,0.0740,0.0564,6.9709 +Kodak,8x8,ldr-rgb-kodak22.png,34.0434,0.0841,0.0650,6.0453 +Kodak,8x8,ldr-rgb-kodak23.png,37.6714,0.0518,0.0335,11.7493 +Kodak,8x8,ldr-rgb-kodak24.png,31.1289,0.0824,0.0635,6.1894 +Kodak,12x12,ldr-rgb-kodak01.png,27.7549,0.1228,0.1022,3.8473 +Kodak,12x12,ldr-rgb-kodak02.png,32.4572,0.0622,0.0407,9.6497 +Kodak,12x12,ldr-rgb-kodak03.png,33.8229,0.0474,0.0274,14.3761 +Kodak,12x12,ldr-rgb-kodak04.png,32.4332,0.0552,0.0334,11.7571 +Kodak,12x12,ldr-rgb-kodak05.png,26.4002,0.1348,0.1128,3.4845 +Kodak,12x12,ldr-rgb-kodak06.png,29.3776,0.0813,0.0609,6.4557 +Kodak,12x12,ldr-rgb-kodak07.png,32.0454,0.0656,0.0444,8.8556 +Kodak,12x12,ldr-rgb-kodak08.png,26.0607,0.1393,0.1168,3.3655 +Kodak,12x12,ldr-rgb-kodak09.png,33.1013,0.0505,0.0289,13.5957 +Kodak,12x12,ldr-rgb-kodak10.png,32.4879,0.0503,0.0286,13.7701 +Kodak,12x12,ldr-rgb-kodak11.png,29.7550,0.0775,0.0569,6.9065 +Kodak,12x12,ldr-rgb-kodak12.png,33.8849,0.0464,0.0266,14.7609 +Kodak,12x12,ldr-rgb-kodak13.png,24.5283,0.1397,0.1176,3.3431 +Kodak,12x12,ldr-rgb-kodak14.png,28.4299,0.1073,0.0864,4.5504 +Kodak,12x12,ldr-rgb-kodak15.png,32.2405,0.0623,0.0408,9.6355 +Kodak,12x12,ldr-rgb-kodak16.png,32.9828,0.0519,0.0320,12.2941 +Kodak,12x12,ldr-rgb-kodak17.png,31.7910,0.0546,0.0327,12.0220 +Kodak,12x12,ldr-rgb-kodak18.png,27.7838,0.0961,0.0735,5.3511 +Kodak,12x12,ldr-rgb-kodak19.png,30.8959,0.0686,0.0466,8.4293 +Kodak,12x12,ldr-rgb-kodak20.png,31.8670,0.0546,0.0347,11.3473 +Kodak,12x12,ldr-rgb-kodak21.png,29.1816,0.0841,0.0635,6.1909 +Kodak,12x12,ldr-rgb-kodak22.png,30.5137,0.0742,0.0523,7.5176 +Kodak,12x12,ldr-rgb-kodak23.png,33.5616,0.0447,0.0235,16.7070 +Kodak,12x12,ldr-rgb-kodak24.png,27.1047,0.0862,0.0641,6.1362 diff --git a/Test/Images/Kodak/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..800d77af0fe9621567be1fc9bfb9eacac380640b --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5115,0.1764,0.1596,2.4645 +Kodak,4x4,ldr-rgb-kodak02.png,45.6982,0.2557,0.2379,1.6529 +Kodak,4x4,ldr-rgb-kodak03.png,48.0607,0.2007,0.1841,2.1363 +Kodak,4x4,ldr-rgb-kodak04.png,45.6858,0.2248,0.2065,1.9042 +Kodak,4x4,ldr-rgb-kodak05.png,42.4370,0.2232,0.2053,1.9149 +Kodak,4x4,ldr-rgb-kodak06.png,45.3960,0.1847,0.1677,2.3444 +Kodak,4x4,ldr-rgb-kodak07.png,46.3753,0.2213,0.2034,1.9330 +Kodak,4x4,ldr-rgb-kodak08.png,42.8242,0.2352,0.2158,1.8219 +Kodak,4x4,ldr-rgb-kodak09.png,47.4389,0.2369,0.2188,1.7972 +Kodak,4x4,ldr-rgb-kodak10.png,47.0911,0.2336,0.2155,1.8248 +Kodak,4x4,ldr-rgb-kodak11.png,45.1383,0.2111,0.1942,2.0250 +Kodak,4x4,ldr-rgb-kodak12.png,48.2774,0.2028,0.1863,2.1101 +Kodak,4x4,ldr-rgb-kodak13.png,41.7584,0.1848,0.1668,2.3570 +Kodak,4x4,ldr-rgb-kodak14.png,42.9859,0.2091,0.1914,2.0539 +Kodak,4x4,ldr-rgb-kodak15.png,45.8334,0.2173,0.1996,1.9701 +Kodak,4x4,ldr-rgb-kodak16.png,48.0940,0.2005,0.1841,2.1363 +Kodak,4x4,ldr-rgb-kodak17.png,46.5075,0.2120,0.1938,2.0285 +Kodak,4x4,ldr-rgb-kodak18.png,42.2101,0.2493,0.2305,1.7062 +Kodak,4x4,ldr-rgb-kodak19.png,45.5658,0.2237,0.2051,1.9174 +Kodak,4x4,ldr-rgb-kodak20.png,47.1799,0.1429,0.1265,3.1077 +Kodak,4x4,ldr-rgb-kodak21.png,45.3342,0.2254,0.2086,1.8849 +Kodak,4x4,ldr-rgb-kodak22.png,44.0086,0.2567,0.2382,1.6510 +Kodak,4x4,ldr-rgb-kodak23.png,47.1907,0.2476,0.2301,1.7091 +Kodak,4x4,ldr-rgb-kodak24.png,42.6019,0.2214,0.2032,1.9356 +Kodak,5x5,ldr-rgb-kodak01.png,40.2236,0.2051,0.1871,2.1012 +Kodak,5x5,ldr-rgb-kodak02.png,42.0380,0.2696,0.2508,1.5678 +Kodak,5x5,ldr-rgb-kodak03.png,44.3676,0.2013,0.1841,2.1358 +Kodak,5x5,ldr-rgb-kodak04.png,42.2612,0.2226,0.2035,1.9322 +Kodak,5x5,ldr-rgb-kodak05.png,38.1929,0.2420,0.2230,1.7635 +Kodak,5x5,ldr-rgb-kodak06.png,41.0984,0.1947,0.1766,2.2264 +Kodak,5x5,ldr-rgb-kodak07.png,42.7456,0.2251,0.2060,1.9087 +Kodak,5x5,ldr-rgb-kodak08.png,38.5418,0.2435,0.2234,1.7602 +Kodak,5x5,ldr-rgb-kodak09.png,44.0366,0.2183,0.1999,1.9668 +Kodak,5x5,ldr-rgb-kodak10.png,43.6071,0.2249,0.2060,1.9086 +Kodak,5x5,ldr-rgb-kodak11.png,41.0130,0.2163,0.1986,1.9798 +Kodak,5x5,ldr-rgb-kodak12.png,44.6149,0.2062,0.1881,2.0909 +Kodak,5x5,ldr-rgb-kodak13.png,36.9748,0.1909,0.1720,2.2864 +Kodak,5x5,ldr-rgb-kodak14.png,38.9092,0.2235,0.2052,1.9160 +Kodak,5x5,ldr-rgb-kodak15.png,42.1668,0.2182,0.1993,1.9734 +Kodak,5x5,ldr-rgb-kodak16.png,44.2715,0.2011,0.1832,2.1461 +Kodak,5x5,ldr-rgb-kodak17.png,42.6407,0.2052,0.1858,2.1159 +Kodak,5x5,ldr-rgb-kodak18.png,38.4820,0.2447,0.2250,1.7478 +Kodak,5x5,ldr-rgb-kodak19.png,41.7841,0.2322,0.2122,1.8528 +Kodak,5x5,ldr-rgb-kodak20.png,43.2953,0.1461,0.1284,3.0614 +Kodak,5x5,ldr-rgb-kodak21.png,40.8774,0.2436,0.2258,1.7417 +Kodak,5x5,ldr-rgb-kodak22.png,40.4425,0.2836,0.2640,1.4893 +Kodak,5x5,ldr-rgb-kodak23.png,43.9057,0.2744,0.2552,1.5406 +Kodak,5x5,ldr-rgb-kodak24.png,38.3273,0.2285,0.2094,1.8778 +Kodak,6x6,ldr-rgb-kodak01.png,36.3105,0.2281,0.2104,1.8689 +Kodak,6x6,ldr-rgb-kodak02.png,39.4083,0.3561,0.3364,1.1688 +Kodak,6x6,ldr-rgb-kodak03.png,41.7533,0.1735,0.1570,2.5046 +Kodak,6x6,ldr-rgb-kodak04.png,39.6674,0.2308,0.2125,1.8503 +Kodak,6x6,ldr-rgb-kodak05.png,34.9944,0.2585,0.2403,1.6363 +Kodak,6x6,ldr-rgb-kodak06.png,37.7608,0.2003,0.1835,2.1429 +Kodak,6x6,ldr-rgb-kodak07.png,40.1279,0.2021,0.1841,2.1359 +Kodak,6x6,ldr-rgb-kodak08.png,35.1750,0.2554,0.2363,1.6639 +Kodak,6x6,ldr-rgb-kodak09.png,41.2718,0.2194,0.2014,1.9525 +Kodak,6x6,ldr-rgb-kodak10.png,40.8412,0.2375,0.2184,1.8006 +Kodak,6x6,ldr-rgb-kodak11.png,37.7820,0.2233,0.2059,1.9101 +Kodak,6x6,ldr-rgb-kodak12.png,41.8395,0.2012,0.1845,2.1314 +Kodak,6x6,ldr-rgb-kodak13.png,32.9600,0.2150,0.1968,1.9977 +Kodak,6x6,ldr-rgb-kodak14.png,36.0500,0.2432,0.2257,1.7425 +Kodak,6x6,ldr-rgb-kodak15.png,39.4760,0.2059,0.1880,2.0917 +Kodak,6x6,ldr-rgb-kodak16.png,41.2318,0.1901,0.1736,2.2657 +Kodak,6x6,ldr-rgb-kodak17.png,39.6707,0.2105,0.1922,2.0461 +Kodak,6x6,ldr-rgb-kodak18.png,35.4565,0.2595,0.2404,1.6354 +Kodak,6x6,ldr-rgb-kodak19.png,38.7066,0.2421,0.2232,1.7619 +Kodak,6x6,ldr-rgb-kodak20.png,40.1121,0.1540,0.1372,2.8669 +Kodak,6x6,ldr-rgb-kodak21.png,37.3497,0.2406,0.2235,1.7596 +Kodak,6x6,ldr-rgb-kodak22.png,37.6441,0.2760,0.2576,1.5265 +Kodak,6x6,ldr-rgb-kodak23.png,41.4416,0.2514,0.2338,1.6815 +Kodak,6x6,ldr-rgb-kodak24.png,35.1795,0.2285,0.2100,1.8722 +Kodak,8x8,ldr-rgb-kodak01.png,31.9076,0.2775,0.2582,1.5229 +Kodak,8x8,ldr-rgb-kodak02.png,36.1658,0.2814,0.2616,1.5034 +Kodak,8x8,ldr-rgb-kodak03.png,38.2015,0.1516,0.1331,2.9543 +Kodak,8x8,ldr-rgb-kodak04.png,36.3849,0.2269,0.2064,1.9050 +Kodak,8x8,ldr-rgb-kodak05.png,30.9159,0.3018,0.2818,1.3954 +Kodak,8x8,ldr-rgb-kodak06.png,33.5799,0.2297,0.2107,1.8662 +Kodak,8x8,ldr-rgb-kodak07.png,36.5075,0.1844,0.1645,2.3904 +Kodak,8x8,ldr-rgb-kodak08.png,30.7382,0.3264,0.3050,1.2894 +Kodak,8x8,ldr-rgb-kodak09.png,37.5585,0.1677,0.1478,2.6611 +Kodak,8x8,ldr-rgb-kodak10.png,37.2383,0.1922,0.1718,2.2890 +Kodak,8x8,ldr-rgb-kodak11.png,33.8328,0.2668,0.2479,1.5864 +Kodak,8x8,ldr-rgb-kodak12.png,38.2628,0.1735,0.1550,2.5370 +Kodak,8x8,ldr-rgb-kodak13.png,28.4607,0.2896,0.2691,1.4611 +Kodak,8x8,ldr-rgb-kodak14.png,32.3242,0.2916,0.2719,1.4462 +Kodak,8x8,ldr-rgb-kodak15.png,36.0684,0.2147,0.1949,2.0175 +Kodak,8x8,ldr-rgb-kodak16.png,37.2660,0.1851,0.1666,2.3601 +Kodak,8x8,ldr-rgb-kodak17.png,35.8716,0.1857,0.1648,2.3859 +Kodak,8x8,ldr-rgb-kodak18.png,31.6551,0.2987,0.2778,1.4153 +Kodak,8x8,ldr-rgb-kodak19.png,34.9274,0.2020,0.1815,2.1669 +Kodak,8x8,ldr-rgb-kodak20.png,36.1555,0.1630,0.1445,2.7220 +Kodak,8x8,ldr-rgb-kodak21.png,33.2255,0.2144,0.1954,2.0123 +Kodak,8x8,ldr-rgb-kodak22.png,34.2304,0.2798,0.2591,1.5174 +Kodak,8x8,ldr-rgb-kodak23.png,38.1991,0.1843,0.1645,2.3908 +Kodak,8x8,ldr-rgb-kodak24.png,31.2348,0.2471,0.2265,1.7362 +Kodak,12x12,ldr-rgb-kodak01.png,27.9132,0.3651,0.3417,1.1506 +Kodak,12x12,ldr-rgb-kodak02.png,33.0052,0.2716,0.2475,1.5884 +Kodak,12x12,ldr-rgb-kodak03.png,34.4542,0.1637,0.1415,2.7793 +Kodak,12x12,ldr-rgb-kodak04.png,32.9738,0.2375,0.2132,1.8447 +Kodak,12x12,ldr-rgb-kodak05.png,26.6073,0.3931,0.3688,1.0662 +Kodak,12x12,ldr-rgb-kodak06.png,29.5310,0.2681,0.2449,1.6056 +Kodak,12x12,ldr-rgb-kodak07.png,32.6281,0.2083,0.1843,2.1338 +Kodak,12x12,ldr-rgb-kodak08.png,26.2616,0.3959,0.3707,1.0606 +Kodak,12x12,ldr-rgb-kodak09.png,33.6343,0.1875,0.1633,2.4082 +Kodak,12x12,ldr-rgb-kodak10.png,32.9910,0.1854,0.1610,2.4424 +Kodak,12x12,ldr-rgb-kodak11.png,30.0541,0.2884,0.2651,1.4834 +Kodak,12x12,ldr-rgb-kodak12.png,34.4512,0.1697,0.1472,2.6718 +Kodak,12x12,ldr-rgb-kodak13.png,24.5887,0.4264,0.4021,0.9779 +Kodak,12x12,ldr-rgb-kodak14.png,28.6476,0.3480,0.3246,1.2115 +Kodak,12x12,ldr-rgb-kodak15.png,32.7352,0.2292,0.2053,1.9154 +Kodak,12x12,ldr-rgb-kodak16.png,33.3387,0.2007,0.1784,2.2039 +Kodak,12x12,ldr-rgb-kodak17.png,32.1425,0.1986,0.1743,2.2561 +Kodak,12x12,ldr-rgb-kodak18.png,27.9244,0.3459,0.3207,1.2262 +Kodak,12x12,ldr-rgb-kodak19.png,31.1081,0.2717,0.2470,1.5921 +Kodak,12x12,ldr-rgb-kodak20.png,32.1616,0.2123,0.1898,2.0717 +Kodak,12x12,ldr-rgb-kodak21.png,29.3265,0.2574,0.2343,1.6782 +Kodak,12x12,ldr-rgb-kodak22.png,30.7890,0.3051,0.2805,1.4020 +Kodak,12x12,ldr-rgb-kodak23.png,34.3835,0.1691,0.1455,2.7023 +Kodak,12x12,ldr-rgb-kodak24.png,27.2381,0.3114,0.2869,1.3706 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..01d5e9c2c65efabf88e9191155dd50edfea8d51e --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.8820,0.0360,0.0188,20.9370 +Kodak,4x4,ldr-rgb-kodak02.png,44.2873,0.0456,0.0275,14.3238 +Kodak,4x4,ldr-rgb-kodak03.png,46.7875,0.0319,0.0152,25.8202 +Kodak,4x4,ldr-rgb-kodak04.png,44.6627,0.0427,0.0242,16.2720 +Kodak,4x4,ldr-rgb-kodak05.png,41.6532,0.0547,0.0364,10.8065 +Kodak,4x4,ldr-rgb-kodak06.png,44.7930,0.0354,0.0185,21.2836 +Kodak,4x4,ldr-rgb-kodak07.png,45.1555,0.0388,0.0207,19.0060 +Kodak,4x4,ldr-rgb-kodak08.png,42.1261,0.0569,0.0377,10.4288 +Kodak,4x4,ldr-rgb-kodak09.png,46.3501,0.0320,0.0141,27.8048 +Kodak,4x4,ldr-rgb-kodak10.png,46.1138,0.0329,0.0149,26.4064 +Kodak,4x4,ldr-rgb-kodak11.png,44.3024,0.0400,0.0226,17.3966 +Kodak,4x4,ldr-rgb-kodak12.png,47.1128,0.0308,0.0138,28.5395 +Kodak,4x4,ldr-rgb-kodak13.png,41.4830,0.0495,0.0310,12.6917 +Kodak,4x4,ldr-rgb-kodak14.png,41.9274,0.0479,0.0302,13.0105 +Kodak,4x4,ldr-rgb-kodak15.png,44.7388,0.0445,0.0263,14.9285 +Kodak,4x4,ldr-rgb-kodak16.png,47.2478,0.0286,0.0121,32.5537 +Kodak,4x4,ldr-rgb-kodak17.png,45.8440,0.0317,0.0135,29.1833 +Kodak,4x4,ldr-rgb-kodak18.png,41.6843,0.0552,0.0359,10.9595 +Kodak,4x4,ldr-rgb-kodak19.png,44.8511,0.0368,0.0182,21.6516 +Kodak,4x4,ldr-rgb-kodak20.png,46.4186,0.0320,0.0155,25.3937 +Kodak,4x4,ldr-rgb-kodak21.png,44.6411,0.0364,0.0191,20.6197 +Kodak,4x4,ldr-rgb-kodak22.png,43.2351,0.0492,0.0303,12.9847 +Kodak,4x4,ldr-rgb-kodak23.png,45.6659,0.0363,0.0185,21.2400 +Kodak,4x4,ldr-rgb-kodak24.png,41.9807,0.0478,0.0292,13.4507 +Kodak,5x5,ldr-rgb-kodak01.png,39.6135,0.0362,0.0184,21.3985 +Kodak,5x5,ldr-rgb-kodak02.png,40.6534,0.0360,0.0176,22.3888 +Kodak,5x5,ldr-rgb-kodak03.png,43.0540,0.0284,0.0118,33.3941 +Kodak,5x5,ldr-rgb-kodak04.png,41.2613,0.0348,0.0162,24.2743 +Kodak,5x5,ldr-rgb-kodak05.png,37.4541,0.0504,0.0316,12.4502 +Kodak,5x5,ldr-rgb-kodak06.png,40.5884,0.0320,0.0148,26.5437 +Kodak,5x5,ldr-rgb-kodak07.png,41.4931,0.0337,0.0153,25.6835 +Kodak,5x5,ldr-rgb-kodak08.png,37.7792,0.0513,0.0318,12.3821 +Kodak,5x5,ldr-rgb-kodak09.png,42.9214,0.0287,0.0105,37.3425 +Kodak,5x5,ldr-rgb-kodak10.png,42.6313,0.0296,0.0111,35.5691 +Kodak,5x5,ldr-rgb-kodak11.png,40.3040,0.0343,0.0169,23.2964 +Kodak,5x5,ldr-rgb-kodak12.png,43.4157,0.0266,0.0097,40.3747 +Kodak,5x5,ldr-rgb-kodak13.png,36.8276,0.0461,0.0271,14.4858 +Kodak,5x5,ldr-rgb-kodak14.png,38.0242,0.0464,0.0282,13.9261 +Kodak,5x5,ldr-rgb-kodak15.png,41.1917,0.0352,0.0168,23.4517 +Kodak,5x5,ldr-rgb-kodak16.png,43.4667,0.0274,0.0092,42.8203 +Kodak,5x5,ldr-rgb-kodak17.png,42.0469,0.0305,0.0106,37.0189 +Kodak,5x5,ldr-rgb-kodak18.png,38.1147,0.0465,0.0250,15.7526 +Kodak,5x5,ldr-rgb-kodak19.png,41.1276,0.0324,0.0131,29.9323 +Kodak,5x5,ldr-rgb-kodak20.png,42.3603,0.0292,0.0116,33.8686 +Kodak,5x5,ldr-rgb-kodak21.png,40.4227,0.0334,0.0158,24.9281 +Kodak,5x5,ldr-rgb-kodak22.png,39.7897,0.0380,0.0190,20.6424 +Kodak,5x5,ldr-rgb-kodak23.png,42.5143,0.0303,0.0125,31.5125 +Kodak,5x5,ldr-rgb-kodak24.png,37.8892,0.0411,0.0222,17.7131 +Kodak,6x6,ldr-rgb-kodak01.png,35.7507,0.0444,0.0269,14.6286 +Kodak,6x6,ldr-rgb-kodak02.png,38.1712,0.0365,0.0182,21.5568 +Kodak,6x6,ldr-rgb-kodak03.png,40.5686,0.0282,0.0115,34.1541 +Kodak,6x6,ldr-rgb-kodak04.png,38.5433,0.0352,0.0168,23.4574 +Kodak,6x6,ldr-rgb-kodak05.png,34.3631,0.0569,0.0382,10.2853 +Kodak,6x6,ldr-rgb-kodak06.png,37.3004,0.0352,0.0181,21.7777 +Kodak,6x6,ldr-rgb-kodak07.png,38.8820,0.0347,0.0163,24.0572 +Kodak,6x6,ldr-rgb-kodak08.png,34.4474,0.0577,0.0380,10.3367 +Kodak,6x6,ldr-rgb-kodak09.png,39.9734,0.0305,0.0124,31.6880 +Kodak,6x6,ldr-rgb-kodak10.png,39.7372,0.0304,0.0120,32.6834 +Kodak,6x6,ldr-rgb-kodak11.png,37.1533,0.0371,0.0197,19.9490 +Kodak,6x6,ldr-rgb-kodak12.png,40.7387,0.0268,0.0102,38.5965 +Kodak,6x6,ldr-rgb-kodak13.png,32.8130,0.0579,0.0393,10.0101 +Kodak,6x6,ldr-rgb-kodak14.png,35.3037,0.0507,0.0328,11.9785 +Kodak,6x6,ldr-rgb-kodak15.png,38.5680,0.0357,0.0175,22.4247 +Kodak,6x6,ldr-rgb-kodak16.png,40.4942,0.0269,0.0102,38.4265 +Kodak,6x6,ldr-rgb-kodak17.png,38.9398,0.0308,0.0124,31.7521 +Kodak,6x6,ldr-rgb-kodak18.png,35.1209,0.0463,0.0269,14.6221 +Kodak,6x6,ldr-rgb-kodak19.png,37.9783,0.0364,0.0176,22.3454 +Kodak,6x6,ldr-rgb-kodak20.png,39.1839,0.0303,0.0137,28.6704 +Kodak,6x6,ldr-rgb-kodak21.png,36.9075,0.0377,0.0202,19.4682 +Kodak,6x6,ldr-rgb-kodak22.png,36.9849,0.0399,0.0210,18.7244 +Kodak,6x6,ldr-rgb-kodak23.png,40.0615,0.0301,0.0123,32.0234 +Kodak,6x6,ldr-rgb-kodak24.png,34.7936,0.0435,0.0246,15.9856 +Kodak,8x8,ldr-rgb-kodak01.png,31.3361,0.0579,0.0401,9.8017 +Kodak,8x8,ldr-rgb-kodak02.png,34.9328,0.0365,0.0181,21.6898 +Kodak,8x8,ldr-rgb-kodak03.png,36.5952,0.0304,0.0135,29.0881 +Kodak,8x8,ldr-rgb-kodak04.png,35.1760,0.0366,0.0177,22.1870 +Kodak,8x8,ldr-rgb-kodak05.png,30.2523,0.0675,0.0488,8.0659 +Kodak,8x8,ldr-rgb-kodak06.png,32.9457,0.0450,0.0275,14.2826 +Kodak,8x8,ldr-rgb-kodak07.png,34.9951,0.0387,0.0202,19.4873 +Kodak,8x8,ldr-rgb-kodak08.png,29.9694,0.0694,0.0499,7.8802 +Kodak,8x8,ldr-rgb-kodak09.png,36.1703,0.0333,0.0150,26.2773 +Kodak,8x8,ldr-rgb-kodak10.png,35.8857,0.0328,0.0139,28.3623 +Kodak,8x8,ldr-rgb-kodak11.png,33.0088,0.0429,0.0252,15.5840 +Kodak,8x8,ldr-rgb-kodak12.png,36.7290,0.0300,0.0129,30.4799 +Kodak,8x8,ldr-rgb-kodak13.png,28.2209,0.0769,0.0580,6.7810 +Kodak,8x8,ldr-rgb-kodak14.png,31.5032,0.0565,0.0384,10.2278 +Kodak,8x8,ldr-rgb-kodak15.png,34.9394,0.0370,0.0184,21.3799 +Kodak,8x8,ldr-rgb-kodak16.png,36.0527,0.0332,0.0163,24.0822 +Kodak,8x8,ldr-rgb-kodak17.png,34.9073,0.0348,0.0160,24.5088 +Kodak,8x8,ldr-rgb-kodak18.png,31.2398,0.0534,0.0337,11.6657 +Kodak,8x8,ldr-rgb-kodak19.png,34.2235,0.0412,0.0221,17.7652 +Kodak,8x8,ldr-rgb-kodak20.png,35.2317,0.0331,0.0161,24.4597 +Kodak,8x8,ldr-rgb-kodak21.png,32.7551,0.0445,0.0268,14.6581 +Kodak,8x8,ldr-rgb-kodak22.png,33.4546,0.0428,0.0238,16.5335 +Kodak,8x8,ldr-rgb-kodak23.png,36.5268,0.0306,0.0126,31.1606 +Kodak,8x8,ldr-rgb-kodak24.png,30.8238,0.0497,0.0307,12.8271 +Kodak,12x12,ldr-rgb-kodak01.png,27.1080,0.0518,0.0321,12.2386 +Kodak,12x12,ldr-rgb-kodak02.png,31.1083,0.0300,0.0098,40.1526 +Kodak,12x12,ldr-rgb-kodak03.png,32.6856,0.0273,0.0087,45.3232 +Kodak,12x12,ldr-rgb-kodak04.png,31.5645,0.0285,0.0081,48.4979 +Kodak,12x12,ldr-rgb-kodak05.png,25.8227,0.0572,0.0368,10.6869 +Kodak,12x12,ldr-rgb-kodak06.png,28.6373,0.0417,0.0224,17.5307 +Kodak,12x12,ldr-rgb-kodak07.png,30.8590,0.0318,0.0117,33.5081 +Kodak,12x12,ldr-rgb-kodak08.png,25.4179,0.0638,0.0423,9.3055 +Kodak,12x12,ldr-rgb-kodak09.png,31.8377,0.0302,0.0099,39.6706 +Kodak,12x12,ldr-rgb-kodak10.png,31.5385,0.0300,0.0095,41.2823 +Kodak,12x12,ldr-rgb-kodak11.png,28.9359,0.0358,0.0167,23.5233 +Kodak,12x12,ldr-rgb-kodak12.png,32.2823,0.0268,0.0083,47.1421 +Kodak,12x12,ldr-rgb-kodak13.png,24.3217,0.0661,0.0454,8.6684 +Kodak,12x12,ldr-rgb-kodak14.png,27.5443,0.0432,0.0234,16.7718 +Kodak,12x12,ldr-rgb-kodak15.png,31.2551,0.0326,0.0124,31.7264 +Kodak,12x12,ldr-rgb-kodak16.png,31.4853,0.0294,0.0107,36.8321 +Kodak,12x12,ldr-rgb-kodak17.png,30.8975,0.0309,0.0104,37.7476 +Kodak,12x12,ldr-rgb-kodak18.png,27.4230,0.0433,0.0221,17.7782 +Kodak,12x12,ldr-rgb-kodak19.png,30.1902,0.0372,0.0165,23.7866 +Kodak,12x12,ldr-rgb-kodak20.png,31.0526,0.0302,0.0118,33.2755 +Kodak,12x12,ldr-rgb-kodak21.png,28.7136,0.0412,0.0217,18.1440 +Kodak,12x12,ldr-rgb-kodak22.png,29.8371,0.0334,0.0128,30.7435 +Kodak,12x12,ldr-rgb-kodak23.png,32.5213,0.0286,0.0087,45.1916 +Kodak,12x12,ldr-rgb-kodak24.png,26.7723,0.0433,0.0227,17.3284 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6b5967cd0be828ec32132f994cccc28efba42aa6 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5460,0.0300,0.0134,29.3245 +Kodak,4x4,ldr-rgb-kodak02.png,43.8803,0.0355,0.0179,21.9896 +Kodak,4x4,ldr-rgb-kodak03.png,46.1873,0.0267,0.0109,36.2317 +Kodak,4x4,ldr-rgb-kodak04.png,44.2426,0.0338,0.0160,24.5562 +Kodak,4x4,ldr-rgb-kodak05.png,41.1063,0.0394,0.0217,18.1063 +Kodak,4x4,ldr-rgb-kodak06.png,44.5076,0.0296,0.0134,29.3574 +Kodak,4x4,ldr-rgb-kodak07.png,44.7021,0.0312,0.0138,28.4695 +Kodak,4x4,ldr-rgb-kodak08.png,41.5547,0.0410,0.0222,17.7283 +Kodak,4x4,ldr-rgb-kodak09.png,46.0133,0.0275,0.0104,37.8272 +Kodak,4x4,ldr-rgb-kodak10.png,45.7710,0.0286,0.0109,36.0283 +Kodak,4x4,ldr-rgb-kodak11.png,43.9057,0.0315,0.0151,26.0927 +Kodak,4x4,ldr-rgb-kodak12.png,46.5477,0.0262,0.0103,38.3408 +Kodak,4x4,ldr-rgb-kodak13.png,41.2213,0.0384,0.0206,19.0947 +Kodak,4x4,ldr-rgb-kodak14.png,41.2633,0.0349,0.0178,22.1058 +Kodak,4x4,ldr-rgb-kodak15.png,44.2793,0.0340,0.0166,23.6807 +Kodak,4x4,ldr-rgb-kodak16.png,47.1118,0.0255,0.0096,40.7649 +Kodak,4x4,ldr-rgb-kodak17.png,45.6149,0.0277,0.0102,38.5884 +Kodak,4x4,ldr-rgb-kodak18.png,41.3441,0.0403,0.0216,18.1751 +Kodak,4x4,ldr-rgb-kodak19.png,44.5863,0.0309,0.0130,30.1986 +Kodak,4x4,ldr-rgb-kodak20.png,45.9269,0.0269,0.0110,35.6206 +Kodak,4x4,ldr-rgb-kodak21.png,44.3216,0.0300,0.0135,29.0861 +Kodak,4x4,ldr-rgb-kodak22.png,42.8634,0.0368,0.0187,21.0063 +Kodak,4x4,ldr-rgb-kodak23.png,45.3579,0.0299,0.0128,30.7201 +Kodak,4x4,ldr-rgb-kodak24.png,41.4243,0.0357,0.0177,22.1753 +Kodak,5x5,ldr-rgb-kodak01.png,39.3930,0.0317,0.0151,26.1220 +Kodak,5x5,ldr-rgb-kodak02.png,40.4266,0.0310,0.0135,29.0820 +Kodak,5x5,ldr-rgb-kodak03.png,42.6948,0.0251,0.0092,42.5146 +Kodak,5x5,ldr-rgb-kodak04.png,40.8613,0.0305,0.0127,31.0205 +Kodak,5x5,ldr-rgb-kodak05.png,37.1066,0.0398,0.0220,17.9060 +Kodak,5x5,ldr-rgb-kodak06.png,40.4306,0.0286,0.0122,32.2230 +Kodak,5x5,ldr-rgb-kodak07.png,41.1804,0.0296,0.0120,32.7756 +Kodak,5x5,ldr-rgb-kodak08.png,37.4468,0.0413,0.0226,17.4299 +Kodak,5x5,ldr-rgb-kodak09.png,42.6180,0.0263,0.0088,44.6025 +Kodak,5x5,ldr-rgb-kodak10.png,42.4264,0.0270,0.0092,42.9553 +Kodak,5x5,ldr-rgb-kodak11.png,40.0808,0.0297,0.0131,30.0648 +Kodak,5x5,ldr-rgb-kodak12.png,43.2020,0.0244,0.0083,47.3465 +Kodak,5x5,ldr-rgb-kodak13.png,36.7364,0.0393,0.0216,18.2399 +Kodak,5x5,ldr-rgb-kodak14.png,37.5843,0.0350,0.0180,21.8686 +Kodak,5x5,ldr-rgb-kodak15.png,40.9222,0.0302,0.0126,31.1706 +Kodak,5x5,ldr-rgb-kodak16.png,43.3847,0.0241,0.0082,47.8367 +Kodak,5x5,ldr-rgb-kodak17.png,41.9201,0.0267,0.0088,44.4714 +Kodak,5x5,ldr-rgb-kodak18.png,37.9619,0.0362,0.0179,21.9832 +Kodak,5x5,ldr-rgb-kodak19.png,40.8871,0.0293,0.0113,34.8042 +Kodak,5x5,ldr-rgb-kodak20.png,42.0751,0.0252,0.0094,41.6629 +Kodak,5x5,ldr-rgb-kodak21.png,40.2318,0.0293,0.0128,30.7493 +Kodak,5x5,ldr-rgb-kodak22.png,39.5098,0.0325,0.0145,27.0731 +Kodak,5x5,ldr-rgb-kodak23.png,42.2176,0.0274,0.0102,38.3997 +Kodak,5x5,ldr-rgb-kodak24.png,37.6858,0.0339,0.0161,24.4477 +Kodak,6x6,ldr-rgb-kodak01.png,35.6604,0.0374,0.0206,19.0863 +Kodak,6x6,ldr-rgb-kodak02.png,38.0761,0.0308,0.0135,29.1076 +Kodak,6x6,ldr-rgb-kodak03.png,40.4029,0.0248,0.0089,44.2270 +Kodak,6x6,ldr-rgb-kodak04.png,38.3307,0.0304,0.0127,30.9541 +Kodak,6x6,ldr-rgb-kodak05.png,34.1621,0.0433,0.0256,15.3749 +Kodak,6x6,ldr-rgb-kodak06.png,37.2413,0.0306,0.0142,27.6639 +Kodak,6x6,ldr-rgb-kodak07.png,38.6918,0.0297,0.0124,31.7753 +Kodak,6x6,ldr-rgb-kodak08.png,34.2562,0.0450,0.0263,14.9381 +Kodak,6x6,ldr-rgb-kodak09.png,39.8018,0.0269,0.0097,40.6464 +Kodak,6x6,ldr-rgb-kodak10.png,39.6065,0.0273,0.0096,40.8791 +Kodak,6x6,ldr-rgb-kodak11.png,37.0350,0.0311,0.0145,27.0527 +Kodak,6x6,ldr-rgb-kodak12.png,40.6117,0.0243,0.0084,46.7109 +Kodak,6x6,ldr-rgb-kodak13.png,32.7512,0.0468,0.0289,13.5869 +Kodak,6x6,ldr-rgb-kodak14.png,35.0163,0.0369,0.0201,19.5415 +Kodak,6x6,ldr-rgb-kodak15.png,38.4450,0.0303,0.0130,30.1688 +Kodak,6x6,ldr-rgb-kodak16.png,40.4576,0.0246,0.0088,44.5315 +Kodak,6x6,ldr-rgb-kodak17.png,38.8609,0.0277,0.0101,39.0018 +Kodak,6x6,ldr-rgb-kodak18.png,35.0294,0.0381,0.0199,19.7953 +Kodak,6x6,ldr-rgb-kodak19.png,37.8582,0.0319,0.0140,28.0712 +Kodak,6x6,ldr-rgb-kodak20.png,39.0412,0.0265,0.0107,36.8074 +Kodak,6x6,ldr-rgb-kodak21.png,36.8328,0.0317,0.0153,25.6500 +Kodak,6x6,ldr-rgb-kodak22.png,36.8810,0.0334,0.0155,25.3655 +Kodak,6x6,ldr-rgb-kodak23.png,39.9091,0.0266,0.0096,40.8791 +Kodak,6x6,ldr-rgb-kodak24.png,34.7176,0.0360,0.0183,21.5026 +Kodak,8x8,ldr-rgb-kodak01.png,31.2005,0.0468,0.0291,13.4913 +Kodak,8x8,ldr-rgb-kodak02.png,34.7312,0.0321,0.0139,28.2990 +Kodak,8x8,ldr-rgb-kodak03.png,36.4659,0.0273,0.0106,36.9501 +Kodak,8x8,ldr-rgb-kodak04.png,35.0660,0.0322,0.0135,29.0625 +Kodak,8x8,ldr-rgb-kodak05.png,30.0650,0.0539,0.0352,11.1722 +Kodak,8x8,ldr-rgb-kodak06.png,32.8162,0.0380,0.0206,19.0843 +Kodak,8x8,ldr-rgb-kodak07.png,34.8365,0.0336,0.0154,25.6149 +Kodak,8x8,ldr-rgb-kodak08.png,29.7191,0.0566,0.0371,10.6120 +Kodak,8x8,ldr-rgb-kodak09.png,35.9333,0.0301,0.0118,33.2420 +Kodak,8x8,ldr-rgb-kodak10.png,35.7348,0.0296,0.0111,35.5622 +Kodak,8x8,ldr-rgb-kodak11.png,32.8802,0.0362,0.0189,20.8128 +Kodak,8x8,ldr-rgb-kodak12.png,36.5229,0.0271,0.0104,37.8056 +Kodak,8x8,ldr-rgb-kodak13.png,28.1448,0.0606,0.0419,9.3907 +Kodak,8x8,ldr-rgb-kodak14.png,31.3242,0.0453,0.0274,14.3567 +Kodak,8x8,ldr-rgb-kodak15.png,34.7681,0.0322,0.0140,28.0330 +Kodak,8x8,ldr-rgb-kodak16.png,35.9653,0.0295,0.0128,30.8286 +Kodak,8x8,ldr-rgb-kodak17.png,34.7354,0.0311,0.0125,31.4116 +Kodak,8x8,ldr-rgb-kodak18.png,31.1735,0.0441,0.0247,15.9501 +Kodak,8x8,ldr-rgb-kodak19.png,33.9079,0.0356,0.0171,23.0502 +Kodak,8x8,ldr-rgb-kodak20.png,35.0719,0.0292,0.0125,31.4272 +Kodak,8x8,ldr-rgb-kodak21.png,32.6481,0.0374,0.0201,19.6108 +Kodak,8x8,ldr-rgb-kodak22.png,33.3422,0.0365,0.0177,22.1643 +Kodak,8x8,ldr-rgb-kodak23.png,36.4038,0.0277,0.0099,39.6506 +Kodak,8x8,ldr-rgb-kodak24.png,30.7489,0.0416,0.0228,17.2561 +Kodak,12x12,ldr-rgb-kodak01.png,26.9943,0.0423,0.0231,17.0054 +Kodak,12x12,ldr-rgb-kodak02.png,31.0366,0.0274,0.0078,50.1938 +Kodak,12x12,ldr-rgb-kodak03.png,32.6255,0.0251,0.0070,56.1663 +Kodak,12x12,ldr-rgb-kodak04.png,31.4723,0.0267,0.0066,59.5597 +Kodak,12x12,ldr-rgb-kodak05.png,25.7076,0.0459,0.0260,15.1138 +Kodak,12x12,ldr-rgb-kodak06.png,28.4878,0.0348,0.0166,23.7376 +Kodak,12x12,ldr-rgb-kodak07.png,30.8029,0.0287,0.0091,43.1870 +Kodak,12x12,ldr-rgb-kodak08.png,25.2189,0.0515,0.0306,12.8372 +Kodak,12x12,ldr-rgb-kodak09.png,31.6427,0.0273,0.0078,50.1297 +Kodak,12x12,ldr-rgb-kodak10.png,31.4531,0.0275,0.0077,51.2529 +Kodak,12x12,ldr-rgb-kodak11.png,28.8669,0.0311,0.0125,31.4218 +Kodak,12x12,ldr-rgb-kodak12.png,32.1856,0.0248,0.0068,58.0136 +Kodak,12x12,ldr-rgb-kodak13.png,24.2460,0.0523,0.0324,12.1521 +Kodak,12x12,ldr-rgb-kodak14.png,27.4553,0.0363,0.0172,22.8693 +Kodak,12x12,ldr-rgb-kodak15.png,31.1581,0.0292,0.0096,40.9685 +Kodak,12x12,ldr-rgb-kodak16.png,31.3640,0.0266,0.0085,46.3368 +Kodak,12x12,ldr-rgb-kodak17.png,30.8429,0.0282,0.0082,47.7274 +Kodak,12x12,ldr-rgb-kodak18.png,27.3755,0.0368,0.0162,24.2336 +Kodak,12x12,ldr-rgb-kodak19.png,29.8756,0.0328,0.0127,30.9425 +Kodak,12x12,ldr-rgb-kodak20.png,30.9402,0.0273,0.0093,42.3911 +Kodak,12x12,ldr-rgb-kodak21.png,28.6181,0.0346,0.0160,24.5241 +Kodak,12x12,ldr-rgb-kodak22.png,29.7383,0.0300,0.0099,39.5983 +Kodak,12x12,ldr-rgb-kodak23.png,32.4823,0.0263,0.0070,55.8147 +Kodak,12x12,ldr-rgb-kodak24.png,26.7030,0.0369,0.0170,23.1671 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..df2677c7579357f1b0fcf62d796b1bf53361c057 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3120,0.1054,0.0870,4.5197 +Kodak,4x4,ldr-rgb-kodak02.png,45.4397,0.1588,0.1395,2.8188 +Kodak,4x4,ldr-rgb-kodak03.png,47.6879,0.0819,0.0645,6.0955 +Kodak,4x4,ldr-rgb-kodak04.png,45.5017,0.1226,0.1032,3.8092 +Kodak,4x4,ldr-rgb-kodak05.png,42.1778,0.1370,0.1179,3.3345 +Kodak,4x4,ldr-rgb-kodak06.png,45.1998,0.0997,0.0820,4.7977 +Kodak,4x4,ldr-rgb-kodak07.png,46.0247,0.1012,0.0822,4.7830 +Kodak,4x4,ldr-rgb-kodak08.png,42.5327,0.1463,0.1264,3.1117 +Kodak,4x4,ldr-rgb-kodak09.png,47.1830,0.1213,0.1021,3.8508 +Kodak,4x4,ldr-rgb-kodak10.png,46.8614,0.1220,0.1025,3.8362 +Kodak,4x4,ldr-rgb-kodak11.png,44.8994,0.1195,0.1013,3.8808 +Kodak,4x4,ldr-rgb-kodak12.png,47.9784,0.0914,0.0739,5.3180 +Kodak,4x4,ldr-rgb-kodak13.png,41.6520,0.1134,0.0942,4.1755 +Kodak,4x4,ldr-rgb-kodak14.png,42.7319,0.1280,0.1095,3.5904 +Kodak,4x4,ldr-rgb-kodak15.png,45.5485,0.1095,0.0907,4.3369 +Kodak,4x4,ldr-rgb-kodak16.png,47.8885,0.0918,0.0743,5.2953 +Kodak,4x4,ldr-rgb-kodak17.png,46.3480,0.1037,0.0844,4.6577 +Kodak,4x4,ldr-rgb-kodak18.png,42.0493,0.1559,0.1360,2.8912 +Kodak,4x4,ldr-rgb-kodak19.png,45.3597,0.1237,0.1042,3.7729 +Kodak,4x4,ldr-rgb-kodak20.png,46.9280,0.0794,0.0621,6.3270 +Kodak,4x4,ldr-rgb-kodak21.png,45.1814,0.1265,0.1086,3.6221 +Kodak,4x4,ldr-rgb-kodak22.png,43.8216,0.1591,0.1397,2.8155 +Kodak,4x4,ldr-rgb-kodak23.png,46.8701,0.1265,0.1079,3.6436 +Kodak,4x4,ldr-rgb-kodak24.png,42.3775,0.1224,0.1032,3.8095 +Kodak,5x5,ldr-rgb-kodak01.png,40.1116,0.1171,0.0978,4.0187 +Kodak,5x5,ldr-rgb-kodak02.png,41.7670,0.1343,0.1146,3.4313 +Kodak,5x5,ldr-rgb-kodak03.png,44.0723,0.0661,0.0480,8.1845 +Kodak,5x5,ldr-rgb-kodak04.png,42.0904,0.1043,0.0843,4.6628 +Kodak,5x5,ldr-rgb-kodak05.png,37.9986,0.1403,0.1203,3.2695 +Kodak,5x5,ldr-rgb-kodak06.png,40.9739,0.0944,0.0757,5.1945 +Kodak,5x5,ldr-rgb-kodak07.png,42.4746,0.0857,0.0660,5.9550 +Kodak,5x5,ldr-rgb-kodak08.png,38.3608,0.1463,0.1255,3.1337 +Kodak,5x5,ldr-rgb-kodak09.png,43.8088,0.0755,0.0559,7.0319 +Kodak,5x5,ldr-rgb-kodak10.png,43.4231,0.0832,0.0630,6.2382 +Kodak,5x5,ldr-rgb-kodak11.png,40.8590,0.1110,0.0920,4.2745 +Kodak,5x5,ldr-rgb-kodak12.png,44.4017,0.0671,0.0489,8.0430 +Kodak,5x5,ldr-rgb-kodak13.png,36.9301,0.1182,0.0981,4.0080 +Kodak,5x5,ldr-rgb-kodak14.png,38.6960,0.1267,0.1075,3.6563 +Kodak,5x5,ldr-rgb-kodak15.png,41.9491,0.0992,0.0793,4.9560 +Kodak,5x5,ldr-rgb-kodak16.png,44.1356,0.0710,0.0528,7.4416 +Kodak,5x5,ldr-rgb-kodak17.png,42.5454,0.0737,0.0538,7.3124 +Kodak,5x5,ldr-rgb-kodak18.png,38.3941,0.1328,0.1120,3.5100 +Kodak,5x5,ldr-rgb-kodak19.png,41.6442,0.0921,0.0718,5.4763 +Kodak,5x5,ldr-rgb-kodak20.png,42.9823,0.0685,0.0506,7.7683 +Kodak,5x5,ldr-rgb-kodak21.png,40.7705,0.0953,0.0767,5.1294 +Kodak,5x5,ldr-rgb-kodak22.png,40.2982,0.1304,0.1097,3.5858 +Kodak,5x5,ldr-rgb-kodak23.png,43.5860,0.0906,0.0711,5.5295 +Kodak,5x5,ldr-rgb-kodak24.png,38.2072,0.1096,0.0896,4.3887 +Kodak,6x6,ldr-rgb-kodak01.png,36.1963,0.1205,0.1017,3.8651 +Kodak,6x6,ldr-rgb-kodak02.png,39.0475,0.1085,0.0892,4.4082 +Kodak,6x6,ldr-rgb-kodak03.png,41.3520,0.0567,0.0390,10.0732 +Kodak,6x6,ldr-rgb-kodak04.png,39.4032,0.0914,0.0716,5.4882 +Kodak,6x6,ldr-rgb-kodak05.png,34.7993,0.1373,0.1177,3.3410 +Kodak,6x6,ldr-rgb-kodak06.png,37.6376,0.0873,0.0689,5.7064 +Kodak,6x6,ldr-rgb-kodak07.png,39.7936,0.0762,0.0567,6.9295 +Kodak,6x6,ldr-rgb-kodak08.png,34.9845,0.1447,0.1241,3.1679 +Kodak,6x6,ldr-rgb-kodak09.png,40.8865,0.0609,0.0416,9.4544 +Kodak,6x6,ldr-rgb-kodak10.png,40.5154,0.0643,0.0445,8.8282 +Kodak,6x6,ldr-rgb-kodak11.png,37.5965,0.0964,0.0779,5.0452 +Kodak,6x6,ldr-rgb-kodak12.png,41.4939,0.0551,0.0373,10.5499 +Kodak,6x6,ldr-rgb-kodak13.png,32.9110,0.1293,0.1097,3.5851 +Kodak,6x6,ldr-rgb-kodak14.png,35.8527,0.1226,0.1028,3.8254 +Kodak,6x6,ldr-rgb-kodak15.png,39.2227,0.0907,0.0712,5.5237 +Kodak,6x6,ldr-rgb-kodak16.png,41.0391,0.0615,0.0434,9.0607 +Kodak,6x6,ldr-rgb-kodak17.png,39.4992,0.0637,0.0440,8.9333 +Kodak,6x6,ldr-rgb-kodak18.png,35.3684,0.1206,0.1003,3.9213 +Kodak,6x6,ldr-rgb-kodak19.png,38.5288,0.0833,0.0635,6.1917 +Kodak,6x6,ldr-rgb-kodak20.png,39.7703,0.0638,0.0459,8.5584 +Kodak,6x6,ldr-rgb-kodak21.png,37.2034,0.0849,0.0663,5.9324 +Kodak,6x6,ldr-rgb-kodak22.png,37.4752,0.1108,0.0908,4.3312 +Kodak,6x6,ldr-rgb-kodak23.png,40.9962,0.0690,0.0497,7.9118 +Kodak,6x6,ldr-rgb-kodak24.png,35.0626,0.0991,0.0794,4.9500 +Kodak,8x8,ldr-rgb-kodak01.png,31.8007,0.1658,0.1464,2.6852 +Kodak,8x8,ldr-rgb-kodak02.png,35.7971,0.1113,0.0910,4.3193 +Kodak,8x8,ldr-rgb-kodak03.png,37.7637,0.0703,0.0519,7.5794 +Kodak,8x8,ldr-rgb-kodak04.png,36.0993,0.1021,0.0818,4.8058 +Kodak,8x8,ldr-rgb-kodak05.png,30.7474,0.1807,0.1606,2.4492 +Kodak,8x8,ldr-rgb-kodak06.png,33.4449,0.1121,0.0928,4.2373 +Kodak,8x8,ldr-rgb-kodak07.png,36.1506,0.0932,0.0729,5.3949 +Kodak,8x8,ldr-rgb-kodak08.png,30.5414,0.1828,0.1618,2.4300 +Kodak,8x8,ldr-rgb-kodak09.png,37.2629,0.0721,0.0522,7.5385 +Kodak,8x8,ldr-rgb-kodak10.png,36.9234,0.0734,0.0530,7.4255 +Kodak,8x8,ldr-rgb-kodak11.png,33.6680,0.1155,0.0962,4.0870 +Kodak,8x8,ldr-rgb-kodak12.png,37.8337,0.0689,0.0503,7.8236 +Kodak,8x8,ldr-rgb-kodak13.png,28.3966,0.1777,0.1575,2.4963 +Kodak,8x8,ldr-rgb-kodak14.png,32.1516,0.1539,0.1343,2.9288 +Kodak,8x8,ldr-rgb-kodak15.png,35.8462,0.0938,0.0739,5.3188 +Kodak,8x8,ldr-rgb-kodak16.png,37.0251,0.0777,0.0591,6.6500 +Kodak,8x8,ldr-rgb-kodak17.png,35.6698,0.0787,0.0584,6.7321 +Kodak,8x8,ldr-rgb-kodak18.png,31.5577,0.1426,0.1216,3.2346 +Kodak,8x8,ldr-rgb-kodak19.png,34.7618,0.0998,0.0793,4.9558 +Kodak,8x8,ldr-rgb-kodak20.png,35.9030,0.0784,0.0599,6.5674 +Kodak,8x8,ldr-rgb-kodak21.png,33.1158,0.1080,0.0889,4.4230 +Kodak,8x8,ldr-rgb-kodak22.png,34.0434,0.1226,0.1021,3.8508 +Kodak,8x8,ldr-rgb-kodak23.png,37.6714,0.0721,0.0525,7.4871 +Kodak,8x8,ldr-rgb-kodak24.png,31.1289,0.1208,0.1004,3.9158 +Kodak,12x12,ldr-rgb-kodak01.png,27.7549,0.1761,0.1539,2.5548 +Kodak,12x12,ldr-rgb-kodak02.png,32.4572,0.0844,0.0615,6.3915 +Kodak,12x12,ldr-rgb-kodak03.png,33.8229,0.0625,0.0413,9.5235 +Kodak,12x12,ldr-rgb-kodak04.png,32.4332,0.0746,0.0509,7.7221 +Kodak,12x12,ldr-rgb-kodak05.png,26.4002,0.1918,0.1687,2.3312 +Kodak,12x12,ldr-rgb-kodak06.png,29.3776,0.1145,0.0926,4.2448 +Kodak,12x12,ldr-rgb-kodak07.png,32.0454,0.0900,0.0672,5.8549 +Kodak,12x12,ldr-rgb-kodak08.png,26.0607,0.1985,0.1747,2.2507 +Kodak,12x12,ldr-rgb-kodak09.png,33.1013,0.0669,0.0441,8.9116 +Kodak,12x12,ldr-rgb-kodak10.png,32.4879,0.0669,0.0437,8.9900 +Kodak,12x12,ldr-rgb-kodak11.png,29.7550,0.1083,0.0863,4.5561 +Kodak,12x12,ldr-rgb-kodak12.png,33.8849,0.0621,0.0407,9.6594 +Kodak,12x12,ldr-rgb-kodak13.png,24.5283,0.1991,0.1758,2.2365 +Kodak,12x12,ldr-rgb-kodak14.png,28.4299,0.1517,0.1295,3.0355 +Kodak,12x12,ldr-rgb-kodak15.png,32.2405,0.0842,0.0613,6.4145 +Kodak,12x12,ldr-rgb-kodak16.png,32.9828,0.0711,0.0497,7.9129 +Kodak,12x12,ldr-rgb-kodak17.png,31.7910,0.0732,0.0500,7.8622 +Kodak,12x12,ldr-rgb-kodak18.png,27.7838,0.1348,0.1109,3.5455 +Kodak,12x12,ldr-rgb-kodak19.png,30.8959,0.0951,0.0716,5.4925 +Kodak,12x12,ldr-rgb-kodak20.png,31.8670,0.0741,0.0529,7.4387 +Kodak,12x12,ldr-rgb-kodak21.png,29.1816,0.1172,0.0953,4.1243 +Kodak,12x12,ldr-rgb-kodak22.png,30.5137,0.1019,0.0787,4.9973 +Kodak,12x12,ldr-rgb-kodak23.png,33.5616,0.0580,0.0354,11.1012 +Kodak,12x12,ldr-rgb-kodak24.png,27.1047,0.1197,0.0964,4.0806 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6143786a3725421fd48c7552d4da770c77def424 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5115,0.2322,0.2144,1.8344 +Kodak,4x4,ldr-rgb-kodak02.png,45.6982,0.3388,0.3193,1.2313 +Kodak,4x4,ldr-rgb-kodak03.png,48.0607,0.2654,0.2477,1.5872 +Kodak,4x4,ldr-rgb-kodak04.png,45.6858,0.3001,0.2806,1.4011 +Kodak,4x4,ldr-rgb-kodak05.png,42.4370,0.2940,0.2750,1.4299 +Kodak,4x4,ldr-rgb-kodak06.png,45.3960,0.2441,0.2262,1.7380 +Kodak,4x4,ldr-rgb-kodak07.png,46.3753,0.2935,0.2745,1.4323 +Kodak,4x4,ldr-rgb-kodak08.png,42.8242,0.3092,0.2892,1.3597 +Kodak,4x4,ldr-rgb-kodak09.png,47.4389,0.3143,0.2953,1.3316 +Kodak,4x4,ldr-rgb-kodak10.png,47.0911,0.3129,0.2933,1.3405 +Kodak,4x4,ldr-rgb-kodak11.png,45.1383,0.2816,0.2632,1.4938 +Kodak,4x4,ldr-rgb-kodak12.png,48.2774,0.2697,0.2514,1.5638 +Kodak,4x4,ldr-rgb-kodak13.png,41.7584,0.2430,0.2235,1.7597 +Kodak,4x4,ldr-rgb-kodak14.png,42.9859,0.2773,0.2582,1.5227 +Kodak,4x4,ldr-rgb-kodak15.png,45.8334,0.2882,0.2692,1.4607 +Kodak,4x4,ldr-rgb-kodak16.png,48.0940,0.2666,0.2487,1.5809 +Kodak,4x4,ldr-rgb-kodak17.png,46.5075,0.2812,0.2619,1.5016 +Kodak,4x4,ldr-rgb-kodak18.png,42.2101,0.3299,0.3095,1.2706 +Kodak,4x4,ldr-rgb-kodak19.png,45.5658,0.2980,0.2782,1.4136 +Kodak,4x4,ldr-rgb-kodak20.png,47.1799,0.1905,0.1730,2.2726 +Kodak,4x4,ldr-rgb-kodak21.png,45.3342,0.3007,0.2825,1.3921 +Kodak,4x4,ldr-rgb-kodak22.png,44.0086,0.3434,0.3239,1.2139 +Kodak,4x4,ldr-rgb-kodak23.png,47.1907,0.3308,0.3120,1.2605 +Kodak,4x4,ldr-rgb-kodak24.png,42.6019,0.2939,0.2743,1.4334 +Kodak,5x5,ldr-rgb-kodak01.png,40.2236,0.2878,0.2688,1.4629 +Kodak,5x5,ldr-rgb-kodak02.png,42.0380,0.3793,0.3591,1.0950 +Kodak,5x5,ldr-rgb-kodak03.png,44.3676,0.2842,0.2653,1.4821 +Kodak,5x5,ldr-rgb-kodak04.png,42.2612,0.3135,0.2931,1.3414 +Kodak,5x5,ldr-rgb-kodak05.png,38.1929,0.3424,0.3222,1.2205 +Kodak,5x5,ldr-rgb-kodak06.png,41.0984,0.2705,0.2516,1.5629 +Kodak,5x5,ldr-rgb-kodak07.png,42.7456,0.3169,0.2964,1.3268 +Kodak,5x5,ldr-rgb-kodak08.png,38.5418,0.3408,0.3192,1.2319 +Kodak,5x5,ldr-rgb-kodak09.png,44.0366,0.3076,0.2880,1.3656 +Kodak,5x5,ldr-rgb-kodak10.png,43.6071,0.3166,0.2961,1.3278 +Kodak,5x5,ldr-rgb-kodak11.png,41.0130,0.3050,0.2860,1.3751 +Kodak,5x5,ldr-rgb-kodak12.png,44.6149,0.2844,0.2659,1.4788 +Kodak,5x5,ldr-rgb-kodak13.png,36.9748,0.2640,0.2440,1.6115 +Kodak,5x5,ldr-rgb-kodak14.png,38.9092,0.3152,0.2952,1.3320 +Kodak,5x5,ldr-rgb-kodak15.png,42.1668,0.3069,0.2870,1.3699 +Kodak,5x5,ldr-rgb-kodak16.png,44.2715,0.2801,0.2616,1.5030 +Kodak,5x5,ldr-rgb-kodak17.png,42.6407,0.2887,0.2686,1.4642 +Kodak,5x5,ldr-rgb-kodak18.png,38.4820,0.3401,0.3189,1.2331 +Kodak,5x5,ldr-rgb-kodak19.png,41.7841,0.3178,0.2973,1.3227 +Kodak,5x5,ldr-rgb-kodak20.png,43.2953,0.2031,0.1849,2.1270 +Kodak,5x5,ldr-rgb-kodak21.png,40.8774,0.3249,0.3054,1.2876 +Kodak,5x5,ldr-rgb-kodak22.png,40.4425,0.3691,0.3484,1.1285 +Kodak,5x5,ldr-rgb-kodak23.png,43.9057,0.3620,0.3426,1.1477 +Kodak,5x5,ldr-rgb-kodak24.png,38.3273,0.3203,0.3003,1.3096 +Kodak,6x6,ldr-rgb-kodak01.png,36.3105,0.3328,0.3138,1.2530 +Kodak,6x6,ldr-rgb-kodak02.png,39.4083,0.4190,0.3996,0.9841 +Kodak,6x6,ldr-rgb-kodak03.png,41.7533,0.2557,0.2378,1.6533 +Kodak,6x6,ldr-rgb-kodak04.png,39.6674,0.3372,0.3175,1.2387 +Kodak,6x6,ldr-rgb-kodak05.png,34.9944,0.3802,0.3608,1.0900 +Kodak,6x6,ldr-rgb-kodak06.png,37.7608,0.2957,0.2773,1.4183 +Kodak,6x6,ldr-rgb-kodak07.png,40.1279,0.2988,0.2788,1.4103 +Kodak,6x6,ldr-rgb-kodak08.png,35.1750,0.3753,0.3548,1.1082 +Kodak,6x6,ldr-rgb-kodak09.png,41.2718,0.3218,0.3022,1.3011 +Kodak,6x6,ldr-rgb-kodak10.png,40.8412,0.3463,0.3266,1.2038 +Kodak,6x6,ldr-rgb-kodak11.png,37.7820,0.3291,0.3106,1.2659 +Kodak,6x6,ldr-rgb-kodak12.png,41.8395,0.2975,0.2794,1.4076 +Kodak,6x6,ldr-rgb-kodak13.png,32.9600,0.3150,0.2955,1.3307 +Kodak,6x6,ldr-rgb-kodak14.png,36.0500,0.3586,0.3397,1.1575 +Kodak,6x6,ldr-rgb-kodak15.png,39.4760,0.3008,0.2813,1.3980 +Kodak,6x6,ldr-rgb-kodak16.png,41.2318,0.2823,0.2644,1.4872 +Kodak,6x6,ldr-rgb-kodak17.png,39.6707,0.3118,0.2922,1.3457 +Kodak,6x6,ldr-rgb-kodak18.png,35.4565,0.3807,0.3603,1.0914 +Kodak,6x6,ldr-rgb-kodak19.png,38.7066,0.3546,0.3346,1.1750 +Kodak,6x6,ldr-rgb-kodak20.png,40.1121,0.2237,0.2059,1.9093 +Kodak,6x6,ldr-rgb-kodak21.png,37.3497,0.3526,0.3341,1.1771 +Kodak,6x6,ldr-rgb-kodak22.png,37.6441,0.4080,0.3874,1.0149 +Kodak,6x6,ldr-rgb-kodak23.png,41.4416,0.3696,0.3505,1.1219 +Kodak,6x6,ldr-rgb-kodak24.png,35.1795,0.3364,0.3165,1.2422 +Kodak,8x8,ldr-rgb-kodak01.png,31.9076,0.4233,0.4027,0.9765 +Kodak,8x8,ldr-rgb-kodak02.png,36.1658,0.4256,0.4042,0.9729 +Kodak,8x8,ldr-rgb-kodak03.png,38.2015,0.2292,0.2094,1.8781 +Kodak,8x8,ldr-rgb-kodak04.png,36.3849,0.3422,0.3201,1.2282 +Kodak,8x8,ldr-rgb-kodak05.png,30.9159,0.4609,0.4393,0.8951 +Kodak,8x8,ldr-rgb-kodak06.png,33.5799,0.3532,0.3324,1.1830 +Kodak,8x8,ldr-rgb-kodak07.png,36.5075,0.2821,0.2608,1.5075 +Kodak,8x8,ldr-rgb-kodak08.png,30.7382,0.4988,0.4764,0.8255 +Kodak,8x8,ldr-rgb-kodak09.png,37.5585,0.2575,0.2360,1.6661 +Kodak,8x8,ldr-rgb-kodak10.png,37.2383,0.2946,0.2727,1.4418 +Kodak,8x8,ldr-rgb-kodak11.png,33.8328,0.4075,0.3867,1.0170 +Kodak,8x8,ldr-rgb-kodak12.png,38.2628,0.2657,0.2453,1.6029 +Kodak,8x8,ldr-rgb-kodak13.png,28.4607,0.4379,0.4155,0.9463 +Kodak,8x8,ldr-rgb-kodak14.png,32.3242,0.4457,0.4248,0.9257 +Kodak,8x8,ldr-rgb-kodak15.png,36.0684,0.3259,0.3043,1.2922 +Kodak,8x8,ldr-rgb-kodak16.png,37.2660,0.2851,0.2654,1.4816 +Kodak,8x8,ldr-rgb-kodak17.png,35.8716,0.2823,0.2604,1.5099 +Kodak,8x8,ldr-rgb-kodak18.png,31.6551,0.4527,0.4303,0.9139 +Kodak,8x8,ldr-rgb-kodak19.png,34.9274,0.3073,0.2852,1.3788 +Kodak,8x8,ldr-rgb-kodak20.png,36.1555,0.2464,0.2264,1.7368 +Kodak,8x8,ldr-rgb-kodak21.png,33.2255,0.3293,0.3087,1.2739 +Kodak,8x8,ldr-rgb-kodak22.png,34.2304,0.4234,0.4016,0.9792 +Kodak,8x8,ldr-rgb-kodak23.png,38.1991,0.2809,0.2597,1.5140 +Kodak,8x8,ldr-rgb-kodak24.png,31.2348,0.3721,0.3504,1.1222 +Kodak,12x12,ldr-rgb-kodak01.png,27.9132,0.5316,0.5070,0.7756 +Kodak,12x12,ldr-rgb-kodak02.png,33.0052,0.3946,0.3695,1.0643 +Kodak,12x12,ldr-rgb-kodak03.png,34.4542,0.2360,0.2122,1.8527 +Kodak,12x12,ldr-rgb-kodak04.png,32.9738,0.3457,0.3192,1.2318 +Kodak,12x12,ldr-rgb-kodak05.png,26.6073,0.5730,0.5477,0.7179 +Kodak,12x12,ldr-rgb-kodak06.png,29.5310,0.3876,0.3634,1.0819 +Kodak,12x12,ldr-rgb-kodak07.png,32.6281,0.3024,0.2770,1.4197 +Kodak,12x12,ldr-rgb-kodak08.png,26.2616,0.5781,0.5515,0.7129 +Kodak,12x12,ldr-rgb-kodak09.png,33.6343,0.2732,0.2477,1.5874 +Kodak,12x12,ldr-rgb-kodak10.png,32.9910,0.2690,0.2433,1.6160 +Kodak,12x12,ldr-rgb-kodak11.png,30.0541,0.4209,0.3966,0.9914 +Kodak,12x12,ldr-rgb-kodak12.png,34.4512,0.2481,0.2237,1.7576 +Kodak,12x12,ldr-rgb-kodak13.png,24.5887,0.6160,0.5906,0.6658 +Kodak,12x12,ldr-rgb-kodak14.png,28.6476,0.5072,0.4826,0.8148 +Kodak,12x12,ldr-rgb-kodak15.png,32.7352,0.3323,0.3071,1.2804 +Kodak,12x12,ldr-rgb-kodak16.png,33.3387,0.2921,0.2685,1.4647 +Kodak,12x12,ldr-rgb-kodak17.png,32.1425,0.2892,0.2632,1.4941 +Kodak,12x12,ldr-rgb-kodak18.png,27.9244,0.5041,0.4780,0.8227 +Kodak,12x12,ldr-rgb-kodak19.png,31.1081,0.3960,0.3699,1.0630 +Kodak,12x12,ldr-rgb-kodak20.png,32.1616,0.3074,0.2836,1.3866 +Kodak,12x12,ldr-rgb-kodak21.png,29.3265,0.3742,0.3492,1.1261 +Kodak,12x12,ldr-rgb-kodak22.png,30.7890,0.4429,0.4169,0.9432 +Kodak,12x12,ldr-rgb-kodak23.png,34.3835,0.2448,0.2193,1.7929 +Kodak,12x12,ldr-rgb-kodak24.png,27.2381,0.4507,0.4249,0.9255 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..d2fba4ca1caa57b3620ead249c5cf57a8cafe6c0 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.8820,0.0324,0.0157,25.1030 +Kodak,4x4,ldr-rgb-kodak02.png,44.2873,0.0404,0.0230,17.0971 +Kodak,4x4,ldr-rgb-kodak03.png,46.7875,0.0286,0.0128,30.7389 +Kodak,4x4,ldr-rgb-kodak04.png,44.6627,0.0380,0.0203,19.3351 +Kodak,4x4,ldr-rgb-kodak05.png,41.6532,0.0480,0.0305,12.9038 +Kodak,4x4,ldr-rgb-kodak06.png,44.7930,0.0316,0.0155,25.3328 +Kodak,4x4,ldr-rgb-kodak07.png,45.1555,0.0345,0.0173,22.7608 +Kodak,4x4,ldr-rgb-kodak08.png,42.1261,0.0500,0.0315,12.4644 +Kodak,4x4,ldr-rgb-kodak09.png,46.3501,0.0287,0.0116,33.8221 +Kodak,4x4,ldr-rgb-kodak10.png,46.1138,0.0297,0.0123,32.0234 +Kodak,4x4,ldr-rgb-kodak11.png,44.3024,0.0352,0.0189,20.7997 +Kodak,4x4,ldr-rgb-kodak12.png,47.1128,0.0271,0.0115,34.1513 +Kodak,4x4,ldr-rgb-kodak13.png,41.4830,0.0435,0.0261,15.0767 +Kodak,4x4,ldr-rgb-kodak14.png,41.9274,0.0422,0.0254,15.4913 +Kodak,4x4,ldr-rgb-kodak15.png,44.7388,0.0393,0.0221,17.8110 +Kodak,4x4,ldr-rgb-kodak16.png,47.2478,0.0259,0.0101,38.8246 +Kodak,4x4,ldr-rgb-kodak17.png,45.8440,0.0288,0.0112,35.2280 +Kodak,4x4,ldr-rgb-kodak18.png,41.6843,0.0485,0.0302,13.0359 +Kodak,4x4,ldr-rgb-kodak19.png,44.8511,0.0329,0.0151,25.9723 +Kodak,4x4,ldr-rgb-kodak20.png,46.4186,0.0284,0.0130,30.3475 +Kodak,4x4,ldr-rgb-kodak21.png,44.6411,0.0321,0.0159,24.7244 +Kodak,4x4,ldr-rgb-kodak22.png,43.2351,0.0433,0.0254,15.4559 +Kodak,4x4,ldr-rgb-kodak23.png,45.6659,0.0320,0.0155,25.3215 +Kodak,4x4,ldr-rgb-kodak24.png,41.9807,0.0422,0.0244,16.0931 +Kodak,5x5,ldr-rgb-kodak01.png,39.6135,0.0316,0.0151,26.0371 +Kodak,5x5,ldr-rgb-kodak02.png,40.6534,0.0323,0.0148,26.5724 +Kodak,5x5,ldr-rgb-kodak03.png,43.0540,0.0261,0.0100,39.2823 +Kodak,5x5,ldr-rgb-kodak04.png,41.2613,0.0314,0.0136,28.9234 +Kodak,5x5,ldr-rgb-kodak05.png,37.4541,0.0437,0.0260,15.1441 +Kodak,5x5,ldr-rgb-kodak06.png,40.5884,0.0285,0.0122,32.1463 +Kodak,5x5,ldr-rgb-kodak07.png,41.4931,0.0304,0.0129,30.5386 +Kodak,5x5,ldr-rgb-kodak08.png,37.7792,0.0447,0.0260,15.1383 +Kodak,5x5,ldr-rgb-kodak09.png,42.9214,0.0263,0.0089,44.3805 +Kodak,5x5,ldr-rgb-kodak10.png,42.6313,0.0271,0.0093,42.3497 +Kodak,5x5,ldr-rgb-kodak11.png,40.3040,0.0308,0.0141,27.7907 +Kodak,5x5,ldr-rgb-kodak12.png,43.4157,0.0243,0.0084,47.0856 +Kodak,5x5,ldr-rgb-kodak13.png,36.8276,0.0401,0.0222,17.7341 +Kodak,5x5,ldr-rgb-kodak14.png,38.0242,0.0405,0.0234,16.8034 +Kodak,5x5,ldr-rgb-kodak15.png,41.1917,0.0315,0.0141,27.8560 +Kodak,5x5,ldr-rgb-kodak16.png,43.4667,0.0235,0.0076,51.5219 +Kodak,5x5,ldr-rgb-kodak17.png,42.0469,0.0264,0.0087,45.1767 +Kodak,5x5,ldr-rgb-kodak18.png,38.1147,0.0386,0.0199,19.7854 +Kodak,5x5,ldr-rgb-kodak19.png,41.1276,0.0287,0.0110,35.6660 +Kodak,5x5,ldr-rgb-kodak20.png,42.3603,0.0257,0.0097,40.5126 +Kodak,5x5,ldr-rgb-kodak21.png,40.4227,0.0298,0.0131,29.9801 +Kodak,5x5,ldr-rgb-kodak22.png,39.7897,0.0339,0.0159,24.7148 +Kodak,5x5,ldr-rgb-kodak23.png,42.5143,0.0277,0.0106,36.9501 +Kodak,5x5,ldr-rgb-kodak24.png,37.8892,0.0363,0.0184,21.3172 +Kodak,6x6,ldr-rgb-kodak01.png,35.7507,0.0388,0.0221,17.8176 +Kodak,6x6,ldr-rgb-kodak02.png,38.1712,0.0325,0.0154,25.5998 +Kodak,6x6,ldr-rgb-kodak03.png,40.5686,0.0256,0.0098,39.9290 +Kodak,6x6,ldr-rgb-kodak04.png,38.5433,0.0317,0.0141,27.9012 +Kodak,6x6,ldr-rgb-kodak05.png,34.3631,0.0489,0.0314,12.5396 +Kodak,6x6,ldr-rgb-kodak06.png,37.3004,0.0314,0.0151,26.0322 +Kodak,6x6,ldr-rgb-kodak07.png,38.8820,0.0310,0.0137,28.6182 +Kodak,6x6,ldr-rgb-kodak08.png,34.4474,0.0499,0.0313,12.5599 +Kodak,6x6,ldr-rgb-kodak09.png,39.9734,0.0275,0.0104,37.8750 +Kodak,6x6,ldr-rgb-kodak10.png,39.7372,0.0276,0.0101,38.9318 +Kodak,6x6,ldr-rgb-kodak11.png,37.1533,0.0330,0.0165,23.7609 +Kodak,6x6,ldr-rgb-kodak12.png,40.7387,0.0245,0.0087,45.2548 +Kodak,6x6,ldr-rgb-kodak13.png,32.8130,0.0499,0.0322,12.2189 +Kodak,6x6,ldr-rgb-kodak14.png,35.3037,0.0442,0.0272,14.4741 +Kodak,6x6,ldr-rgb-kodak15.png,38.5680,0.0319,0.0147,26.8208 +Kodak,6x6,ldr-rgb-kodak16.png,40.4942,0.0243,0.0087,45.1248 +Kodak,6x6,ldr-rgb-kodak17.png,38.9398,0.0279,0.0103,38.0138 +Kodak,6x6,ldr-rgb-kodak18.png,35.1209,0.0408,0.0223,17.6330 +Kodak,6x6,ldr-rgb-kodak19.png,37.9783,0.0324,0.0147,26.8278 +Kodak,6x6,ldr-rgb-kodak20.png,39.1839,0.0272,0.0116,34.0238 +Kodak,6x6,ldr-rgb-kodak21.png,36.9075,0.0331,0.0168,23.4125 +Kodak,6x6,ldr-rgb-kodak22.png,36.9849,0.0352,0.0175,22.4158 +Kodak,6x6,ldr-rgb-kodak23.png,40.0615,0.0273,0.0104,37.8533 +Kodak,6x6,ldr-rgb-kodak24.png,34.7936,0.0379,0.0204,19.2865 +Kodak,8x8,ldr-rgb-kodak01.png,31.3361,0.0500,0.0331,11.8918 +Kodak,8x8,ldr-rgb-kodak02.png,34.9328,0.0327,0.0152,25.8085 +Kodak,8x8,ldr-rgb-kodak03.png,36.5952,0.0275,0.0114,34.4236 +Kodak,8x8,ldr-rgb-kodak04.png,35.1760,0.0329,0.0149,26.3478 +Kodak,8x8,ldr-rgb-kodak05.png,30.2523,0.0581,0.0401,9.8088 +Kodak,8x8,ldr-rgb-kodak06.png,32.9457,0.0395,0.0229,17.1747 +Kodak,8x8,ldr-rgb-kodak07.png,34.9951,0.0343,0.0170,23.1032 +Kodak,8x8,ldr-rgb-kodak08.png,29.9694,0.0599,0.0413,9.5219 +Kodak,8x8,ldr-rgb-kodak09.png,36.1703,0.0299,0.0126,31.1259 +Kodak,8x8,ldr-rgb-kodak10.png,35.8857,0.0295,0.0117,33.5019 +Kodak,8x8,ldr-rgb-kodak11.png,33.0088,0.0377,0.0211,18.6723 +Kodak,8x8,ldr-rgb-kodak12.png,36.7290,0.0269,0.0111,35.5178 +Kodak,8x8,ldr-rgb-kodak13.png,28.2209,0.0660,0.0481,8.1691 +Kodak,8x8,ldr-rgb-kodak14.png,31.5032,0.0491,0.0320,12.2911 +Kodak,8x8,ldr-rgb-kodak15.png,34.9394,0.0328,0.0156,25.2630 +Kodak,8x8,ldr-rgb-kodak16.png,36.0527,0.0296,0.0137,28.6227 +Kodak,8x8,ldr-rgb-kodak17.png,34.9073,0.0316,0.0135,29.0538 +Kodak,8x8,ldr-rgb-kodak18.png,31.2398,0.0466,0.0281,14.0098 +Kodak,8x8,ldr-rgb-kodak19.png,34.2235,0.0364,0.0185,21.2551 +Kodak,8x8,ldr-rgb-kodak20.png,35.2317,0.0292,0.0135,29.0451 +Kodak,8x8,ldr-rgb-kodak21.png,32.7551,0.0389,0.0224,17.5896 +Kodak,8x8,ldr-rgb-kodak22.png,33.4546,0.0378,0.0200,19.6892 +Kodak,8x8,ldr-rgb-kodak23.png,36.5268,0.0280,0.0106,36.9352 +Kodak,8x8,ldr-rgb-kodak24.png,30.8238,0.0434,0.0255,15.4117 +Kodak,12x12,ldr-rgb-kodak01.png,27.1080,0.0467,0.0280,14.0474 +Kodak,12x12,ldr-rgb-kodak02.png,31.1083,0.0278,0.0087,45.4319 +Kodak,12x12,ldr-rgb-kodak03.png,32.6856,0.0253,0.0076,51.7336 +Kodak,12x12,ldr-rgb-kodak04.png,31.5645,0.0268,0.0071,55.3836 +Kodak,12x12,ldr-rgb-kodak05.png,25.8227,0.0513,0.0317,12.4059 +Kodak,12x12,ldr-rgb-kodak06.png,28.6373,0.0378,0.0196,20.0734 +Kodak,12x12,ldr-rgb-kodak07.png,30.8590,0.0293,0.0102,38.4597 +Kodak,12x12,ldr-rgb-kodak08.png,25.4179,0.0573,0.0369,10.6586 +Kodak,12x12,ldr-rgb-kodak09.png,31.8377,0.0279,0.0088,44.9184 +Kodak,12x12,ldr-rgb-kodak10.png,31.5385,0.0280,0.0083,47.1139 +Kodak,12x12,ldr-rgb-kodak11.png,28.9359,0.0329,0.0146,26.9215 +Kodak,12x12,ldr-rgb-kodak12.png,32.2823,0.0250,0.0072,54.4079 +Kodak,12x12,ldr-rgb-kodak13.png,24.3217,0.0592,0.0397,9.9105 +Kodak,12x12,ldr-rgb-kodak14.png,27.5443,0.0390,0.0205,19.2254 +Kodak,12x12,ldr-rgb-kodak15.png,31.2551,0.0300,0.0108,36.2644 +Kodak,12x12,ldr-rgb-kodak16.png,31.4853,0.0270,0.0093,42.1398 +Kodak,12x12,ldr-rgb-kodak17.png,30.8975,0.0288,0.0092,42.7914 +Kodak,12x12,ldr-rgb-kodak18.png,27.4230,0.0395,0.0194,20.3034 +Kodak,12x12,ldr-rgb-kodak19.png,30.1902,0.0342,0.0145,27.1502 +Kodak,12x12,ldr-rgb-kodak20.png,31.0526,0.0281,0.0103,38.1616 +Kodak,12x12,ldr-rgb-kodak21.png,28.7136,0.0373,0.0190,20.6911 +Kodak,12x12,ldr-rgb-kodak22.png,29.8371,0.0309,0.0113,34.8189 +Kodak,12x12,ldr-rgb-kodak23.png,32.5213,0.0265,0.0076,51.4143 +Kodak,12x12,ldr-rgb-kodak24.png,26.7723,0.0396,0.0199,19.7647 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..3306593e61d564170d8c48840a32a320da039d2c --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5460,0.0273,0.0113,34.7639 +Kodak,4x4,ldr-rgb-kodak02.png,43.8803,0.0317,0.0150,26.1357 +Kodak,4x4,ldr-rgb-kodak03.png,46.1873,0.0241,0.0091,43.3687 +Kodak,4x4,ldr-rgb-kodak04.png,44.2426,0.0303,0.0135,29.1380 +Kodak,4x4,ldr-rgb-kodak05.png,41.1063,0.0351,0.0183,21.5026 +Kodak,4x4,ldr-rgb-kodak06.png,44.5076,0.0268,0.0112,35.0304 +Kodak,4x4,ldr-rgb-kodak07.png,44.7021,0.0281,0.0116,33.8867 +Kodak,4x4,ldr-rgb-kodak08.png,41.5547,0.0366,0.0187,21.0285 +Kodak,4x4,ldr-rgb-kodak09.png,46.0133,0.0253,0.0087,45.2238 +Kodak,4x4,ldr-rgb-kodak10.png,45.7710,0.0260,0.0091,43.1012 +Kodak,4x4,ldr-rgb-kodak11.png,43.9057,0.0285,0.0128,30.8188 +Kodak,4x4,ldr-rgb-kodak12.png,46.5477,0.0237,0.0086,45.9470 +Kodak,4x4,ldr-rgb-kodak13.png,41.2213,0.0342,0.0173,22.6912 +Kodak,4x4,ldr-rgb-kodak14.png,41.2633,0.0313,0.0151,26.0890 +Kodak,4x4,ldr-rgb-kodak15.png,44.2793,0.0308,0.0140,28.0650 +Kodak,4x4,ldr-rgb-kodak16.png,47.1118,0.0231,0.0081,48.5150 +Kodak,4x4,ldr-rgb-kodak17.png,45.6149,0.0253,0.0086,45.8143 +Kodak,4x4,ldr-rgb-kodak18.png,41.3441,0.0358,0.0182,21.5557 +Kodak,4x4,ldr-rgb-kodak19.png,44.5863,0.0280,0.0109,36.0977 +Kodak,4x4,ldr-rgb-kodak20.png,45.9269,0.0242,0.0093,42.4959 +Kodak,4x4,ldr-rgb-kodak21.png,44.3216,0.0272,0.0113,34.7859 +Kodak,4x4,ldr-rgb-kodak22.png,42.8634,0.0331,0.0159,24.7630 +Kodak,4x4,ldr-rgb-kodak23.png,45.3579,0.0273,0.0109,36.0488 +Kodak,4x4,ldr-rgb-kodak24.png,41.4243,0.0322,0.0151,26.0129 +Kodak,5x5,ldr-rgb-kodak01.png,39.3930,0.0285,0.0127,31.0597 +Kodak,5x5,ldr-rgb-kodak02.png,40.4266,0.0279,0.0113,34.7273 +Kodak,5x5,ldr-rgb-kodak03.png,42.6948,0.0231,0.0079,49.8811 +Kodak,5x5,ldr-rgb-kodak04.png,40.8613,0.0277,0.0106,36.9700 +Kodak,5x5,ldr-rgb-kodak05.png,37.1066,0.0350,0.0182,21.5602 +Kodak,5x5,ldr-rgb-kodak06.png,40.4306,0.0259,0.0103,38.2022 +Kodak,5x5,ldr-rgb-kodak07.png,41.1804,0.0267,0.0101,39.0018 +Kodak,5x5,ldr-rgb-kodak08.png,37.4468,0.0365,0.0186,21.1385 +Kodak,5x5,ldr-rgb-kodak09.png,42.6180,0.0239,0.0075,52.5680 +Kodak,5x5,ldr-rgb-kodak10.png,42.4264,0.0246,0.0078,50.5027 +Kodak,5x5,ldr-rgb-kodak11.png,40.0808,0.0267,0.0110,35.8023 +Kodak,5x5,ldr-rgb-kodak12.png,43.2020,0.0222,0.0071,55.2038 +Kodak,5x5,ldr-rgb-kodak13.png,36.7364,0.0347,0.0176,22.2937 +Kodak,5x5,ldr-rgb-kodak14.png,37.5843,0.0311,0.0151,26.0354 +Kodak,5x5,ldr-rgb-kodak15.png,40.9222,0.0272,0.0105,37.3036 +Kodak,5x5,ldr-rgb-kodak16.png,43.3847,0.0220,0.0070,56.2544 +Kodak,5x5,ldr-rgb-kodak17.png,41.9201,0.0244,0.0075,52.6334 +Kodak,5x5,ldr-rgb-kodak18.png,37.9619,0.0325,0.0149,26.3659 +Kodak,5x5,ldr-rgb-kodak19.png,40.8871,0.0266,0.0095,41.2523 +Kodak,5x5,ldr-rgb-kodak20.png,42.0751,0.0232,0.0080,48.9993 +Kodak,5x5,ldr-rgb-kodak21.png,40.2318,0.0263,0.0107,36.8420 +Kodak,5x5,ldr-rgb-kodak22.png,39.5098,0.0292,0.0123,32.0626 +Kodak,5x5,ldr-rgb-kodak23.png,42.2176,0.0250,0.0088,44.9037 +Kodak,5x5,ldr-rgb-kodak24.png,37.6858,0.0304,0.0134,29.3031 +Kodak,6x6,ldr-rgb-kodak01.png,35.6604,0.0326,0.0168,23.3392 +Kodak,6x6,ldr-rgb-kodak02.png,38.0761,0.0277,0.0113,34.7331 +Kodak,6x6,ldr-rgb-kodak03.png,40.4029,0.0224,0.0076,51.9438 +Kodak,6x6,ldr-rgb-kodak04.png,38.3307,0.0274,0.0106,37.0889 +Kodak,6x6,ldr-rgb-kodak05.png,34.1621,0.0377,0.0209,18.7891 +Kodak,6x6,ldr-rgb-kodak06.png,37.2413,0.0272,0.0119,33.0932 +Kodak,6x6,ldr-rgb-kodak07.png,38.6918,0.0267,0.0103,38.1616 +Kodak,6x6,ldr-rgb-kodak08.png,34.2562,0.0392,0.0215,18.2593 +Kodak,6x6,ldr-rgb-kodak09.png,39.8018,0.0246,0.0082,47.8715 +Kodak,6x6,ldr-rgb-kodak10.png,39.6065,0.0249,0.0080,48.9324 +Kodak,6x6,ldr-rgb-kodak11.png,37.0350,0.0276,0.0122,32.3234 +Kodak,6x6,ldr-rgb-kodak12.png,40.6117,0.0221,0.0071,55.1797 +Kodak,6x6,ldr-rgb-kodak13.png,32.7512,0.0404,0.0236,16.6574 +Kodak,6x6,ldr-rgb-kodak14.png,35.0163,0.0327,0.0167,23.4938 +Kodak,6x6,ldr-rgb-kodak15.png,38.4450,0.0272,0.0108,36.2875 +Kodak,6x6,ldr-rgb-kodak16.png,40.4576,0.0223,0.0074,52.8510 +Kodak,6x6,ldr-rgb-kodak17.png,38.8609,0.0252,0.0085,46.4478 +Kodak,6x6,ldr-rgb-kodak18.png,35.0294,0.0338,0.0164,23.9576 +Kodak,6x6,ldr-rgb-kodak19.png,37.8582,0.0285,0.0115,34.1124 +Kodak,6x6,ldr-rgb-kodak20.png,39.0412,0.0239,0.0090,43.8320 +Kodak,6x6,ldr-rgb-kodak21.png,36.8328,0.0283,0.0127,30.8892 +Kodak,6x6,ldr-rgb-kodak22.png,36.8810,0.0298,0.0130,30.3057 +Kodak,6x6,ldr-rgb-kodak23.png,39.9091,0.0243,0.0081,48.3118 +Kodak,6x6,ldr-rgb-kodak24.png,34.7176,0.0319,0.0151,26.0597 +Kodak,8x8,ldr-rgb-kodak01.png,31.2005,0.0407,0.0242,16.2781 +Kodak,8x8,ldr-rgb-kodak02.png,34.7312,0.0288,0.0117,33.5456 +Kodak,8x8,ldr-rgb-kodak03.png,36.4659,0.0248,0.0090,43.6904 +Kodak,8x8,ldr-rgb-kodak04.png,35.0660,0.0290,0.0114,34.6288 +Kodak,8x8,ldr-rgb-kodak05.png,30.0650,0.0466,0.0291,13.5321 +Kodak,8x8,ldr-rgb-kodak06.png,32.8162,0.0334,0.0172,22.8855 +Kodak,8x8,ldr-rgb-kodak07.png,34.8365,0.0301,0.0129,30.4467 +Kodak,8x8,ldr-rgb-kodak08.png,29.7191,0.0489,0.0304,12.9271 +Kodak,8x8,ldr-rgb-kodak09.png,35.9333,0.0271,0.0099,39.8480 +Kodak,8x8,ldr-rgb-kodak10.png,35.7348,0.0270,0.0093,42.1280 +Kodak,8x8,ldr-rgb-kodak11.png,32.8802,0.0321,0.0158,24.8522 +Kodak,8x8,ldr-rgb-kodak12.png,36.5229,0.0246,0.0088,44.4558 +Kodak,8x8,ldr-rgb-kodak13.png,28.1448,0.0524,0.0345,11.3841 +Kodak,8x8,ldr-rgb-kodak14.png,31.3242,0.0396,0.0228,17.2478 +Kodak,8x8,ldr-rgb-kodak15.png,34.7681,0.0290,0.0118,33.3259 +Kodak,8x8,ldr-rgb-kodak16.png,35.9653,0.0264,0.0107,36.6773 +Kodak,8x8,ldr-rgb-kodak17.png,34.7354,0.0282,0.0105,37.2935 +Kodak,8x8,ldr-rgb-kodak18.png,31.1735,0.0388,0.0205,19.2198 +Kodak,8x8,ldr-rgb-kodak19.png,33.9079,0.0320,0.0141,27.8640 +Kodak,8x8,ldr-rgb-kodak20.png,35.0719,0.0262,0.0105,37.5927 +Kodak,8x8,ldr-rgb-kodak21.png,32.6481,0.0330,0.0167,23.5798 +Kodak,8x8,ldr-rgb-kodak22.png,33.3422,0.0326,0.0148,26.5237 +Kodak,8x8,ldr-rgb-kodak23.png,36.4038,0.0253,0.0084,46.7228 +Kodak,8x8,ldr-rgb-kodak24.png,30.7489,0.0366,0.0190,20.6673 +Kodak,12x12,ldr-rgb-kodak01.png,26.9943,0.0382,0.0201,19.5534 +Kodak,12x12,ldr-rgb-kodak02.png,31.0366,0.0255,0.0070,56.5205 +Kodak,12x12,ldr-rgb-kodak03.png,32.6255,0.0233,0.0062,63.6071 +Kodak,12x12,ldr-rgb-kodak04.png,31.4723,0.0249,0.0059,66.9400 +Kodak,12x12,ldr-rgb-kodak05.png,25.7076,0.0417,0.0227,17.3055 +Kodak,12x12,ldr-rgb-kodak06.png,28.4878,0.0320,0.0145,27.0416 +Kodak,12x12,ldr-rgb-kodak07.png,30.8029,0.0265,0.0080,49.3246 +Kodak,12x12,ldr-rgb-kodak08.png,25.2189,0.0465,0.0267,14.7168 +Kodak,12x12,ldr-rgb-kodak09.png,31.6427,0.0254,0.0070,56.4798 +Kodak,12x12,ldr-rgb-kodak10.png,31.4531,0.0256,0.0068,57.5379 +Kodak,12x12,ldr-rgb-kodak11.png,28.8669,0.0286,0.0110,35.8318 +Kodak,12x12,ldr-rgb-kodak12.png,32.1856,0.0231,0.0060,65.4497 +Kodak,12x12,ldr-rgb-kodak13.png,24.2460,0.0471,0.0282,13.9527 +Kodak,12x12,ldr-rgb-kodak14.png,27.4553,0.0332,0.0151,25.9924 +Kodak,12x12,ldr-rgb-kodak15.png,31.1581,0.0270,0.0085,46.2939 +Kodak,12x12,ldr-rgb-kodak16.png,31.3640,0.0246,0.0075,52.6754 +Kodak,12x12,ldr-rgb-kodak17.png,30.8429,0.0262,0.0073,54.0354 +Kodak,12x12,ldr-rgb-kodak18.png,27.3755,0.0337,0.0142,27.5982 +Kodak,12x12,ldr-rgb-kodak19.png,29.8756,0.0302,0.0111,35.4148 +Kodak,12x12,ldr-rgb-kodak20.png,30.9402,0.0253,0.0081,48.3132 +Kodak,12x12,ldr-rgb-kodak21.png,28.6181,0.0315,0.0139,28.2404 +Kodak,12x12,ldr-rgb-kodak22.png,29.7383,0.0276,0.0087,45.2499 +Kodak,12x12,ldr-rgb-kodak23.png,32.4823,0.0244,0.0062,63.3919 +Kodak,12x12,ldr-rgb-kodak24.png,26.7030,0.0339,0.0149,26.3428 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e3c9748758c7c01763477d96c43f98f782007f40 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3120,0.0909,0.0737,5.3382 +Kodak,4x4,ldr-rgb-kodak02.png,45.4397,0.1357,0.1174,3.3505 +Kodak,4x4,ldr-rgb-kodak03.png,47.6879,0.0704,0.0539,7.2907 +Kodak,4x4,ldr-rgb-kodak04.png,45.5017,0.1057,0.0871,4.5158 +Kodak,4x4,ldr-rgb-kodak05.png,42.1778,0.1182,0.0999,3.9367 +Kodak,4x4,ldr-rgb-kodak06.png,45.1998,0.0861,0.0692,5.6805 +Kodak,4x4,ldr-rgb-kodak07.png,46.0247,0.0870,0.0690,5.6988 +Kodak,4x4,ldr-rgb-kodak08.png,42.5327,0.1257,0.1065,3.6927 +Kodak,4x4,ldr-rgb-kodak09.png,47.1830,0.1025,0.0844,4.6570 +Kodak,4x4,ldr-rgb-kodak10.png,46.8614,0.1040,0.0856,4.5937 +Kodak,4x4,ldr-rgb-kodak11.png,44.8994,0.1030,0.0858,4.5831 +Kodak,4x4,ldr-rgb-kodak12.png,47.9784,0.0788,0.0618,6.3577 +Kodak,4x4,ldr-rgb-kodak13.png,41.6520,0.0984,0.0796,4.9393 +Kodak,4x4,ldr-rgb-kodak14.png,42.7319,0.1098,0.0923,4.2586 +Kodak,4x4,ldr-rgb-kodak15.png,45.5485,0.0943,0.0763,5.1565 +Kodak,4x4,ldr-rgb-kodak16.png,47.8885,0.0784,0.0619,6.3519 +Kodak,4x4,ldr-rgb-kodak17.png,46.3480,0.0893,0.0710,5.5405 +Kodak,4x4,ldr-rgb-kodak18.png,42.0493,0.1336,0.1145,3.4354 +Kodak,4x4,ldr-rgb-kodak19.png,45.3597,0.1071,0.0881,4.4656 +Kodak,4x4,ldr-rgb-kodak20.png,46.9280,0.0687,0.0523,7.5229 +Kodak,4x4,ldr-rgb-kodak21.png,45.1814,0.1086,0.0912,4.3102 +Kodak,4x4,ldr-rgb-kodak22.png,43.8216,0.1360,0.1175,3.3461 +Kodak,4x4,ldr-rgb-kodak23.png,46.8701,0.1083,0.0906,4.3417 +Kodak,4x4,ldr-rgb-kodak24.png,42.3775,0.1055,0.0870,4.5200 +Kodak,5x5,ldr-rgb-kodak01.png,40.1116,0.0976,0.0795,4.9466 +Kodak,5x5,ldr-rgb-kodak02.png,41.7670,0.1133,0.0941,4.1799 +Kodak,5x5,ldr-rgb-kodak03.png,44.0723,0.0566,0.0393,10.0068 +Kodak,5x5,ldr-rgb-kodak04.png,42.0904,0.0875,0.0685,5.7436 +Kodak,5x5,ldr-rgb-kodak05.png,37.9986,0.1166,0.0974,4.0365 +Kodak,5x5,ldr-rgb-kodak06.png,40.9739,0.0791,0.0614,6.4055 +Kodak,5x5,ldr-rgb-kodak07.png,42.4746,0.0727,0.0539,7.2989 +Kodak,5x5,ldr-rgb-kodak08.png,38.3608,0.1218,0.1019,3.8580 +Kodak,5x5,ldr-rgb-kodak09.png,43.8088,0.0639,0.0453,8.6891 +Kodak,5x5,ldr-rgb-kodak10.png,43.4231,0.0702,0.0510,7.7139 +Kodak,5x5,ldr-rgb-kodak11.png,40.8590,0.0942,0.0760,5.1742 +Kodak,5x5,ldr-rgb-kodak12.png,44.4017,0.0573,0.0397,9.9030 +Kodak,5x5,ldr-rgb-kodak13.png,36.9301,0.0990,0.0798,4.9304 +Kodak,5x5,ldr-rgb-kodak14.png,38.6960,0.1060,0.0877,4.4833 +Kodak,5x5,ldr-rgb-kodak15.png,41.9491,0.0832,0.0645,6.0966 +Kodak,5x5,ldr-rgb-kodak16.png,44.1356,0.0599,0.0426,9.2244 +Kodak,5x5,ldr-rgb-kodak17.png,42.5454,0.0627,0.0435,9.0382 +Kodak,5x5,ldr-rgb-kodak18.png,38.3941,0.1103,0.0906,4.3378 +Kodak,5x5,ldr-rgb-kodak19.png,41.6442,0.0773,0.0581,6.7670 +Kodak,5x5,ldr-rgb-kodak20.png,42.9823,0.0581,0.0409,9.6033 +Kodak,5x5,ldr-rgb-kodak21.png,40.7705,0.0799,0.0621,6.3356 +Kodak,5x5,ldr-rgb-kodak22.png,40.2982,0.1085,0.0892,4.4084 +Kodak,5x5,ldr-rgb-kodak23.png,43.5860,0.0768,0.0577,6.8153 +Kodak,5x5,ldr-rgb-kodak24.png,38.2072,0.0919,0.0727,5.4075 +Kodak,6x6,ldr-rgb-kodak01.png,36.1963,0.1003,0.0826,4.7628 +Kodak,6x6,ldr-rgb-kodak02.png,39.0475,0.0915,0.0730,5.3862 +Kodak,6x6,ldr-rgb-kodak03.png,41.3520,0.0487,0.0320,12.2988 +Kodak,6x6,ldr-rgb-kodak04.png,39.4032,0.0774,0.0587,6.7041 +Kodak,6x6,ldr-rgb-kodak05.png,34.7993,0.1145,0.0959,4.0981 +Kodak,6x6,ldr-rgb-kodak06.png,37.6376,0.0737,0.0560,7.0247 +Kodak,6x6,ldr-rgb-kodak07.png,39.7936,0.0646,0.0460,8.5428 +Kodak,6x6,ldr-rgb-kodak08.png,34.9845,0.1207,0.1009,3.8989 +Kodak,6x6,ldr-rgb-kodak09.png,40.8865,0.0523,0.0339,11.5860 +Kodak,6x6,ldr-rgb-kodak10.png,40.5154,0.0551,0.0362,10.8500 +Kodak,6x6,ldr-rgb-kodak11.png,37.5965,0.0806,0.0632,6.2208 +Kodak,6x6,ldr-rgb-kodak12.png,41.4939,0.0471,0.0303,12.9796 +Kodak,6x6,ldr-rgb-kodak13.png,32.9110,0.1078,0.0891,4.4153 +Kodak,6x6,ldr-rgb-kodak14.png,35.8527,0.1009,0.0829,4.7410 +Kodak,6x6,ldr-rgb-kodak15.png,39.2227,0.0766,0.0582,6.7529 +Kodak,6x6,ldr-rgb-kodak16.png,41.0391,0.0516,0.0348,11.3074 +Kodak,6x6,ldr-rgb-kodak17.png,39.4992,0.0546,0.0356,11.0343 +Kodak,6x6,ldr-rgb-kodak18.png,35.3684,0.1009,0.0815,4.8225 +Kodak,6x6,ldr-rgb-kodak19.png,38.5288,0.0707,0.0519,7.5833 +Kodak,6x6,ldr-rgb-kodak20.png,39.7703,0.0542,0.0374,10.5042 +Kodak,6x6,ldr-rgb-kodak21.png,37.2034,0.0714,0.0540,7.2859 +Kodak,6x6,ldr-rgb-kodak22.png,37.4752,0.0929,0.0738,5.3260 +Kodak,6x6,ldr-rgb-kodak23.png,40.9962,0.0587,0.0406,9.6954 +Kodak,6x6,ldr-rgb-kodak24.png,35.0626,0.0834,0.0646,6.0898 +Kodak,8x8,ldr-rgb-kodak01.png,31.8007,0.1384,0.1203,3.2699 +Kodak,8x8,ldr-rgb-kodak02.png,35.7971,0.0953,0.0760,5.1709 +Kodak,8x8,ldr-rgb-kodak03.png,37.7637,0.0606,0.0429,9.1683 +Kodak,8x8,ldr-rgb-kodak04.png,36.0993,0.0870,0.0676,5.8146 +Kodak,8x8,ldr-rgb-kodak05.png,30.7474,0.1513,0.1320,2.9782 +Kodak,8x8,ldr-rgb-kodak06.png,33.4449,0.0943,0.0763,5.1548 +Kodak,8x8,ldr-rgb-kodak07.png,36.1506,0.0795,0.0604,6.5087 +Kodak,8x8,ldr-rgb-kodak08.png,30.5414,0.1535,0.1334,2.9477 +Kodak,8x8,ldr-rgb-kodak09.png,37.2629,0.0620,0.0428,9.1815 +Kodak,8x8,ldr-rgb-kodak10.png,36.9234,0.0631,0.0437,9.0028 +Kodak,8x8,ldr-rgb-kodak11.png,33.6680,0.0973,0.0791,4.9707 +Kodak,8x8,ldr-rgb-kodak12.png,37.8337,0.0589,0.0413,9.5196 +Kodak,8x8,ldr-rgb-kodak13.png,28.3966,0.1488,0.1295,3.0364 +Kodak,8x8,ldr-rgb-kodak14.png,32.1516,0.1294,0.1111,3.5408 +Kodak,8x8,ldr-rgb-kodak15.png,35.8462,0.0801,0.0611,6.4351 +Kodak,8x8,ldr-rgb-kodak16.png,37.0251,0.0660,0.0483,8.1389 +Kodak,8x8,ldr-rgb-kodak17.png,35.6698,0.0669,0.0476,8.2586 +Kodak,8x8,ldr-rgb-kodak18.png,31.5577,0.1201,0.1002,3.9227 +Kodak,8x8,ldr-rgb-kodak19.png,34.7618,0.0850,0.0654,6.0137 +Kodak,8x8,ldr-rgb-kodak20.png,35.9030,0.0672,0.0494,7.9557 +Kodak,8x8,ldr-rgb-kodak21.png,33.1158,0.0915,0.0732,5.3747 +Kodak,8x8,ldr-rgb-kodak22.png,34.0434,0.1034,0.0840,4.6839 +Kodak,8x8,ldr-rgb-kodak23.png,37.6714,0.0619,0.0434,9.0661 +Kodak,8x8,ldr-rgb-kodak24.png,31.1289,0.1019,0.0824,4.7720 +Kodak,12x12,ldr-rgb-kodak01.png,27.7549,0.1563,0.1349,2.9141 +Kodak,12x12,ldr-rgb-kodak02.png,32.4572,0.0756,0.0538,7.3025 +Kodak,12x12,ldr-rgb-kodak03.png,33.8229,0.0565,0.0363,10.8414 +Kodak,12x12,ldr-rgb-kodak04.png,32.4332,0.0667,0.0443,8.8802 +Kodak,12x12,ldr-rgb-kodak05.png,26.4002,0.1697,0.1477,2.6631 +Kodak,12x12,ldr-rgb-kodak06.png,29.3776,0.1017,0.0809,4.8595 +Kodak,12x12,ldr-rgb-kodak07.png,32.0454,0.0809,0.0589,6.6800 +Kodak,12x12,ldr-rgb-kodak08.png,26.0607,0.1769,0.1540,2.5539 +Kodak,12x12,ldr-rgb-kodak09.png,33.1013,0.0604,0.0384,10.2285 +Kodak,12x12,ldr-rgb-kodak10.png,32.4879,0.0602,0.0380,10.3552 +Kodak,12x12,ldr-rgb-kodak11.png,29.7550,0.0965,0.0756,5.2035 +Kodak,12x12,ldr-rgb-kodak12.png,33.8849,0.0560,0.0355,11.0790 +Kodak,12x12,ldr-rgb-kodak13.png,24.5283,0.1764,0.1543,2.5490 +Kodak,12x12,ldr-rgb-kodak14.png,28.4299,0.1346,0.1133,3.4716 +Kodak,12x12,ldr-rgb-kodak15.png,32.2405,0.0754,0.0537,7.3284 +Kodak,12x12,ldr-rgb-kodak16.png,32.9828,0.0634,0.0431,9.1210 +Kodak,12x12,ldr-rgb-kodak17.png,31.7910,0.0659,0.0437,8.9940 +Kodak,12x12,ldr-rgb-kodak18.png,27.7838,0.1204,0.0976,4.0298 +Kodak,12x12,ldr-rgb-kodak19.png,30.8959,0.0852,0.0628,6.2612 +Kodak,12x12,ldr-rgb-kodak20.png,31.8670,0.0665,0.0462,8.5051 +Kodak,12x12,ldr-rgb-kodak21.png,29.1816,0.1048,0.0837,4.6970 +Kodak,12x12,ldr-rgb-kodak22.png,30.5137,0.0912,0.0688,5.7135 +Kodak,12x12,ldr-rgb-kodak23.png,33.5616,0.0525,0.0310,12.6766 +Kodak,12x12,ldr-rgb-kodak24.png,27.1047,0.1066,0.0844,4.6595 diff --git a/Test/Images/Kodak/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..4624d104a37d55df62b43b8fb3a7ea2a519db718 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5115,0.1992,0.1818,2.1632 +Kodak,4x4,ldr-rgb-kodak02.png,45.6982,0.2900,0.2707,1.4525 +Kodak,4x4,ldr-rgb-kodak03.png,48.0607,0.2255,0.2088,1.8829 +Kodak,4x4,ldr-rgb-kodak04.png,45.6858,0.2535,0.2345,1.6771 +Kodak,4x4,ldr-rgb-kodak05.png,42.4370,0.2536,0.2350,1.6732 +Kodak,4x4,ldr-rgb-kodak06.png,45.3960,0.2075,0.1904,2.0655 +Kodak,4x4,ldr-rgb-kodak07.png,46.3753,0.2476,0.2295,1.7134 +Kodak,4x4,ldr-rgb-kodak08.png,42.8242,0.2644,0.2450,1.6048 +Kodak,4x4,ldr-rgb-kodak09.png,47.4389,0.2675,0.2493,1.5776 +Kodak,4x4,ldr-rgb-kodak10.png,47.0911,0.2632,0.2448,1.6063 +Kodak,4x4,ldr-rgb-kodak11.png,45.1383,0.2379,0.2206,1.7822 +Kodak,4x4,ldr-rgb-kodak12.png,48.2774,0.2295,0.2127,1.8487 +Kodak,4x4,ldr-rgb-kodak13.png,41.7584,0.2080,0.1897,2.0732 +Kodak,4x4,ldr-rgb-kodak14.png,42.9859,0.2359,0.2184,1.8008 +Kodak,4x4,ldr-rgb-kodak15.png,45.8334,0.2447,0.2265,1.7357 +Kodak,4x4,ldr-rgb-kodak16.png,48.0940,0.2264,0.2093,1.8790 +Kodak,4x4,ldr-rgb-kodak17.png,46.5075,0.2393,0.2206,1.7822 +Kodak,4x4,ldr-rgb-kodak18.png,42.2101,0.2813,0.2619,1.5013 +Kodak,4x4,ldr-rgb-kodak19.png,45.5658,0.2525,0.2337,1.6823 +Kodak,4x4,ldr-rgb-kodak20.png,47.1799,0.1606,0.1440,2.7304 +Kodak,4x4,ldr-rgb-kodak21.png,45.3342,0.2539,0.2366,1.6616 +Kodak,4x4,ldr-rgb-kodak22.png,44.0086,0.2908,0.2721,1.4451 +Kodak,4x4,ldr-rgb-kodak23.png,47.1907,0.2798,0.2618,1.5019 +Kodak,4x4,ldr-rgb-kodak24.png,42.6019,0.2495,0.2310,1.7020 +Kodak,5x5,ldr-rgb-kodak01.png,40.2236,0.2389,0.2207,1.7820 +Kodak,5x5,ldr-rgb-kodak02.png,42.0380,0.3147,0.2960,1.3286 +Kodak,5x5,ldr-rgb-kodak03.png,44.3676,0.2357,0.2183,1.8012 +Kodak,5x5,ldr-rgb-kodak04.png,42.2612,0.2620,0.2426,1.6205 +Kodak,5x5,ldr-rgb-kodak05.png,38.1929,0.2810,0.2618,1.5018 +Kodak,5x5,ldr-rgb-kodak06.png,41.0984,0.2221,0.2041,1.9269 +Kodak,5x5,ldr-rgb-kodak07.png,42.7456,0.2615,0.2423,1.6230 +Kodak,5x5,ldr-rgb-kodak08.png,38.5418,0.2831,0.2627,1.4968 +Kodak,5x5,ldr-rgb-kodak09.png,44.0366,0.2550,0.2363,1.6640 +Kodak,5x5,ldr-rgb-kodak10.png,43.6071,0.2621,0.2429,1.6186 +Kodak,5x5,ldr-rgb-kodak11.png,41.0130,0.2516,0.2335,1.6837 +Kodak,5x5,ldr-rgb-kodak12.png,44.6149,0.2355,0.2177,1.8063 +Kodak,5x5,ldr-rgb-kodak13.png,36.9748,0.2209,0.2017,1.9496 +Kodak,5x5,ldr-rgb-kodak14.png,38.9092,0.2618,0.2434,1.6157 +Kodak,5x5,ldr-rgb-kodak15.png,42.1668,0.2539,0.2349,1.6742 +Kodak,5x5,ldr-rgb-kodak16.png,44.2715,0.2325,0.2148,1.8304 +Kodak,5x5,ldr-rgb-kodak17.png,42.6407,0.2387,0.2196,1.7903 +Kodak,5x5,ldr-rgb-kodak18.png,38.4820,0.2824,0.2626,1.4976 +Kodak,5x5,ldr-rgb-kodak19.png,41.7841,0.2621,0.2426,1.6212 +Kodak,5x5,ldr-rgb-kodak20.png,43.2953,0.1681,0.1509,2.6050 +Kodak,5x5,ldr-rgb-kodak21.png,40.8774,0.2680,0.2491,1.5787 +Kodak,5x5,ldr-rgb-kodak22.png,40.4425,0.3055,0.2861,1.3745 +Kodak,5x5,ldr-rgb-kodak23.png,43.9057,0.3004,0.2816,1.3966 +Kodak,5x5,ldr-rgb-kodak24.png,38.3273,0.2646,0.2454,1.6023 +Kodak,6x6,ldr-rgb-kodak01.png,36.3105,0.2750,0.2570,1.5298 +Kodak,6x6,ldr-rgb-kodak02.png,39.4083,0.3487,0.3301,1.1913 +Kodak,6x6,ldr-rgb-kodak03.png,41.7533,0.2110,0.1941,2.0263 +Kodak,6x6,ldr-rgb-kodak04.png,39.6674,0.2798,0.2610,1.5064 +Kodak,6x6,ldr-rgb-kodak05.png,34.9944,0.3154,0.2967,1.3254 +Kodak,6x6,ldr-rgb-kodak06.png,37.7608,0.2453,0.2276,1.7278 +Kodak,6x6,ldr-rgb-kodak07.png,40.1279,0.2447,0.2261,1.7388 +Kodak,6x6,ldr-rgb-kodak08.png,35.1750,0.3109,0.2913,1.3497 +Kodak,6x6,ldr-rgb-kodak09.png,41.2718,0.2643,0.2458,1.5999 +Kodak,6x6,ldr-rgb-kodak10.png,40.8412,0.2867,0.2675,1.4699 +Kodak,6x6,ldr-rgb-kodak11.png,37.7820,0.2722,0.2546,1.5444 +Kodak,6x6,ldr-rgb-kodak12.png,41.8395,0.2440,0.2269,1.7326 +Kodak,6x6,ldr-rgb-kodak13.png,32.9600,0.2628,0.2439,1.6124 +Kodak,6x6,ldr-rgb-kodak14.png,36.0500,0.2966,0.2786,1.4115 +Kodak,6x6,ldr-rgb-kodak15.png,39.4760,0.2505,0.2318,1.6967 +Kodak,6x6,ldr-rgb-kodak16.png,41.2318,0.2321,0.2152,1.8271 +Kodak,6x6,ldr-rgb-kodak17.png,39.6707,0.2571,0.2381,1.6515 +Kodak,6x6,ldr-rgb-kodak18.png,35.4565,0.3147,0.2949,1.3333 +Kodak,6x6,ldr-rgb-kodak19.png,38.7066,0.2920,0.2729,1.4410 +Kodak,6x6,ldr-rgb-kodak20.png,40.1121,0.1848,0.1681,2.3385 +Kodak,6x6,ldr-rgb-kodak21.png,37.3497,0.2910,0.2735,1.4375 +Kodak,6x6,ldr-rgb-kodak22.png,37.6441,0.3358,0.3168,1.2413 +Kodak,6x6,ldr-rgb-kodak23.png,41.4416,0.3049,0.2858,1.3759 +Kodak,6x6,ldr-rgb-kodak24.png,35.1795,0.2764,0.2569,1.5308 +Kodak,8x8,ldr-rgb-kodak01.png,31.9076,0.3547,0.3347,1.1748 +Kodak,8x8,ldr-rgb-kodak02.png,36.1658,0.3568,0.3364,1.1689 +Kodak,8x8,ldr-rgb-kodak03.png,38.2015,0.1935,0.1744,2.2551 +Kodak,8x8,ldr-rgb-kodak04.png,36.3849,0.2896,0.2685,1.4646 +Kodak,8x8,ldr-rgb-kodak05.png,30.9159,0.3884,0.3679,1.0689 +Kodak,8x8,ldr-rgb-kodak06.png,33.5799,0.2941,0.2748,1.4309 +Kodak,8x8,ldr-rgb-kodak07.png,36.5075,0.2371,0.2167,1.8148 +Kodak,8x8,ldr-rgb-kodak08.png,30.7382,0.4188,0.3972,0.9899 +Kodak,8x8,ldr-rgb-kodak09.png,37.5585,0.2162,0.1958,2.0085 +Kodak,8x8,ldr-rgb-kodak10.png,37.2383,0.2469,0.2260,1.7396 +Kodak,8x8,ldr-rgb-kodak11.png,33.8328,0.3416,0.3221,1.2206 +Kodak,8x8,ldr-rgb-kodak12.png,38.2628,0.2231,0.2039,1.9281 +Kodak,8x8,ldr-rgb-kodak13.png,28.4607,0.3692,0.3487,1.1278 +Kodak,8x8,ldr-rgb-kodak14.png,32.3242,0.3708,0.3510,1.1201 +Kodak,8x8,ldr-rgb-kodak15.png,36.0684,0.2748,0.2543,1.5465 +Kodak,8x8,ldr-rgb-kodak16.png,37.2660,0.2397,0.2208,1.7812 +Kodak,8x8,ldr-rgb-kodak17.png,35.8716,0.2368,0.2162,1.8188 +Kodak,8x8,ldr-rgb-kodak18.png,31.6551,0.3825,0.3605,1.0909 +Kodak,8x8,ldr-rgb-kodak19.png,34.9274,0.2566,0.2356,1.6693 +Kodak,8x8,ldr-rgb-kodak20.png,36.1555,0.2074,0.1887,2.0839 +Kodak,8x8,ldr-rgb-kodak21.png,33.2255,0.2755,0.2559,1.5365 +Kodak,8x8,ldr-rgb-kodak22.png,34.2304,0.3547,0.3333,1.1798 +Kodak,8x8,ldr-rgb-kodak23.png,38.1991,0.2364,0.2162,1.8186 +Kodak,8x8,ldr-rgb-kodak24.png,31.2348,0.3146,0.2937,1.3388 +Kodak,12x12,ldr-rgb-kodak01.png,27.9132,0.4691,0.4457,0.8823 +Kodak,12x12,ldr-rgb-kodak02.png,33.0052,0.3496,0.3250,1.2099 +Kodak,12x12,ldr-rgb-kodak03.png,34.4542,0.2091,0.1864,2.1092 +Kodak,12x12,ldr-rgb-kodak04.png,32.9738,0.3048,0.2799,1.4050 +Kodak,12x12,ldr-rgb-kodak05.png,26.6073,0.5066,0.4824,0.8152 +Kodak,12x12,ldr-rgb-kodak06.png,29.5310,0.3426,0.3193,1.2315 +Kodak,12x12,ldr-rgb-kodak07.png,32.6281,0.2672,0.2429,1.6185 +Kodak,12x12,ldr-rgb-kodak08.png,26.2616,0.5092,0.4840,0.8124 +Kodak,12x12,ldr-rgb-kodak09.png,33.6343,0.2409,0.2167,1.8142 +Kodak,12x12,ldr-rgb-kodak10.png,32.9910,0.2388,0.2141,1.8368 +Kodak,12x12,ldr-rgb-kodak11.png,30.0541,0.3723,0.3488,1.1272 +Kodak,12x12,ldr-rgb-kodak12.png,34.4512,0.2185,0.1957,2.0093 +Kodak,12x12,ldr-rgb-kodak13.png,24.5887,0.5444,0.5196,0.7568 +Kodak,12x12,ldr-rgb-kodak14.png,28.6476,0.4504,0.4264,0.9222 +Kodak,12x12,ldr-rgb-kodak15.png,32.7352,0.2939,0.2693,1.4603 +Kodak,12x12,ldr-rgb-kodak16.png,33.3387,0.2581,0.2351,1.6725 +Kodak,12x12,ldr-rgb-kodak17.png,32.1425,0.2553,0.2301,1.7090 +Kodak,12x12,ldr-rgb-kodak18.png,27.9244,0.4454,0.4199,0.9364 +Kodak,12x12,ldr-rgb-kodak19.png,31.1081,0.3495,0.3241,1.2132 +Kodak,12x12,ldr-rgb-kodak20.png,32.1616,0.2723,0.2495,1.5760 +Kodak,12x12,ldr-rgb-kodak21.png,29.3265,0.3298,0.3065,1.2828 +Kodak,12x12,ldr-rgb-kodak22.png,30.7890,0.3912,0.3661,1.0740 +Kodak,12x12,ldr-rgb-kodak23.png,34.3835,0.2166,0.1925,2.0432 +Kodak,12x12,ldr-rgb-kodak24.png,27.2381,0.3984,0.3737,1.0523 diff --git a/Test/Images/Kodak/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/Kodak/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..88109398637d84b2833ece8e2c08305b84c1f417 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.9062,0.0300,0.0137,28.6809 +Kodak,4x4,ldr-rgb-kodak02.png,44.3467,0.0371,0.0202,19.4643 +Kodak,4x4,ldr-rgb-kodak03.png,46.8208,0.0269,0.0112,35.0841 +Kodak,4x4,ldr-rgb-kodak04.png,44.7048,0.0352,0.0179,21.9452 +Kodak,4x4,ldr-rgb-kodak05.png,41.6833,0.0443,0.0272,14.4518 +Kodak,4x4,ldr-rgb-kodak06.png,44.8187,0.0294,0.0136,28.8490 +Kodak,4x4,ldr-rgb-kodak07.png,45.1903,0.0322,0.0154,25.5518 +Kodak,4x4,ldr-rgb-kodak08.png,42.1528,0.0461,0.0281,13.9990 +Kodak,4x4,ldr-rgb-kodak09.png,46.3750,0.0269,0.0101,38.7407 +Kodak,4x4,ldr-rgb-kodak10.png,46.1453,0.0277,0.0107,36.5886 +Kodak,4x4,ldr-rgb-kodak11.png,44.3357,0.0326,0.0167,23.5176 +Kodak,4x4,ldr-rgb-kodak12.png,47.1358,0.0252,0.0100,39.5034 +Kodak,4x4,ldr-rgb-kodak13.png,41.5073,0.0402,0.0231,17.0017 +Kodak,4x4,ldr-rgb-kodak14.png,41.9561,0.0394,0.0225,17.4646 +Kodak,4x4,ldr-rgb-kodak15.png,44.7852,0.0365,0.0196,20.0907 +Kodak,4x4,ldr-rgb-kodak16.png,47.3018,0.0240,0.0086,45.4945 +Kodak,4x4,ldr-rgb-kodak17.png,45.8895,0.0270,0.0097,40.5714 +Kodak,4x4,ldr-rgb-kodak18.png,41.7129,0.0447,0.0268,14.6745 +Kodak,4x4,ldr-rgb-kodak19.png,44.8948,0.0306,0.0133,29.5007 +Kodak,4x4,ldr-rgb-kodak20.png,46.4413,0.0270,0.0114,34.3927 +Kodak,4x4,ldr-rgb-kodak21.png,44.6688,0.0300,0.0141,27.9807 +Kodak,4x4,ldr-rgb-kodak22.png,43.2575,0.0399,0.0224,17.5316 +Kodak,4x4,ldr-rgb-kodak23.png,45.6976,0.0300,0.0136,28.8828 +Kodak,4x4,ldr-rgb-kodak24.png,42.0117,0.0393,0.0219,17.9723 +Kodak,5x5,ldr-rgb-kodak01.png,39.6381,0.0292,0.0126,31.2320 +Kodak,5x5,ldr-rgb-kodak02.png,40.6613,0.0292,0.0124,31.8189 +Kodak,5x5,ldr-rgb-kodak03.png,43.1070,0.0242,0.0084,46.6659 +Kodak,5x5,ldr-rgb-kodak04.png,41.3054,0.0289,0.0111,35.2883 +Kodak,5x5,ldr-rgb-kodak05.png,37.4812,0.0392,0.0219,17.9323 +Kodak,5x5,ldr-rgb-kodak06.png,40.6175,0.0264,0.0103,38.0138 +Kodak,5x5,ldr-rgb-kodak07.png,41.5316,0.0280,0.0108,36.2548 +Kodak,5x5,ldr-rgb-kodak08.png,37.7979,0.0403,0.0220,17.9002 +Kodak,5x5,ldr-rgb-kodak09.png,42.9386,0.0245,0.0075,52.1491 +Kodak,5x5,ldr-rgb-kodak10.png,42.6726,0.0254,0.0078,50.4178 +Kodak,5x5,ldr-rgb-kodak11.png,40.3558,0.0280,0.0119,33.0906 +Kodak,5x5,ldr-rgb-kodak12.png,43.4607,0.0231,0.0071,55.5477 +Kodak,5x5,ldr-rgb-kodak13.png,36.8488,0.0361,0.0185,21.2149 +Kodak,5x5,ldr-rgb-kodak14.png,38.0471,0.0365,0.0199,19.7963 +Kodak,5x5,ldr-rgb-kodak15.png,41.2322,0.0291,0.0119,33.0992 +Kodak,5x5,ldr-rgb-kodak16.png,43.5315,0.0223,0.0063,62.6336 +Kodak,5x5,ldr-rgb-kodak17.png,42.1157,0.0248,0.0072,54.7948 +Kodak,5x5,ldr-rgb-kodak18.png,38.1383,0.0346,0.0167,23.5431 +Kodak,5x5,ldr-rgb-kodak19.png,41.1817,0.0267,0.0091,43.4212 +Kodak,5x5,ldr-rgb-kodak20.png,42.3886,0.0241,0.0082,47.9829 +Kodak,5x5,ldr-rgb-kodak21.png,40.4523,0.0273,0.0110,35.9098 +Kodak,5x5,ldr-rgb-kodak22.png,39.8132,0.0313,0.0134,29.2704 +Kodak,5x5,ldr-rgb-kodak23.png,42.5506,0.0257,0.0090,43.8717 +Kodak,5x5,ldr-rgb-kodak24.png,37.9125,0.0330,0.0156,25.2062 +Kodak,6x6,ldr-rgb-kodak01.png,35.7576,0.0336,0.0175,22.5079 +Kodak,6x6,ldr-rgb-kodak02.png,38.1979,0.0291,0.0125,31.4722 +Kodak,6x6,ldr-rgb-kodak03.png,40.5936,0.0232,0.0080,49.1512 +Kodak,6x6,ldr-rgb-kodak04.png,38.5639,0.0285,0.0114,34.6208 +Kodak,6x6,ldr-rgb-kodak05.png,34.3707,0.0421,0.0252,15.5859 +Kodak,6x6,ldr-rgb-kodak06.png,37.3064,0.0278,0.0120,32.7080 +Kodak,6x6,ldr-rgb-kodak07.png,38.8907,0.0278,0.0111,35.4536 +Kodak,6x6,ldr-rgb-kodak08.png,34.4542,0.0429,0.0252,15.6292 +Kodak,6x6,ldr-rgb-kodak09.png,39.9832,0.0249,0.0084,46.7228 +Kodak,6x6,ldr-rgb-kodak10.png,39.7378,0.0253,0.0083,47.6048 +Kodak,6x6,ldr-rgb-kodak11.png,37.1622,0.0292,0.0133,29.5626 +Kodak,6x6,ldr-rgb-kodak12.png,40.7512,0.0225,0.0071,55.4693 +Kodak,6x6,ldr-rgb-kodak13.png,32.8161,0.0427,0.0256,15.3847 +Kodak,6x6,ldr-rgb-kodak14.png,35.3127,0.0385,0.0220,17.8548 +Kodak,6x6,ldr-rgb-kodak15.png,38.5805,0.0284,0.0119,32.9708 +Kodak,6x6,ldr-rgb-kodak16.png,40.5090,0.0222,0.0070,56.0632 +Kodak,6x6,ldr-rgb-kodak17.png,38.9529,0.0255,0.0084,46.8169 +Kodak,6x6,ldr-rgb-kodak18.png,35.1258,0.0357,0.0179,21.9686 +Kodak,6x6,ldr-rgb-kodak19.png,37.9862,0.0288,0.0116,33.9474 +Kodak,6x6,ldr-rgb-kodak20.png,39.1964,0.0245,0.0092,42.6156 +Kodak,6x6,ldr-rgb-kodak21.png,36.9178,0.0294,0.0134,29.2807 +Kodak,6x6,ldr-rgb-kodak22.png,36.9994,0.0312,0.0141,27.8738 +Kodak,6x6,ldr-rgb-kodak23.png,40.0813,0.0247,0.0085,46.4138 +Kodak,6x6,ldr-rgb-kodak24.png,34.8032,0.0338,0.0164,23.9458 +Kodak,8x8,ldr-rgb-kodak01.png,31.3412,0.0415,0.0251,15.6803 +Kodak,8x8,ldr-rgb-kodak02.png,34.9527,0.0290,0.0121,32.4435 +Kodak,8x8,ldr-rgb-kodak03.png,36.6102,0.0247,0.0089,44.0474 +Kodak,8x8,ldr-rgb-kodak04.png,35.1877,0.0291,0.0117,33.5879 +Kodak,8x8,ldr-rgb-kodak05.png,30.2580,0.0480,0.0308,12.7638 +Kodak,8x8,ldr-rgb-kodak06.png,32.9478,0.0335,0.0175,22.5147 +Kodak,8x8,ldr-rgb-kodak07.png,34.9976,0.0300,0.0132,29.7895 +Kodak,8x8,ldr-rgb-kodak08.png,29.9709,0.0495,0.0314,12.5056 +Kodak,8x8,ldr-rgb-kodak09.png,36.1754,0.0268,0.0099,39.8153 +Kodak,8x8,ldr-rgb-kodak10.png,35.8905,0.0264,0.0092,42.7925 +Kodak,8x8,ldr-rgb-kodak11.png,33.0125,0.0326,0.0164,23.9239 +Kodak,8x8,ldr-rgb-kodak12.png,36.7348,0.0241,0.0086,45.6646 +Kodak,8x8,ldr-rgb-kodak13.png,28.2212,0.0546,0.0369,10.6456 +Kodak,8x8,ldr-rgb-kodak14.png,31.5065,0.0416,0.0250,15.7361 +Kodak,8x8,ldr-rgb-kodak15.png,34.9514,0.0292,0.0123,32.0153 +Kodak,8x8,ldr-rgb-kodak16.png,36.0617,0.0261,0.0106,37.1658 +Kodak,8x8,ldr-rgb-kodak17.png,34.9137,0.0280,0.0106,37.0331 +Kodak,8x8,ldr-rgb-kodak18.png,31.2458,0.0396,0.0217,18.1047 +Kodak,8x8,ldr-rgb-kodak19.png,34.2323,0.0318,0.0143,27.4626 +Kodak,8x8,ldr-rgb-kodak20.png,35.2415,0.0263,0.0107,36.6699 +Kodak,8x8,ldr-rgb-kodak21.png,32.7559,0.0333,0.0173,22.6703 +Kodak,8x8,ldr-rgb-kodak22.png,33.4585,0.0329,0.0156,25.2579 +Kodak,8x8,ldr-rgb-kodak23.png,36.5494,0.0249,0.0085,46.2122 +Kodak,8x8,ldr-rgb-kodak24.png,30.8279,0.0373,0.0200,19.6735 +Kodak,12x12,ldr-rgb-kodak01.png,27.1096,0.0390,0.0209,18.8458 +Kodak,12x12,ldr-rgb-kodak02.png,31.1183,0.0253,0.0068,58.1506 +Kodak,12x12,ldr-rgb-kodak03.png,32.6995,0.0231,0.0059,66.2516 +Kodak,12x12,ldr-rgb-kodak04.png,31.5724,0.0248,0.0057,68.6851 +Kodak,12x12,ldr-rgb-kodak05.png,25.8234,0.0427,0.0239,16.4319 +Kodak,12x12,ldr-rgb-kodak06.png,28.6378,0.0325,0.0148,26.5527 +Kodak,12x12,ldr-rgb-kodak07.png,30.8626,0.0267,0.0080,49.1893 +Kodak,12x12,ldr-rgb-kodak08.png,25.4168,0.0472,0.0275,14.2956 +Kodak,12x12,ldr-rgb-kodak09.png,31.8375,0.0252,0.0068,58.0728 +Kodak,12x12,ldr-rgb-kodak10.png,31.5414,0.0255,0.0065,60.3906 +Kodak,12x12,ldr-rgb-kodak11.png,28.9389,0.0291,0.0112,35.1746 +Kodak,12x12,ldr-rgb-kodak12.png,32.2881,0.0228,0.0056,70.2923 +Kodak,12x12,ldr-rgb-kodak13.png,24.3214,0.0490,0.0301,13.0659 +Kodak,12x12,ldr-rgb-kodak14.png,27.5479,0.0340,0.0159,24.7679 +Kodak,12x12,ldr-rgb-kodak15.png,31.2617,0.0272,0.0085,46.3864 +Kodak,12x12,ldr-rgb-kodak16.png,31.4882,0.0243,0.0072,54.6676 +Kodak,12x12,ldr-rgb-kodak17.png,30.9019,0.0263,0.0072,54.5754 +Kodak,12x12,ldr-rgb-kodak18.png,27.4264,0.0345,0.0147,26.7023 +Kodak,12x12,ldr-rgb-kodak19.png,30.1924,0.0300,0.0108,36.2444 +Kodak,12x12,ldr-rgb-kodak20.png,31.0531,0.0252,0.0080,48.8599 +Kodak,12x12,ldr-rgb-kodak21.png,28.7189,0.0321,0.0143,27.5107 +Kodak,12x12,ldr-rgb-kodak22.png,29.8389,0.0278,0.0087,45.2598 +Kodak,12x12,ldr-rgb-kodak23.png,32.5301,0.0240,0.0059,66.4893 +Kodak,12x12,ldr-rgb-kodak24.png,26.7757,0.0344,0.0154,25.4705 diff --git a/Test/Images/Kodak/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f53c4ee7ab264977e392fc89971307065583b510 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5795,0.0253,0.0099,39.7385 +Kodak,4x4,ldr-rgb-kodak02.png,43.9381,0.0294,0.0132,29.6812 +Kodak,4x4,ldr-rgb-kodak03.png,46.2152,0.0229,0.0079,49.6932 +Kodak,4x4,ldr-rgb-kodak04.png,44.2927,0.0284,0.0118,33.3286 +Kodak,4x4,ldr-rgb-kodak05.png,41.1428,0.0326,0.0162,24.3449 +Kodak,4x4,ldr-rgb-kodak06.png,44.5411,0.0253,0.0099,39.8393 +Kodak,4x4,ldr-rgb-kodak07.png,44.7409,0.0264,0.0101,38.8054 +Kodak,4x4,ldr-rgb-kodak08.png,41.5923,0.0338,0.0165,23.8141 +Kodak,4x4,ldr-rgb-kodak09.png,46.0423,0.0240,0.0076,51.9438 +Kodak,4x4,ldr-rgb-kodak10.png,45.8041,0.0245,0.0078,50.2948 +Kodak,4x4,ldr-rgb-kodak11.png,43.9389,0.0266,0.0112,35.1964 +Kodak,4x4,ldr-rgb-kodak12.png,46.5919,0.0222,0.0074,52.9868 +Kodak,4x4,ldr-rgb-kodak13.png,41.2499,0.0319,0.0153,25.6185 +Kodak,4x4,ldr-rgb-kodak14.png,41.2988,0.0290,0.0132,29.7128 +Kodak,4x4,ldr-rgb-kodak15.png,44.3214,0.0287,0.0123,31.9737 +Kodak,4x4,ldr-rgb-kodak16.png,47.1694,0.0218,0.0070,56.4161 +Kodak,4x4,ldr-rgb-kodak17.png,45.6555,0.0239,0.0073,53.5216 +Kodak,4x4,ldr-rgb-kodak18.png,41.3733,0.0332,0.0160,24.5452 +Kodak,4x4,ldr-rgb-kodak19.png,44.6305,0.0264,0.0096,41.0031 +Kodak,4x4,ldr-rgb-kodak20.png,45.9534,0.0230,0.0081,48.7315 +Kodak,4x4,ldr-rgb-kodak21.png,44.3559,0.0253,0.0099,39.6430 +Kodak,4x4,ldr-rgb-kodak22.png,42.8876,0.0307,0.0140,28.0951 +Kodak,4x4,ldr-rgb-kodak23.png,45.3933,0.0252,0.0095,41.5747 +Kodak,4x4,ldr-rgb-kodak24.png,41.4571,0.0299,0.0132,29.6925 +Kodak,5x5,ldr-rgb-kodak01.png,39.4156,0.0258,0.0104,37.6863 +Kodak,5x5,ldr-rgb-kodak02.png,40.4404,0.0257,0.0095,41.5307 +Kodak,5x5,ldr-rgb-kodak03.png,42.7468,0.0215,0.0065,60.1988 +Kodak,5x5,ldr-rgb-kodak04.png,40.9150,0.0256,0.0088,44.7502 +Kodak,5x5,ldr-rgb-kodak05.png,37.1354,0.0317,0.0153,25.7103 +Kodak,5x5,ldr-rgb-kodak06.png,40.4615,0.0237,0.0086,45.7977 +Kodak,5x5,ldr-rgb-kodak07.png,41.2239,0.0246,0.0084,46.5408 +Kodak,5x5,ldr-rgb-kodak08.png,37.4696,0.0329,0.0156,25.1866 +Kodak,5x5,ldr-rgb-kodak09.png,42.6412,0.0226,0.0063,62.1474 +Kodak,5x5,ldr-rgb-kodak10.png,42.4794,0.0231,0.0065,60.6906 +Kodak,5x5,ldr-rgb-kodak11.png,40.1335,0.0246,0.0092,42.9363 +Kodak,5x5,ldr-rgb-kodak12.png,43.2490,0.0210,0.0061,64.6949 +Kodak,5x5,ldr-rgb-kodak13.png,36.7590,0.0313,0.0147,26.7478 +Kodak,5x5,ldr-rgb-kodak14.png,37.6107,0.0284,0.0127,30.9205 +Kodak,5x5,ldr-rgb-kodak15.png,40.9602,0.0252,0.0089,44.3960 +Kodak,5x5,ldr-rgb-kodak16.png,43.4497,0.0207,0.0058,67.8069 +Kodak,5x5,ldr-rgb-kodak17.png,41.9868,0.0230,0.0062,63.1782 +Kodak,5x5,ldr-rgb-kodak18.png,37.9866,0.0295,0.0125,31.5480 +Kodak,5x5,ldr-rgb-kodak19.png,40.9421,0.0245,0.0078,50.5368 +Kodak,5x5,ldr-rgb-kodak20.png,42.1079,0.0216,0.0067,58.8394 +Kodak,5x5,ldr-rgb-kodak21.png,40.2657,0.0243,0.0089,44.0521 +Kodak,5x5,ldr-rgb-kodak22.png,39.5405,0.0270,0.0101,38.7707 +Kodak,5x5,ldr-rgb-kodak23.png,42.2534,0.0230,0.0073,53.9170 +Kodak,5x5,ldr-rgb-kodak24.png,37.7137,0.0278,0.0113,34.7580 +Kodak,6x6,ldr-rgb-kodak01.png,35.6691,0.0286,0.0135,29.2268 +Kodak,6x6,ldr-rgb-kodak02.png,38.1041,0.0250,0.0092,42.9228 +Kodak,6x6,ldr-rgb-kodak03.png,40.4304,0.0206,0.0061,64.3893 +Kodak,6x6,ldr-rgb-kodak04.png,38.3680,0.0249,0.0086,45.8028 +Kodak,6x6,ldr-rgb-kodak05.png,34.1707,0.0329,0.0168,23.4015 +Kodak,6x6,ldr-rgb-kodak06.png,37.2480,0.0244,0.0095,41.5527 +Kodak,6x6,ldr-rgb-kodak07.png,38.7045,0.0242,0.0083,47.3587 +Kodak,6x6,ldr-rgb-kodak08.png,34.2613,0.0343,0.0172,22.8481 +Kodak,6x6,ldr-rgb-kodak09.png,39.8077,0.0223,0.0066,59.3368 +Kodak,6x6,ldr-rgb-kodak10.png,39.6100,0.0228,0.0066,59.8950 +Kodak,6x6,ldr-rgb-kodak11.png,37.0497,0.0248,0.0099,39.9126 +Kodak,6x6,ldr-rgb-kodak12.png,40.6243,0.0203,0.0058,67.6317 +Kodak,6x6,ldr-rgb-kodak13.png,32.7545,0.0348,0.0187,21.0729 +Kodak,6x6,ldr-rgb-kodak14.png,35.0210,0.0289,0.0135,29.0471 +Kodak,6x6,ldr-rgb-kodak15.png,38.4585,0.0246,0.0088,44.8573 +Kodak,6x6,ldr-rgb-kodak16.png,40.4730,0.0205,0.0061,64.7584 +Kodak,6x6,ldr-rgb-kodak17.png,38.8727,0.0231,0.0068,57.6990 +Kodak,6x6,ldr-rgb-kodak18.png,35.0331,0.0299,0.0131,29.9024 +Kodak,6x6,ldr-rgb-kodak19.png,37.8639,0.0256,0.0092,42.6112 +Kodak,6x6,ldr-rgb-kodak20.png,39.0545,0.0215,0.0072,54.6513 +Kodak,6x6,ldr-rgb-kodak21.png,36.8418,0.0251,0.0102,38.5586 +Kodak,6x6,ldr-rgb-kodak22.png,36.8948,0.0268,0.0105,37.5704 +Kodak,6x6,ldr-rgb-kodak23.png,39.9299,0.0220,0.0067,59.1029 +Kodak,6x6,ldr-rgb-kodak24.png,34.7262,0.0285,0.0121,32.4467 +Kodak,8x8,ldr-rgb-kodak01.png,31.2040,0.0347,0.0186,21.1066 +Kodak,8x8,ldr-rgb-kodak02.png,34.8028,0.0262,0.0094,41.7959 +Kodak,8x8,ldr-rgb-kodak03.png,36.4818,0.0224,0.0072,54.8713 +Kodak,8x8,ldr-rgb-kodak04.png,35.0816,0.0263,0.0090,43.4876 +Kodak,8x8,ldr-rgb-kodak05.png,30.0677,0.0397,0.0227,17.3315 +Kodak,8x8,ldr-rgb-kodak06.png,32.8194,0.0291,0.0133,29.5647 +Kodak,8x8,ldr-rgb-kodak07.png,34.8484,0.0271,0.0102,38.3926 +Kodak,8x8,ldr-rgb-kodak08.png,29.7201,0.0415,0.0237,16.5627 +Kodak,8x8,ldr-rgb-kodak09.png,35.9413,0.0248,0.0079,49.5856 +Kodak,8x8,ldr-rgb-kodak10.png,35.7419,0.0246,0.0075,52.5412 +Kodak,8x8,ldr-rgb-kodak11.png,32.8868,0.0286,0.0126,31.2574 +Kodak,8x8,ldr-rgb-kodak12.png,36.5265,0.0225,0.0070,56.1740 +Kodak,8x8,ldr-rgb-kodak13.png,28.1462,0.0441,0.0269,14.6112 +Kodak,8x8,ldr-rgb-kodak14.png,31.3256,0.0343,0.0180,21.8977 +Kodak,8x8,ldr-rgb-kodak15.png,34.7780,0.0262,0.0094,41.9256 +Kodak,8x8,ldr-rgb-kodak16.png,35.9765,0.0237,0.0084,46.6013 +Kodak,8x8,ldr-rgb-kodak17.png,34.7433,0.0254,0.0084,47.0024 +Kodak,8x8,ldr-rgb-kodak18.png,31.1790,0.0340,0.0162,24.2336 +Kodak,8x8,ldr-rgb-kodak19.png,33.9167,0.0284,0.0111,35.3488 +Kodak,8x8,ldr-rgb-kodak20.png,35.0781,0.0239,0.0084,46.7944 +Kodak,8x8,ldr-rgb-kodak21.png,32.6526,0.0291,0.0131,30.0030 +Kodak,8x8,ldr-rgb-kodak22.png,33.3447,0.0289,0.0117,33.4652 +Kodak,8x8,ldr-rgb-kodak23.png,36.4202,0.0231,0.0068,57.9036 +Kodak,8x8,ldr-rgb-kodak24.png,30.7559,0.0323,0.0151,26.0820 +Kodak,12x12,ldr-rgb-kodak01.png,26.9944,0.0326,0.0152,25.8271 +Kodak,12x12,ldr-rgb-kodak02.png,31.0451,0.0234,0.0055,71.5207 +Kodak,12x12,ldr-rgb-kodak03.png,32.6384,0.0213,0.0049,80.3502 +Kodak,12x12,ldr-rgb-kodak04.png,31.4810,0.0234,0.0048,82.5211 +Kodak,12x12,ldr-rgb-kodak05.png,25.7089,0.0354,0.0172,22.8589 +Kodak,12x12,ldr-rgb-kodak06.png,28.4876,0.0282,0.0110,35.6621 +Kodak,12x12,ldr-rgb-kodak07.png,30.8061,0.0243,0.0063,62.6526 +Kodak,12x12,ldr-rgb-kodak08.png,25.2204,0.0392,0.0201,19.5747 +Kodak,12x12,ldr-rgb-kodak09.png,31.6441,0.0234,0.0055,72.0960 +Kodak,12x12,ldr-rgb-kodak10.png,31.4535,0.0238,0.0053,73.6773 +Kodak,12x12,ldr-rgb-kodak11.png,28.8707,0.0255,0.0085,46.2174 +Kodak,12x12,ldr-rgb-kodak12.png,32.1874,0.0216,0.0047,83.3300 +Kodak,12x12,ldr-rgb-kodak13.png,24.2468,0.0400,0.0215,18.2892 +Kodak,12x12,ldr-rgb-kodak14.png,27.4618,0.0293,0.0117,33.6455 +Kodak,12x12,ldr-rgb-kodak15.png,31.1647,0.0246,0.0066,59.8863 +Kodak,12x12,ldr-rgb-kodak16.png,31.3665,0.0223,0.0058,67.4823 +Kodak,12x12,ldr-rgb-kodak17.png,30.8424,0.0240,0.0057,68.8170 +Kodak,12x12,ldr-rgb-kodak18.png,27.3760,0.0301,0.0110,35.6784 +Kodak,12x12,ldr-rgb-kodak19.png,29.8759,0.0272,0.0085,46.3746 +Kodak,12x12,ldr-rgb-kodak20.png,30.9403,0.0229,0.0064,61.6042 +Kodak,12x12,ldr-rgb-kodak21.png,28.6206,0.0278,0.0106,37.1448 +Kodak,12x12,ldr-rgb-kodak22.png,29.7607,0.0254,0.0068,58.1342 +Kodak,12x12,ldr-rgb-kodak23.png,32.4940,0.0224,0.0049,80.4953 +Kodak,12x12,ldr-rgb-kodak24.png,26.7049,0.0300,0.0115,34.0596 diff --git a/Test/Images/Kodak/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/Kodak/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..dd4954247c6f810a4ee18f7c1e4796fcfed9c274 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3436,0.0820,0.0650,6.0499 +Kodak,4x4,ldr-rgb-kodak02.png,45.5149,0.1208,0.1026,3.8328 +Kodak,4x4,ldr-rgb-kodak03.png,47.7270,0.0629,0.0465,8.4573 +Kodak,4x4,ldr-rgb-kodak04.png,45.5617,0.0957,0.0770,5.1084 +Kodak,4x4,ldr-rgb-kodak05.png,42.2148,0.1058,0.0880,4.4685 +Kodak,4x4,ldr-rgb-kodak06.png,45.2285,0.0778,0.0610,6.4483 +Kodak,4x4,ldr-rgb-kodak07.png,46.0657,0.0776,0.0599,6.5626 +Kodak,4x4,ldr-rgb-kodak08.png,42.5596,0.1129,0.0940,4.1847 +Kodak,4x4,ldr-rgb-kodak09.png,47.2250,0.0918,0.0740,5.3130 +Kodak,4x4,ldr-rgb-kodak10.png,46.9183,0.0940,0.0759,5.1816 +Kodak,4x4,ldr-rgb-kodak11.png,44.9485,0.0932,0.0761,5.1668 +Kodak,4x4,ldr-rgb-kodak12.png,48.0140,0.0710,0.0544,7.2264 +Kodak,4x4,ldr-rgb-kodak13.png,41.6783,0.0883,0.0703,5.5962 +Kodak,4x4,ldr-rgb-kodak14.png,42.7635,0.0980,0.0809,4.8621 +Kodak,4x4,ldr-rgb-kodak15.png,45.6010,0.0841,0.0663,5.9334 +Kodak,4x4,ldr-rgb-kodak16.png,47.9487,0.0700,0.0539,7.3019 +Kodak,4x4,ldr-rgb-kodak17.png,46.3985,0.0801,0.0620,6.3392 +Kodak,4x4,ldr-rgb-kodak18.png,42.0873,0.1206,0.1019,3.8607 +Kodak,4x4,ldr-rgb-kodak19.png,45.4135,0.0957,0.0772,5.0929 +Kodak,4x4,ldr-rgb-kodak20.png,46.9562,0.0619,0.0459,8.5715 +Kodak,4x4,ldr-rgb-kodak21.png,45.2261,0.0967,0.0798,4.9246 +Kodak,4x4,ldr-rgb-kodak22.png,43.8626,0.1216,0.1035,3.7990 +Kodak,4x4,ldr-rgb-kodak23.png,46.9450,0.0953,0.0781,5.0325 +Kodak,4x4,ldr-rgb-kodak24.png,42.4147,0.0947,0.0766,5.1348 +Kodak,5x5,ldr-rgb-kodak01.png,40.1323,0.0843,0.0664,5.9192 +Kodak,5x5,ldr-rgb-kodak02.png,41.7976,0.0962,0.0779,5.0480 +Kodak,5x5,ldr-rgb-kodak03.png,44.1103,0.0492,0.0322,12.1999 +Kodak,5x5,ldr-rgb-kodak04.png,42.1172,0.0759,0.0569,6.9080 +Kodak,5x5,ldr-rgb-kodak05.png,38.0255,0.0999,0.0813,4.8380 +Kodak,5x5,ldr-rgb-kodak06.png,40.9959,0.0684,0.0510,7.7094 +Kodak,5x5,ldr-rgb-kodak07.png,42.5000,0.0632,0.0446,8.8250 +Kodak,5x5,ldr-rgb-kodak08.png,38.3799,0.1044,0.0848,4.6348 +Kodak,5x5,ldr-rgb-kodak09.png,43.8318,0.0558,0.0373,10.5449 +Kodak,5x5,ldr-rgb-kodak10.png,43.4528,0.0607,0.0421,9.3376 +Kodak,5x5,ldr-rgb-kodak11.png,40.8938,0.0787,0.0612,6.4301 +Kodak,5x5,ldr-rgb-kodak12.png,44.4299,0.0496,0.0324,12.1202 +Kodak,5x5,ldr-rgb-kodak13.png,36.9514,0.0852,0.0664,5.9255 +Kodak,5x5,ldr-rgb-kodak14.png,38.7191,0.0903,0.0723,5.4378 +Kodak,5x5,ldr-rgb-kodak15.png,41.9816,0.0719,0.0536,7.3308 +Kodak,5x5,ldr-rgb-kodak16.png,44.1799,0.0518,0.0350,11.2425 +Kodak,5x5,ldr-rgb-kodak17.png,42.5913,0.0542,0.0355,11.0688 +Kodak,5x5,ldr-rgb-kodak18.png,38.4192,0.0948,0.0753,5.2210 +Kodak,5x5,ldr-rgb-kodak19.png,41.6938,0.0672,0.0481,8.1719 +Kodak,5x5,ldr-rgb-kodak20.png,43.0178,0.0511,0.0342,11.4956 +Kodak,5x5,ldr-rgb-kodak21.png,40.7979,0.0690,0.0513,7.6656 +Kodak,5x5,ldr-rgb-kodak22.png,40.3244,0.0926,0.0736,5.3438 +Kodak,5x5,ldr-rgb-kodak23.png,43.6199,0.0657,0.0477,8.2428 +Kodak,5x5,ldr-rgb-kodak24.png,38.2265,0.0794,0.0606,6.4924 +Kodak,6x6,ldr-rgb-kodak01.png,36.2008,0.0831,0.0657,5.9818 +Kodak,6x6,ldr-rgb-kodak02.png,39.0638,0.0764,0.0585,6.7189 +Kodak,6x6,ldr-rgb-kodak03.png,41.3682,0.0422,0.0257,15.2842 +Kodak,6x6,ldr-rgb-kodak04.png,39.4191,0.0657,0.0470,8.3651 +Kodak,6x6,ldr-rgb-kodak05.png,34.8088,0.0942,0.0763,5.1523 +Kodak,6x6,ldr-rgb-kodak06.png,37.6472,0.0610,0.0441,8.9263 +Kodak,6x6,ldr-rgb-kodak07.png,39.8064,0.0548,0.0369,10.6569 +Kodak,6x6,ldr-rgb-kodak08.png,34.9897,0.0999,0.0808,4.8682 +Kodak,6x6,ldr-rgb-kodak09.png,40.8974,0.0450,0.0270,14.5575 +Kodak,6x6,ldr-rgb-kodak10.png,40.5253,0.0472,0.0288,13.6490 +Kodak,6x6,ldr-rgb-kodak11.png,37.6082,0.0671,0.0501,7.8430 +Kodak,6x6,ldr-rgb-kodak12.png,41.5111,0.0407,0.0241,16.2850 +Kodak,6x6,ldr-rgb-kodak13.png,32.9132,0.0899,0.0715,5.5018 +Kodak,6x6,ldr-rgb-kodak14.png,35.8599,0.0838,0.0663,5.9292 +Kodak,6x6,ldr-rgb-kodak15.png,39.2305,0.0646,0.0467,8.4233 +Kodak,6x6,ldr-rgb-kodak16.png,41.0574,0.0439,0.0274,14.3316 +Kodak,6x6,ldr-rgb-kodak17.png,39.5098,0.0465,0.0283,13.9059 +Kodak,6x6,ldr-rgb-kodak18.png,35.3754,0.0837,0.0648,6.0701 +Kodak,6x6,ldr-rgb-kodak19.png,38.5331,0.0597,0.0413,9.5267 +Kodak,6x6,ldr-rgb-kodak20.png,39.7790,0.0460,0.0298,13.2146 +Kodak,6x6,ldr-rgb-kodak21.png,37.2127,0.0600,0.0429,9.1654 +Kodak,6x6,ldr-rgb-kodak22.png,37.4858,0.0776,0.0591,6.6499 +Kodak,6x6,ldr-rgb-kodak23.png,41.0115,0.0497,0.0324,12.1482 +Kodak,6x6,ldr-rgb-kodak24.png,35.0719,0.0699,0.0516,7.6140 +Kodak,8x8,ldr-rgb-kodak01.png,31.8036,0.1099,0.0915,4.2973 +Kodak,8x8,ldr-rgb-kodak02.png,35.8059,0.0759,0.0574,6.8470 +Kodak,8x8,ldr-rgb-kodak03.png,37.7677,0.0498,0.0328,11.9901 +Kodak,8x8,ldr-rgb-kodak04.png,36.1068,0.0705,0.0516,7.6139 +Kodak,8x8,ldr-rgb-kodak05.png,30.7525,0.1195,0.1005,3.9122 +Kodak,8x8,ldr-rgb-kodak06.png,33.4479,0.0751,0.0577,6.8202 +Kodak,8x8,ldr-rgb-kodak07.png,36.1623,0.0640,0.0454,8.6560 +Kodak,8x8,ldr-rgb-kodak08.png,30.5413,0.1211,0.1015,3.8729 +Kodak,8x8,ldr-rgb-kodak09.png,37.2666,0.0511,0.0327,12.0238 +Kodak,8x8,ldr-rgb-kodak10.png,36.9291,0.0518,0.0329,11.9432 +Kodak,8x8,ldr-rgb-kodak11.png,33.6748,0.0780,0.0603,6.5220 +Kodak,8x8,ldr-rgb-kodak12.png,37.8421,0.0485,0.0313,12.5484 +Kodak,8x8,ldr-rgb-kodak13.png,28.3980,0.1175,0.0986,3.9869 +Kodak,8x8,ldr-rgb-kodak14.png,32.1539,0.1026,0.0845,4.6559 +Kodak,8x8,ldr-rgb-kodak15.png,35.8557,0.0653,0.0468,8.3931 +Kodak,8x8,ldr-rgb-kodak16.png,37.0420,0.0534,0.0363,10.8273 +Kodak,8x8,ldr-rgb-kodak17.png,35.6788,0.0550,0.0361,10.8927 +Kodak,8x8,ldr-rgb-kodak18.png,31.5601,0.0958,0.0762,5.1581 +Kodak,8x8,ldr-rgb-kodak19.png,34.7706,0.0691,0.0500,7.8661 +Kodak,8x8,ldr-rgb-kodak20.png,35.9106,0.0548,0.0378,10.3941 +Kodak,8x8,ldr-rgb-kodak21.png,33.1168,0.0736,0.0557,7.0594 +Kodak,8x8,ldr-rgb-kodak22.png,34.0527,0.0836,0.0644,6.1103 +Kodak,8x8,ldr-rgb-kodak23.png,37.6898,0.0514,0.0334,11.7761 +Kodak,8x8,ldr-rgb-kodak24.png,31.1316,0.0821,0.0631,6.2267 +Kodak,12x12,ldr-rgb-kodak01.png,27.7556,0.1224,0.1016,3.8686 +Kodak,12x12,ldr-rgb-kodak02.png,32.4643,0.0616,0.0403,9.7570 +Kodak,12x12,ldr-rgb-kodak03.png,33.8360,0.0470,0.0271,14.5173 +Kodak,12x12,ldr-rgb-kodak04.png,32.4512,0.0548,0.0331,11.8886 +Kodak,12x12,ldr-rgb-kodak05.png,26.3995,0.1337,0.1123,3.5028 +Kodak,12x12,ldr-rgb-kodak06.png,29.3774,0.0810,0.0605,6.4993 +Kodak,12x12,ldr-rgb-kodak07.png,32.0484,0.0654,0.0439,8.9622 +Kodak,12x12,ldr-rgb-kodak08.png,26.0631,0.1388,0.1164,3.3777 +Kodak,12x12,ldr-rgb-kodak09.png,33.1028,0.0500,0.0288,13.6633 +Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0502,0.0285,13.7734 +Kodak,12x12,ldr-rgb-kodak11.png,29.7578,0.0776,0.0569,6.9130 +Kodak,12x12,ldr-rgb-kodak12.png,33.8888,0.0462,0.0263,14.9285 +Kodak,12x12,ldr-rgb-kodak13.png,24.5306,0.1381,0.1165,3.3761 +Kodak,12x12,ldr-rgb-kodak14.png,28.4334,0.1071,0.0861,4.5648 +Kodak,12x12,ldr-rgb-kodak15.png,32.2456,0.0618,0.0405,9.7071 +Kodak,12x12,ldr-rgb-kodak16.png,32.9899,0.0517,0.0318,12.3844 +Kodak,12x12,ldr-rgb-kodak17.png,31.7938,0.0542,0.0326,12.0793 +Kodak,12x12,ldr-rgb-kodak18.png,27.7853,0.0960,0.0735,5.3489 +Kodak,12x12,ldr-rgb-kodak19.png,30.8937,0.0685,0.0464,8.4716 +Kodak,12x12,ldr-rgb-kodak20.png,31.8665,0.0549,0.0346,11.3519 +Kodak,12x12,ldr-rgb-kodak21.png,29.1859,0.0837,0.0632,6.2233 +Kodak,12x12,ldr-rgb-kodak22.png,30.5129,0.0739,0.0521,7.5444 +Kodak,12x12,ldr-rgb-kodak23.png,33.5762,0.0443,0.0234,16.8358 +Kodak,12x12,ldr-rgb-kodak24.png,27.1069,0.0851,0.0634,6.2024 diff --git a/Test/Images/Kodak/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..44684321f5c66713985a1c9710bc5fdd57634d97 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5393,0.1760,0.1590,2.4727 +Kodak,4x4,ldr-rgb-kodak02.png,45.7829,0.2525,0.2345,1.6769 +Kodak,4x4,ldr-rgb-kodak03.png,48.1286,0.2005,0.1840,2.1374 +Kodak,4x4,ldr-rgb-kodak04.png,45.7459,0.2252,0.2070,1.8995 +Kodak,4x4,ldr-rgb-kodak05.png,42.4808,0.2212,0.2033,1.9339 +Kodak,4x4,ldr-rgb-kodak06.png,45.4283,0.1842,0.1673,2.3510 +Kodak,4x4,ldr-rgb-kodak07.png,46.4346,0.2225,0.2043,1.9247 +Kodak,4x4,ldr-rgb-kodak08.png,42.8524,0.2325,0.2137,1.8399 +Kodak,4x4,ldr-rgb-kodak09.png,47.4868,0.2362,0.2180,1.8035 +Kodak,4x4,ldr-rgb-kodak10.png,47.1520,0.2334,0.2155,1.8246 +Kodak,4x4,ldr-rgb-kodak11.png,45.2020,0.2110,0.1934,2.0335 +Kodak,4x4,ldr-rgb-kodak12.png,48.3163,0.2022,0.1856,2.1189 +Kodak,4x4,ldr-rgb-kodak13.png,41.7858,0.1820,0.1638,2.4010 +Kodak,4x4,ldr-rgb-kodak14.png,43.0205,0.2069,0.1896,2.0742 +Kodak,4x4,ldr-rgb-kodak15.png,45.8894,0.2154,0.1978,1.9883 +Kodak,4x4,ldr-rgb-kodak16.png,48.1595,0.2001,0.1838,2.1389 +Kodak,4x4,ldr-rgb-kodak17.png,46.5669,0.2132,0.1950,2.0163 +Kodak,4x4,ldr-rgb-kodak18.png,42.2513,0.2479,0.2284,1.7216 +Kodak,4x4,ldr-rgb-kodak19.png,45.6248,0.2237,0.2053,1.9150 +Kodak,4x4,ldr-rgb-kodak20.png,47.2126,0.1414,0.1250,3.1454 +Kodak,4x4,ldr-rgb-kodak21.png,45.3757,0.2239,0.2068,1.9013 +Kodak,4x4,ldr-rgb-kodak22.png,44.0484,0.2549,0.2362,1.6645 +Kodak,4x4,ldr-rgb-kodak23.png,47.2672,0.2485,0.2307,1.7043 +Kodak,4x4,ldr-rgb-kodak24.png,42.6395,0.2212,0.2031,1.9361 +Kodak,5x5,ldr-rgb-kodak01.png,40.2439,0.2027,0.1848,2.1279 +Kodak,5x5,ldr-rgb-kodak02.png,42.0748,0.2692,0.2507,1.5683 +Kodak,5x5,ldr-rgb-kodak03.png,44.4104,0.2014,0.1845,2.1315 +Kodak,5x5,ldr-rgb-kodak04.png,42.3039,0.2216,0.2024,1.9427 +Kodak,5x5,ldr-rgb-kodak05.png,38.2196,0.2381,0.2193,1.7933 +Kodak,5x5,ldr-rgb-kodak06.png,41.1196,0.1884,0.1711,2.2988 +Kodak,5x5,ldr-rgb-kodak07.png,42.7728,0.2242,0.2058,1.9104 +Kodak,5x5,ldr-rgb-kodak08.png,38.5537,0.2389,0.2193,1.7933 +Kodak,5x5,ldr-rgb-kodak09.png,44.0572,0.2192,0.2007,1.9591 +Kodak,5x5,ldr-rgb-kodak10.png,43.6371,0.2252,0.2060,1.9085 +Kodak,5x5,ldr-rgb-kodak11.png,41.0491,0.2129,0.1953,2.0130 +Kodak,5x5,ldr-rgb-kodak12.png,44.6371,0.1997,0.1827,2.1528 +Kodak,5x5,ldr-rgb-kodak13.png,36.9965,0.1853,0.1666,2.3595 +Kodak,5x5,ldr-rgb-kodak14.png,38.9373,0.2193,0.2013,1.9537 +Kodak,5x5,ldr-rgb-kodak15.png,42.2057,0.2153,0.1968,1.9979 +Kodak,5x5,ldr-rgb-kodak16.png,44.3209,0.1973,0.1804,2.1793 +Kodak,5x5,ldr-rgb-kodak17.png,42.6878,0.2038,0.1847,2.1286 +Kodak,5x5,ldr-rgb-kodak18.png,38.5091,0.2405,0.2208,1.7808 +Kodak,5x5,ldr-rgb-kodak19.png,41.8288,0.2221,0.2032,1.9347 +Kodak,5x5,ldr-rgb-kodak20.png,43.3334,0.1430,0.1262,3.1152 +Kodak,5x5,ldr-rgb-kodak21.png,40.9050,0.2284,0.2106,1.8668 +Kodak,5x5,ldr-rgb-kodak22.png,40.4714,0.2588,0.2398,1.6394 +Kodak,5x5,ldr-rgb-kodak23.png,43.9456,0.2568,0.2388,1.6466 +Kodak,5x5,ldr-rgb-kodak24.png,38.3490,0.2272,0.2079,1.8918 +Kodak,6x6,ldr-rgb-kodak01.png,36.3168,0.2234,0.2061,1.9080 +Kodak,6x6,ldr-rgb-kodak02.png,39.4281,0.2844,0.2666,1.4751 +Kodak,6x6,ldr-rgb-kodak03.png,41.7707,0.1722,0.1553,2.5318 +Kodak,6x6,ldr-rgb-kodak04.png,39.6843,0.2290,0.2105,1.8678 +Kodak,6x6,ldr-rgb-kodak05.png,35.0088,0.2538,0.2355,1.6697 +Kodak,6x6,ldr-rgb-kodak06.png,37.7698,0.1976,0.1805,2.1781 +Kodak,6x6,ldr-rgb-kodak07.png,40.1464,0.2008,0.1828,2.1507 +Kodak,6x6,ldr-rgb-kodak08.png,35.1763,0.2526,0.2335,1.6837 +Kodak,6x6,ldr-rgb-kodak09.png,41.2785,0.2177,0.1999,1.9672 +Kodak,6x6,ldr-rgb-kodak10.png,40.8522,0.2350,0.2165,1.8160 +Kodak,6x6,ldr-rgb-kodak11.png,37.7933,0.2210,0.2038,1.9296 +Kodak,6x6,ldr-rgb-kodak12.png,41.8544,0.1992,0.1828,2.1515 +Kodak,6x6,ldr-rgb-kodak13.png,32.9617,0.2112,0.1930,2.0377 +Kodak,6x6,ldr-rgb-kodak14.png,36.0569,0.2401,0.2226,1.7668 +Kodak,6x6,ldr-rgb-kodak15.png,39.4918,0.2039,0.1861,2.1132 +Kodak,6x6,ldr-rgb-kodak16.png,41.2543,0.1880,0.1714,2.2948 +Kodak,6x6,ldr-rgb-kodak17.png,39.6918,0.2089,0.1907,2.0616 +Kodak,6x6,ldr-rgb-kodak18.png,35.4609,0.2577,0.2384,1.6494 +Kodak,6x6,ldr-rgb-kodak19.png,38.7173,0.2402,0.2215,1.7749 +Kodak,6x6,ldr-rgb-kodak20.png,40.1243,0.1514,0.1351,2.9097 +Kodak,6x6,ldr-rgb-kodak21.png,37.3603,0.2385,0.2215,1.7750 +Kodak,6x6,ldr-rgb-kodak22.png,37.6556,0.2740,0.2553,1.5401 +Kodak,6x6,ldr-rgb-kodak23.png,41.4655,0.2506,0.2329,1.6884 +Kodak,6x6,ldr-rgb-kodak24.png,35.1889,0.2263,0.2080,1.8904 +Kodak,8x8,ldr-rgb-kodak01.png,31.9131,0.2747,0.2551,1.5412 +Kodak,8x8,ldr-rgb-kodak02.png,36.1767,0.2775,0.2574,1.5279 +Kodak,8x8,ldr-rgb-kodak03.png,38.2083,0.1499,0.1312,2.9968 +Kodak,8x8,ldr-rgb-kodak04.png,36.3928,0.2243,0.2038,1.9298 +Kodak,8x8,ldr-rgb-kodak05.png,30.9201,0.2990,0.2785,1.4119 +Kodak,8x8,ldr-rgb-kodak06.png,33.5817,0.2267,0.2075,1.8949 +Kodak,8x8,ldr-rgb-kodak07.png,36.5160,0.1836,0.1637,2.4027 +Kodak,8x8,ldr-rgb-kodak08.png,30.7384,0.3233,0.3022,1.3010 +Kodak,8x8,ldr-rgb-kodak09.png,37.5615,0.1663,0.1464,2.6854 +Kodak,8x8,ldr-rgb-kodak10.png,37.2421,0.1902,0.1700,2.3130 +Kodak,8x8,ldr-rgb-kodak11.png,33.8416,0.2638,0.2446,1.6074 +Kodak,8x8,ldr-rgb-kodak12.png,38.2751,0.1726,0.1540,2.5534 +Kodak,8x8,ldr-rgb-kodak13.png,28.4619,0.2875,0.2670,1.4729 +Kodak,8x8,ldr-rgb-kodak14.png,32.3307,0.2870,0.2676,1.4696 +Kodak,8x8,ldr-rgb-kodak15.png,36.0804,0.2128,0.1927,2.0401 +Kodak,8x8,ldr-rgb-kodak16.png,37.2806,0.1837,0.1649,2.3845 +Kodak,8x8,ldr-rgb-kodak17.png,35.8778,0.1828,0.1621,2.4253 +Kodak,8x8,ldr-rgb-kodak18.png,31.6559,0.2944,0.2733,1.4386 +Kodak,8x8,ldr-rgb-kodak19.png,34.9339,0.2008,0.1802,2.1817 +Kodak,8x8,ldr-rgb-kodak20.png,36.1622,0.1608,0.1424,2.7606 +Kodak,8x8,ldr-rgb-kodak21.png,33.2290,0.2112,0.1923,2.0445 +Kodak,8x8,ldr-rgb-kodak22.png,34.2355,0.2761,0.2558,1.5371 +Kodak,8x8,ldr-rgb-kodak23.png,38.2086,0.1826,0.1630,2.4123 +Kodak,8x8,ldr-rgb-kodak24.png,31.2397,0.2433,0.2227,1.7655 +Kodak,12x12,ldr-rgb-kodak01.png,27.9145,0.3613,0.3380,1.1632 +Kodak,12x12,ldr-rgb-kodak02.png,33.0098,0.2699,0.2463,1.5965 +Kodak,12x12,ldr-rgb-kodak03.png,34.4588,0.1625,0.1404,2.8016 +Kodak,12x12,ldr-rgb-kodak04.png,32.9763,0.2348,0.2107,1.8662 +Kodak,12x12,ldr-rgb-kodak05.png,26.6072,0.3898,0.3655,1.0757 +Kodak,12x12,ldr-rgb-kodak06.png,29.5340,0.2646,0.2417,1.6270 +Kodak,12x12,ldr-rgb-kodak07.png,32.6336,0.2067,0.1828,2.1505 +Kodak,12x12,ldr-rgb-kodak08.png,26.2642,0.3924,0.3676,1.0697 +Kodak,12x12,ldr-rgb-kodak09.png,33.6341,0.1847,0.1611,2.4406 +Kodak,12x12,ldr-rgb-kodak10.png,32.9911,0.1843,0.1600,2.4570 +Kodak,12x12,ldr-rgb-kodak11.png,30.0562,0.2839,0.2607,1.5081 +Kodak,12x12,ldr-rgb-kodak12.png,34.4444,0.1687,0.1460,2.6924 +Kodak,12x12,ldr-rgb-kodak13.png,24.5875,0.4212,0.3968,0.9909 +Kodak,12x12,ldr-rgb-kodak14.png,28.6495,0.3463,0.3229,1.2179 +Kodak,12x12,ldr-rgb-kodak15.png,32.7427,0.2281,0.2040,1.9276 +Kodak,12x12,ldr-rgb-kodak16.png,33.3405,0.1998,0.1771,2.2197 +Kodak,12x12,ldr-rgb-kodak17.png,32.1386,0.1976,0.1732,2.2698 +Kodak,12x12,ldr-rgb-kodak18.png,27.9275,0.3434,0.3187,1.2336 +Kodak,12x12,ldr-rgb-kodak19.png,31.1080,0.2696,0.2453,1.6031 +Kodak,12x12,ldr-rgb-kodak20.png,32.1759,0.2113,0.1888,2.0831 +Kodak,12x12,ldr-rgb-kodak21.png,29.3270,0.2538,0.2306,1.7050 +Kodak,12x12,ldr-rgb-kodak22.png,30.7891,0.3029,0.2783,1.4130 +Kodak,12x12,ldr-rgb-kodak23.png,34.3878,0.1669,0.1434,2.7422 +Kodak,12x12,ldr-rgb-kodak24.png,27.2398,0.3079,0.2830,1.3894 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..00fd14e1aef1de03a50da510a31b60c224cc8acf --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.9062,0.0359,0.0185,21.2792 +Kodak,4x4,ldr-rgb-kodak02.png,44.3467,0.0452,0.0270,14.5604 +Kodak,4x4,ldr-rgb-kodak03.png,46.8208,0.0319,0.0152,25.8952 +Kodak,4x4,ldr-rgb-kodak04.png,44.7048,0.0424,0.0239,16.4265 +Kodak,4x4,ldr-rgb-kodak05.png,41.6833,0.0543,0.0360,10.9206 +Kodak,4x4,ldr-rgb-kodak06.png,44.8187,0.0354,0.0184,21.4065 +Kodak,4x4,ldr-rgb-kodak07.png,45.1903,0.0386,0.0205,19.2180 +Kodak,4x4,ldr-rgb-kodak08.png,42.1528,0.0565,0.0371,10.5860 +Kodak,4x4,ldr-rgb-kodak09.png,46.3750,0.0318,0.0140,28.0526 +Kodak,4x4,ldr-rgb-kodak10.png,46.1453,0.0332,0.0148,26.6226 +Kodak,4x4,ldr-rgb-kodak11.png,44.3357,0.0398,0.0224,17.5684 +Kodak,4x4,ldr-rgb-kodak12.png,47.1358,0.0305,0.0137,28.6854 +Kodak,4x4,ldr-rgb-kodak13.png,41.5073,0.0493,0.0307,12.8271 +Kodak,4x4,ldr-rgb-kodak14.png,41.9561,0.0476,0.0298,13.1859 +Kodak,4x4,ldr-rgb-kodak15.png,44.7852,0.0443,0.0261,15.0548 +Kodak,4x4,ldr-rgb-kodak16.png,47.3018,0.0286,0.0121,32.5563 +Kodak,4x4,ldr-rgb-kodak17.png,45.8895,0.0316,0.0133,29.5737 +Kodak,4x4,ldr-rgb-kodak18.png,41.7129,0.0547,0.0355,11.0918 +Kodak,4x4,ldr-rgb-kodak19.png,44.8948,0.0365,0.0179,22.0240 +Kodak,4x4,ldr-rgb-kodak20.png,46.4413,0.0318,0.0154,25.4902 +Kodak,4x4,ldr-rgb-kodak21.png,44.6688,0.0362,0.0188,20.8736 +Kodak,4x4,ldr-rgb-kodak22.png,43.2575,0.0485,0.0298,13.2102 +Kodak,4x4,ldr-rgb-kodak23.png,45.6976,0.0360,0.0184,21.4090 +Kodak,4x4,ldr-rgb-kodak24.png,42.0117,0.0476,0.0290,13.5713 +Kodak,5x5,ldr-rgb-kodak01.png,39.6381,0.0364,0.0181,21.7017 +Kodak,5x5,ldr-rgb-kodak02.png,40.6613,0.0358,0.0172,22.8747 +Kodak,5x5,ldr-rgb-kodak03.png,43.1070,0.0283,0.0116,33.8395 +Kodak,5x5,ldr-rgb-kodak04.png,41.3054,0.0345,0.0157,24.9976 +Kodak,5x5,ldr-rgb-kodak05.png,37.4812,0.0499,0.0310,12.6770 +Kodak,5x5,ldr-rgb-kodak06.png,40.6175,0.0322,0.0146,26.9713 +Kodak,5x5,ldr-rgb-kodak07.png,41.5316,0.0332,0.0151,26.0408 +Kodak,5x5,ldr-rgb-kodak08.png,37.7979,0.0512,0.0313,12.5713 +Kodak,5x5,ldr-rgb-kodak09.png,42.9386,0.0289,0.0105,37.3349 +Kodak,5x5,ldr-rgb-kodak10.png,42.6726,0.0293,0.0108,36.3379 +Kodak,5x5,ldr-rgb-kodak11.png,40.3558,0.0340,0.0166,23.6437 +Kodak,5x5,ldr-rgb-kodak12.png,43.4607,0.0267,0.0096,40.8923 +Kodak,5x5,ldr-rgb-kodak13.png,36.8488,0.0457,0.0267,14.7410 +Kodak,5x5,ldr-rgb-kodak14.png,38.0471,0.0460,0.0278,14.1390 +Kodak,5x5,ldr-rgb-kodak15.png,41.2322,0.0350,0.0166,23.6620 +Kodak,5x5,ldr-rgb-kodak16.png,43.5315,0.0256,0.0088,44.6230 +Kodak,5x5,ldr-rgb-kodak17.png,42.1157,0.0287,0.0100,39.1918 +Kodak,5x5,ldr-rgb-kodak18.png,38.1383,0.0429,0.0236,16.6822 +Kodak,5x5,ldr-rgb-kodak19.png,41.1817,0.0318,0.0128,30.6938 +Kodak,5x5,ldr-rgb-kodak20.png,42.3886,0.0281,0.0113,34.8447 +Kodak,5x5,ldr-rgb-kodak21.png,40.4523,0.0330,0.0156,25.2483 +Kodak,5x5,ldr-rgb-kodak22.png,39.8132,0.0378,0.0187,21.0535 +Kodak,5x5,ldr-rgb-kodak23.png,42.5506,0.0303,0.0122,32.1777 +Kodak,5x5,ldr-rgb-kodak24.png,37.9125,0.0407,0.0220,17.8581 +Kodak,6x6,ldr-rgb-kodak01.png,35.7576,0.0445,0.0268,14.6739 +Kodak,6x6,ldr-rgb-kodak02.png,38.1979,0.0366,0.0181,21.7785 +Kodak,6x6,ldr-rgb-kodak03.png,40.5936,0.0282,0.0116,33.9824 +Kodak,6x6,ldr-rgb-kodak04.png,38.5639,0.0353,0.0166,23.6424 +Kodak,6x6,ldr-rgb-kodak05.png,34.3707,0.0566,0.0379,10.3630 +Kodak,6x6,ldr-rgb-kodak06.png,37.3064,0.0354,0.0180,21.8634 +Kodak,6x6,ldr-rgb-kodak07.png,38.8907,0.0347,0.0163,24.1906 +Kodak,6x6,ldr-rgb-kodak08.png,34.4542,0.0574,0.0378,10.4094 +Kodak,6x6,ldr-rgb-kodak09.png,39.9832,0.0306,0.0124,31.7515 +Kodak,6x6,ldr-rgb-kodak10.png,39.7378,0.0304,0.0120,32.7678 +Kodak,6x6,ldr-rgb-kodak11.png,37.1622,0.0370,0.0196,20.0692 +Kodak,6x6,ldr-rgb-kodak12.png,40.7512,0.0269,0.0102,38.4974 +Kodak,6x6,ldr-rgb-kodak13.png,32.8161,0.0578,0.0390,10.0734 +Kodak,6x6,ldr-rgb-kodak14.png,35.3127,0.0505,0.0325,12.0881 +Kodak,6x6,ldr-rgb-kodak15.png,38.5805,0.0355,0.0174,22.5689 +Kodak,6x6,ldr-rgb-kodak16.png,40.5090,0.0270,0.0102,38.4337 +Kodak,6x6,ldr-rgb-kodak17.png,38.9529,0.0307,0.0122,32.1488 +Kodak,6x6,ldr-rgb-kodak18.png,35.1258,0.0462,0.0267,14.7003 +Kodak,6x6,ldr-rgb-kodak19.png,37.9862,0.0363,0.0175,22.5107 +Kodak,6x6,ldr-rgb-kodak20.png,39.1964,0.0304,0.0137,28.6769 +Kodak,6x6,ldr-rgb-kodak21.png,36.9178,0.0375,0.0201,19.5931 +Kodak,6x6,ldr-rgb-kodak22.png,36.9994,0.0397,0.0208,18.8636 +Kodak,6x6,ldr-rgb-kodak23.png,40.0813,0.0298,0.0122,32.3075 +Kodak,6x6,ldr-rgb-kodak24.png,34.8032,0.0432,0.0245,16.0516 +Kodak,8x8,ldr-rgb-kodak01.png,31.3412,0.0580,0.0399,9.8617 +Kodak,8x8,ldr-rgb-kodak02.png,34.9527,0.0366,0.0180,21.8330 +Kodak,8x8,ldr-rgb-kodak03.png,36.6102,0.0304,0.0134,29.3908 +Kodak,8x8,ldr-rgb-kodak04.png,35.1877,0.0364,0.0177,22.2270 +Kodak,8x8,ldr-rgb-kodak05.png,30.2580,0.0673,0.0482,8.1550 +Kodak,8x8,ldr-rgb-kodak06.png,32.9478,0.0449,0.0273,14.4077 +Kodak,8x8,ldr-rgb-kodak07.png,34.9976,0.0387,0.0200,19.6599 +Kodak,8x8,ldr-rgb-kodak08.png,29.9709,0.0692,0.0495,7.9409 +Kodak,8x8,ldr-rgb-kodak09.png,36.1754,0.0334,0.0149,26.4777 +Kodak,8x8,ldr-rgb-kodak10.png,35.8905,0.0325,0.0137,28.6123 +Kodak,8x8,ldr-rgb-kodak11.png,33.0125,0.0427,0.0251,15.6416 +Kodak,8x8,ldr-rgb-kodak12.png,36.7348,0.0297,0.0130,30.3358 +Kodak,8x8,ldr-rgb-kodak13.png,28.2212,0.0766,0.0576,6.8223 +Kodak,8x8,ldr-rgb-kodak14.png,31.5065,0.0564,0.0381,10.3095 +Kodak,8x8,ldr-rgb-kodak15.png,34.9514,0.0368,0.0183,21.4709 +Kodak,8x8,ldr-rgb-kodak16.png,36.0617,0.0331,0.0163,24.1237 +Kodak,8x8,ldr-rgb-kodak17.png,34.9137,0.0351,0.0161,24.4445 +Kodak,8x8,ldr-rgb-kodak18.png,31.2458,0.0534,0.0336,11.7109 +Kodak,8x8,ldr-rgb-kodak19.png,34.2323,0.0413,0.0222,17.7467 +Kodak,8x8,ldr-rgb-kodak20.png,35.2415,0.0329,0.0160,24.6424 +Kodak,8x8,ldr-rgb-kodak21.png,32.7559,0.0445,0.0267,14.7063 +Kodak,8x8,ldr-rgb-kodak22.png,33.4585,0.0428,0.0237,16.6104 +Kodak,8x8,ldr-rgb-kodak23.png,36.5494,0.0306,0.0125,31.4848 +Kodak,8x8,ldr-rgb-kodak24.png,30.8279,0.0497,0.0305,12.8814 +Kodak,12x12,ldr-rgb-kodak01.png,27.1096,0.0516,0.0320,12.3041 +Kodak,12x12,ldr-rgb-kodak02.png,31.1183,0.0297,0.0099,39.8441 +Kodak,12x12,ldr-rgb-kodak03.png,32.6995,0.0273,0.0086,45.6330 +Kodak,12x12,ldr-rgb-kodak04.png,31.5724,0.0286,0.0081,48.3543 +Kodak,12x12,ldr-rgb-kodak05.png,25.8234,0.0570,0.0365,10.7819 +Kodak,12x12,ldr-rgb-kodak06.png,28.6378,0.0417,0.0224,17.5519 +Kodak,12x12,ldr-rgb-kodak07.png,30.8626,0.0319,0.0117,33.4761 +Kodak,12x12,ldr-rgb-kodak08.png,25.4168,0.0638,0.0424,9.2815 +Kodak,12x12,ldr-rgb-kodak09.png,31.8375,0.0301,0.0100,39.4477 +Kodak,12x12,ldr-rgb-kodak10.png,31.5414,0.0300,0.0095,41.5056 +Kodak,12x12,ldr-rgb-kodak11.png,28.9389,0.0359,0.0166,23.6834 +Kodak,12x12,ldr-rgb-kodak12.png,32.2881,0.0270,0.0083,47.4036 +Kodak,12x12,ldr-rgb-kodak13.png,24.3214,0.0660,0.0452,8.6970 +Kodak,12x12,ldr-rgb-kodak14.png,27.5479,0.0434,0.0234,16.7789 +Kodak,12x12,ldr-rgb-kodak15.png,31.2617,0.0326,0.0124,31.7674 +Kodak,12x12,ldr-rgb-kodak16.png,31.4882,0.0293,0.0106,36.9949 +Kodak,12x12,ldr-rgb-kodak17.png,30.9019,0.0309,0.0104,37.7079 +Kodak,12x12,ldr-rgb-kodak18.png,27.4264,0.0433,0.0221,17.8232 +Kodak,12x12,ldr-rgb-kodak19.png,30.1924,0.0373,0.0165,23.7767 +Kodak,12x12,ldr-rgb-kodak20.png,31.0531,0.0303,0.0118,33.3091 +Kodak,12x12,ldr-rgb-kodak21.png,28.7189,0.0410,0.0218,18.0268 +Kodak,12x12,ldr-rgb-kodak22.png,29.8389,0.0336,0.0127,30.9182 +Kodak,12x12,ldr-rgb-kodak23.png,32.5301,0.0284,0.0087,45.1088 +Kodak,12x12,ldr-rgb-kodak24.png,26.7757,0.0433,0.0226,17.3774 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..5ce01967aec577ff8f16e2c79bdfb94952e95b0f --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5795,0.0299,0.0133,29.5833 +Kodak,4x4,ldr-rgb-kodak02.png,43.9381,0.0355,0.0177,22.2357 +Kodak,4x4,ldr-rgb-kodak03.png,46.2152,0.0268,0.0108,36.4600 +Kodak,4x4,ldr-rgb-kodak04.png,44.2927,0.0336,0.0159,24.7727 +Kodak,4x4,ldr-rgb-kodak05.png,41.1428,0.0392,0.0215,18.2874 +Kodak,4x4,ldr-rgb-kodak06.png,44.5411,0.0297,0.0133,29.6386 +Kodak,4x4,ldr-rgb-kodak07.png,44.7409,0.0313,0.0137,28.7604 +Kodak,4x4,ldr-rgb-kodak08.png,41.5923,0.0408,0.0220,17.8728 +Kodak,4x4,ldr-rgb-kodak09.png,46.0423,0.0278,0.0104,37.8602 +Kodak,4x4,ldr-rgb-kodak10.png,45.8041,0.0286,0.0108,36.3619 +Kodak,4x4,ldr-rgb-kodak11.png,43.9389,0.0315,0.0150,26.2422 +Kodak,4x4,ldr-rgb-kodak12.png,46.5919,0.0262,0.0102,38.5929 +Kodak,4x4,ldr-rgb-kodak13.png,41.2499,0.0382,0.0204,19.3102 +Kodak,4x4,ldr-rgb-kodak14.png,41.2988,0.0347,0.0176,22.3366 +Kodak,4x4,ldr-rgb-kodak15.png,44.3214,0.0339,0.0165,23.8575 +Kodak,4x4,ldr-rgb-kodak16.png,47.1694,0.0255,0.0096,40.9898 +Kodak,4x4,ldr-rgb-kodak17.png,45.6555,0.0278,0.0101,39.0840 +Kodak,4x4,ldr-rgb-kodak18.png,41.3733,0.0399,0.0213,18.4263 +Kodak,4x4,ldr-rgb-kodak19.png,44.6305,0.0308,0.0128,30.6242 +Kodak,4x4,ldr-rgb-kodak20.png,45.9534,0.0270,0.0110,35.5952 +Kodak,4x4,ldr-rgb-kodak21.png,44.3559,0.0298,0.0134,29.3710 +Kodak,4x4,ldr-rgb-kodak22.png,42.8876,0.0367,0.0185,21.2067 +Kodak,4x4,ldr-rgb-kodak23.png,45.3933,0.0300,0.0128,30.6293 +Kodak,4x4,ldr-rgb-kodak24.png,41.4571,0.0356,0.0176,22.3420 +Kodak,5x5,ldr-rgb-kodak01.png,39.4156,0.0318,0.0149,26.3988 +Kodak,5x5,ldr-rgb-kodak02.png,40.4404,0.0308,0.0133,29.6588 +Kodak,5x5,ldr-rgb-kodak03.png,42.7468,0.0251,0.0090,43.6661 +Kodak,5x5,ldr-rgb-kodak04.png,40.9150,0.0301,0.0124,31.8262 +Kodak,5x5,ldr-rgb-kodak05.png,37.1354,0.0396,0.0216,18.1774 +Kodak,5x5,ldr-rgb-kodak06.png,40.4615,0.0286,0.0121,32.4595 +Kodak,5x5,ldr-rgb-kodak07.png,41.2239,0.0293,0.0118,33.3968 +Kodak,5x5,ldr-rgb-kodak08.png,37.4696,0.0412,0.0223,17.6298 +Kodak,5x5,ldr-rgb-kodak09.png,42.6412,0.0258,0.0087,45.3482 +Kodak,5x5,ldr-rgb-kodak10.png,42.4794,0.0267,0.0090,43.5991 +Kodak,5x5,ldr-rgb-kodak11.png,40.1335,0.0293,0.0128,30.7946 +Kodak,5x5,ldr-rgb-kodak12.png,43.2490,0.0242,0.0082,47.8187 +Kodak,5x5,ldr-rgb-kodak13.png,36.7590,0.0392,0.0212,18.5392 +Kodak,5x5,ldr-rgb-kodak14.png,37.6107,0.0349,0.0176,22.3001 +Kodak,5x5,ldr-rgb-kodak15.png,40.9602,0.0299,0.0125,31.5384 +Kodak,5x5,ldr-rgb-kodak16.png,43.4497,0.0240,0.0079,49.5112 +Kodak,5x5,ldr-rgb-kodak17.png,41.9868,0.0264,0.0087,45.4068 +Kodak,5x5,ldr-rgb-kodak18.png,37.9866,0.0362,0.0177,22.2153 +Kodak,5x5,ldr-rgb-kodak19.png,40.9421,0.0291,0.0110,35.5952 +Kodak,5x5,ldr-rgb-kodak20.png,42.1079,0.0252,0.0093,42.4314 +Kodak,5x5,ldr-rgb-kodak21.png,40.2657,0.0293,0.0127,31.0304 +Kodak,5x5,ldr-rgb-kodak22.png,39.5405,0.0324,0.0143,27.4974 +Kodak,5x5,ldr-rgb-kodak23.png,42.2534,0.0272,0.0100,39.3451 +Kodak,5x5,ldr-rgb-kodak24.png,37.7137,0.0338,0.0159,24.7415 +Kodak,6x6,ldr-rgb-kodak01.png,35.6691,0.0376,0.0205,19.1439 +Kodak,6x6,ldr-rgb-kodak02.png,38.1041,0.0309,0.0134,29.2766 +Kodak,6x6,ldr-rgb-kodak03.png,40.4304,0.0247,0.0089,44.4211 +Kodak,6x6,ldr-rgb-kodak04.png,38.3680,0.0304,0.0126,31.0919 +Kodak,6x6,ldr-rgb-kodak05.png,34.1707,0.0432,0.0255,15.4221 +Kodak,6x6,ldr-rgb-kodak06.png,37.2480,0.0307,0.0142,27.6602 +Kodak,6x6,ldr-rgb-kodak07.png,38.7045,0.0297,0.0123,31.8650 +Kodak,6x6,ldr-rgb-kodak08.png,34.2613,0.0448,0.0263,14.9683 +Kodak,6x6,ldr-rgb-kodak09.png,39.8077,0.0272,0.0097,40.4957 +Kodak,6x6,ldr-rgb-kodak10.png,39.6100,0.0273,0.0096,40.7821 +Kodak,6x6,ldr-rgb-kodak11.png,37.0497,0.0310,0.0145,27.0625 +Kodak,6x6,ldr-rgb-kodak12.png,40.6243,0.0243,0.0084,46.9342 +Kodak,6x6,ldr-rgb-kodak13.png,32.7545,0.0467,0.0289,13.6249 +Kodak,6x6,ldr-rgb-kodak14.png,35.0210,0.0372,0.0201,19.5543 +Kodak,6x6,ldr-rgb-kodak15.png,38.4585,0.0303,0.0130,30.3403 +Kodak,6x6,ldr-rgb-kodak16.png,40.4730,0.0246,0.0087,45.0054 +Kodak,6x6,ldr-rgb-kodak17.png,38.8727,0.0278,0.0100,39.1378 +Kodak,6x6,ldr-rgb-kodak18.png,35.0331,0.0381,0.0198,19.8403 +Kodak,6x6,ldr-rgb-kodak19.png,37.8639,0.0317,0.0139,28.2100 +Kodak,6x6,ldr-rgb-kodak20.png,39.0545,0.0264,0.0107,36.7279 +Kodak,6x6,ldr-rgb-kodak21.png,36.8418,0.0318,0.0153,25.6955 +Kodak,6x6,ldr-rgb-kodak22.png,36.8948,0.0335,0.0155,25.3917 +Kodak,6x6,ldr-rgb-kodak23.png,39.9299,0.0265,0.0096,41.0245 +Kodak,6x6,ldr-rgb-kodak24.png,34.7262,0.0361,0.0182,21.5720 +Kodak,8x8,ldr-rgb-kodak01.png,31.2040,0.0470,0.0291,13.5181 +Kodak,8x8,ldr-rgb-kodak02.png,34.8028,0.0321,0.0139,28.3340 +Kodak,8x8,ldr-rgb-kodak03.png,36.4818,0.0274,0.0106,36.9667 +Kodak,8x8,ldr-rgb-kodak04.png,35.0816,0.0321,0.0136,29.0088 +Kodak,8x8,ldr-rgb-kodak05.png,30.0677,0.0538,0.0352,11.1766 +Kodak,8x8,ldr-rgb-kodak06.png,32.8194,0.0378,0.0205,19.1637 +Kodak,8x8,ldr-rgb-kodak07.png,34.8484,0.0337,0.0154,25.5301 +Kodak,8x8,ldr-rgb-kodak08.png,29.7201,0.0564,0.0369,10.6658 +Kodak,8x8,ldr-rgb-kodak09.png,35.9413,0.0302,0.0118,33.2105 +Kodak,8x8,ldr-rgb-kodak10.png,35.7419,0.0295,0.0110,35.7371 +Kodak,8x8,ldr-rgb-kodak11.png,32.8868,0.0364,0.0189,20.8194 +Kodak,8x8,ldr-rgb-kodak12.png,36.5265,0.0273,0.0104,37.7545 +Kodak,8x8,ldr-rgb-kodak13.png,28.1462,0.0605,0.0418,9.4019 +Kodak,8x8,ldr-rgb-kodak14.png,31.3256,0.0453,0.0272,14.4596 +Kodak,8x8,ldr-rgb-kodak15.png,34.7780,0.0322,0.0139,28.2133 +Kodak,8x8,ldr-rgb-kodak16.png,35.9765,0.0295,0.0128,30.7734 +Kodak,8x8,ldr-rgb-kodak17.png,34.7433,0.0311,0.0125,31.4878 +Kodak,8x8,ldr-rgb-kodak18.png,31.1790,0.0440,0.0245,16.0325 +Kodak,8x8,ldr-rgb-kodak19.png,33.9167,0.0358,0.0169,23.2043 +Kodak,8x8,ldr-rgb-kodak20.png,35.0781,0.0293,0.0124,31.5837 +Kodak,8x8,ldr-rgb-kodak21.png,32.6526,0.0376,0.0200,19.6953 +Kodak,8x8,ldr-rgb-kodak22.png,33.3447,0.0367,0.0176,22.3112 +Kodak,8x8,ldr-rgb-kodak23.png,36.4202,0.0279,0.0099,39.7586 +Kodak,8x8,ldr-rgb-kodak24.png,30.7559,0.0417,0.0227,17.2926 +Kodak,12x12,ldr-rgb-kodak01.png,26.9944,0.0423,0.0230,17.1127 +Kodak,12x12,ldr-rgb-kodak02.png,31.0451,0.0275,0.0079,50.0415 +Kodak,12x12,ldr-rgb-kodak03.png,32.6384,0.0252,0.0070,55.7996 +Kodak,12x12,ldr-rgb-kodak04.png,31.4810,0.0268,0.0067,58.7325 +Kodak,12x12,ldr-rgb-kodak05.png,25.7089,0.0459,0.0259,15.1622 +Kodak,12x12,ldr-rgb-kodak06.png,28.4876,0.0349,0.0165,23.8124 +Kodak,12x12,ldr-rgb-kodak07.png,30.8061,0.0288,0.0091,43.1113 +Kodak,12x12,ldr-rgb-kodak08.png,25.2204,0.0514,0.0306,12.8641 +Kodak,12x12,ldr-rgb-kodak09.png,31.6441,0.0275,0.0079,49.6872 +Kodak,12x12,ldr-rgb-kodak10.png,31.4535,0.0276,0.0077,51.2465 +Kodak,12x12,ldr-rgb-kodak11.png,28.8707,0.0312,0.0125,31.4950 +Kodak,12x12,ldr-rgb-kodak12.png,32.1874,0.0248,0.0068,58.1937 +Kodak,12x12,ldr-rgb-kodak13.png,24.2468,0.0522,0.0321,12.2364 +Kodak,12x12,ldr-rgb-kodak14.png,27.4618,0.0361,0.0173,22.7611 +Kodak,12x12,ldr-rgb-kodak15.png,31.1647,0.0291,0.0096,40.8619 +Kodak,12x12,ldr-rgb-kodak16.png,31.3665,0.0265,0.0085,46.3798 +Kodak,12x12,ldr-rgb-kodak17.png,30.8424,0.0281,0.0082,47.6736 +Kodak,12x12,ldr-rgb-kodak18.png,27.3760,0.0367,0.0162,24.2621 +Kodak,12x12,ldr-rgb-kodak19.png,29.8759,0.0327,0.0127,31.0766 +Kodak,12x12,ldr-rgb-kodak20.png,30.9403,0.0271,0.0093,42.2261 +Kodak,12x12,ldr-rgb-kodak21.png,28.6206,0.0346,0.0160,24.6498 +Kodak,12x12,ldr-rgb-kodak22.png,29.7607,0.0300,0.0099,39.8076 +Kodak,12x12,ldr-rgb-kodak23.png,32.4940,0.0263,0.0071,55.6489 +Kodak,12x12,ldr-rgb-kodak24.png,26.7049,0.0368,0.0169,23.2082 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..2903e31c7bd60c4eb6d36a0ac443f77d8faa9d5d --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3436,0.1044,0.0861,4.5680 +Kodak,4x4,ldr-rgb-kodak02.png,45.5149,0.1557,0.1367,2.8771 +Kodak,4x4,ldr-rgb-kodak03.png,47.7270,0.0807,0.0631,6.2267 +Kodak,4x4,ldr-rgb-kodak04.png,45.5617,0.1226,0.1031,3.8122 +Kodak,4x4,ldr-rgb-kodak05.png,42.2148,0.1364,0.1172,3.3539 +Kodak,4x4,ldr-rgb-kodak06.png,45.2285,0.0994,0.0814,4.8314 +Kodak,4x4,ldr-rgb-kodak07.png,46.0657,0.1003,0.0812,4.8426 +Kodak,4x4,ldr-rgb-kodak08.png,42.5596,0.1448,0.1248,3.1507 +Kodak,4x4,ldr-rgb-kodak09.png,47.2250,0.1202,0.1013,3.8808 +Kodak,4x4,ldr-rgb-kodak10.png,46.9183,0.1217,0.1025,3.8380 +Kodak,4x4,ldr-rgb-kodak11.png,44.9485,0.1205,0.1022,3.8457 +Kodak,4x4,ldr-rgb-kodak12.png,48.0140,0.0909,0.0735,5.3525 +Kodak,4x4,ldr-rgb-kodak13.png,41.6783,0.1125,0.0931,4.2235 +Kodak,4x4,ldr-rgb-kodak14.png,42.7635,0.1267,0.1082,3.6333 +Kodak,4x4,ldr-rgb-kodak15.png,45.6010,0.1083,0.0894,4.3972 +Kodak,4x4,ldr-rgb-kodak16.png,47.9487,0.0910,0.0729,5.3935 +Kodak,4x4,ldr-rgb-kodak17.png,46.3985,0.1033,0.0840,4.6808 +Kodak,4x4,ldr-rgb-kodak18.png,42.0873,0.1566,0.1366,2.8791 +Kodak,4x4,ldr-rgb-kodak19.png,45.4135,0.1237,0.1042,3.7725 +Kodak,4x4,ldr-rgb-kodak20.png,46.9562,0.0796,0.0621,6.3276 +Kodak,4x4,ldr-rgb-kodak21.png,45.2261,0.1259,0.1077,3.6497 +Kodak,4x4,ldr-rgb-kodak22.png,43.8626,0.1593,0.1397,2.8155 +Kodak,4x4,ldr-rgb-kodak23.png,46.9450,0.1253,0.1067,3.6850 +Kodak,4x4,ldr-rgb-kodak24.png,42.4147,0.1221,0.1026,3.8334 +Kodak,5x5,ldr-rgb-kodak01.png,40.1323,0.1157,0.0965,4.0734 +Kodak,5x5,ldr-rgb-kodak02.png,41.7976,0.1333,0.1135,3.4641 +Kodak,5x5,ldr-rgb-kodak03.png,44.1103,0.0655,0.0474,8.3034 +Kodak,5x5,ldr-rgb-kodak04.png,42.1172,0.1029,0.0826,4.7605 +Kodak,5x5,ldr-rgb-kodak05.png,38.0255,0.1383,0.1182,3.3257 +Kodak,5x5,ldr-rgb-kodak06.png,40.9959,0.0936,0.0748,5.2551 +Kodak,5x5,ldr-rgb-kodak07.png,42.5000,0.0847,0.0649,6.0634 +Kodak,5x5,ldr-rgb-kodak08.png,38.3799,0.1443,0.1233,3.1879 +Kodak,5x5,ldr-rgb-kodak09.png,43.8318,0.0751,0.0552,7.1172 +Kodak,5x5,ldr-rgb-kodak10.png,43.4528,0.0825,0.0622,6.3215 +Kodak,5x5,ldr-rgb-kodak11.png,40.8938,0.1085,0.0896,4.3870 +Kodak,5x5,ldr-rgb-kodak12.png,44.4299,0.0664,0.0481,8.1804 +Kodak,5x5,ldr-rgb-kodak13.png,36.9514,0.1161,0.0959,4.0992 +Kodak,5x5,ldr-rgb-kodak14.png,38.7191,0.1246,0.1055,3.7279 +Kodak,5x5,ldr-rgb-kodak15.png,41.9816,0.0979,0.0779,5.0454 +Kodak,5x5,ldr-rgb-kodak16.png,44.1799,0.0698,0.0514,7.6436 +Kodak,5x5,ldr-rgb-kodak17.png,42.5913,0.0726,0.0524,7.5047 +Kodak,5x5,ldr-rgb-kodak18.png,38.4192,0.1311,0.1102,3.5684 +Kodak,5x5,ldr-rgb-kodak19.png,41.6938,0.0910,0.0705,5.5760 +Kodak,5x5,ldr-rgb-kodak20.png,43.0178,0.0683,0.0499,7.8724 +Kodak,5x5,ldr-rgb-kodak21.png,40.7979,0.0941,0.0752,5.2307 +Kodak,5x5,ldr-rgb-kodak22.png,40.3244,0.1278,0.1075,3.6595 +Kodak,5x5,ldr-rgb-kodak23.png,43.6199,0.0896,0.0701,5.6086 +Kodak,5x5,ldr-rgb-kodak24.png,38.2265,0.1083,0.0880,4.4703 +Kodak,6x6,ldr-rgb-kodak01.png,36.2008,0.1199,0.1012,3.8852 +Kodak,6x6,ldr-rgb-kodak02.png,39.0638,0.1078,0.0883,4.4556 +Kodak,6x6,ldr-rgb-kodak03.png,41.3682,0.0569,0.0388,10.1438 +Kodak,6x6,ldr-rgb-kodak04.png,39.4191,0.0911,0.0713,5.5185 +Kodak,6x6,ldr-rgb-kodak05.png,34.8088,0.1362,0.1168,3.3679 +Kodak,6x6,ldr-rgb-kodak06.png,37.6472,0.0866,0.0682,5.7686 +Kodak,6x6,ldr-rgb-kodak07.png,39.8064,0.0760,0.0564,6.9660 +Kodak,6x6,ldr-rgb-kodak08.png,34.9897,0.1433,0.1228,3.2009 +Kodak,6x6,ldr-rgb-kodak09.png,40.8974,0.0604,0.0412,9.5548 +Kodak,6x6,ldr-rgb-kodak10.png,40.5253,0.0638,0.0442,8.8947 +Kodak,6x6,ldr-rgb-kodak11.png,37.6082,0.0953,0.0769,5.1141 +Kodak,6x6,ldr-rgb-kodak12.png,41.5111,0.0550,0.0372,10.5686 +Kodak,6x6,ldr-rgb-kodak13.png,32.9132,0.1287,0.1089,3.6116 +Kodak,6x6,ldr-rgb-kodak14.png,35.8599,0.1205,0.1016,3.8693 +Kodak,6x6,ldr-rgb-kodak15.png,39.2305,0.0901,0.0708,5.5515 +Kodak,6x6,ldr-rgb-kodak16.png,41.0574,0.0604,0.0425,9.2517 +Kodak,6x6,ldr-rgb-kodak17.png,39.5098,0.0638,0.0438,8.9673 +Kodak,6x6,ldr-rgb-kodak18.png,35.3754,0.1199,0.0995,3.9537 +Kodak,6x6,ldr-rgb-kodak19.png,38.5331,0.0826,0.0628,6.2607 +Kodak,6x6,ldr-rgb-kodak20.png,39.7790,0.0629,0.0452,8.6966 +Kodak,6x6,ldr-rgb-kodak21.png,37.2127,0.0843,0.0658,5.9775 +Kodak,6x6,ldr-rgb-kodak22.png,37.4858,0.1094,0.0895,4.3933 +Kodak,6x6,ldr-rgb-kodak23.png,41.0115,0.0682,0.0490,8.0292 +Kodak,6x6,ldr-rgb-kodak24.png,35.0719,0.0988,0.0790,4.9763 +Kodak,8x8,ldr-rgb-kodak01.png,31.8036,0.1636,0.1441,2.7290 +Kodak,8x8,ldr-rgb-kodak02.png,35.8059,0.1101,0.0900,4.3715 +Kodak,8x8,ldr-rgb-kodak03.png,37.7677,0.0698,0.0513,7.6616 +Kodak,8x8,ldr-rgb-kodak04.png,36.1068,0.1011,0.0808,4.8662 +Kodak,8x8,ldr-rgb-kodak05.png,30.7525,0.1792,0.1588,2.4766 +Kodak,8x8,ldr-rgb-kodak06.png,33.4479,0.1116,0.0924,4.2544 +Kodak,8x8,ldr-rgb-kodak07.png,36.1623,0.0923,0.0724,5.4338 +Kodak,8x8,ldr-rgb-kodak08.png,30.5413,0.1823,0.1611,2.4406 +Kodak,8x8,ldr-rgb-kodak09.png,37.2666,0.0716,0.0517,7.6078 +Kodak,8x8,ldr-rgb-kodak10.png,36.9291,0.0730,0.0526,7.4823 +Kodak,8x8,ldr-rgb-kodak11.png,33.6748,0.1142,0.0950,4.1402 +Kodak,8x8,ldr-rgb-kodak12.png,37.8421,0.0683,0.0497,7.9059 +Kodak,8x8,ldr-rgb-kodak13.png,28.3980,0.1767,0.1564,2.5141 +Kodak,8x8,ldr-rgb-kodak14.png,32.1539,0.1534,0.1336,2.9431 +Kodak,8x8,ldr-rgb-kodak15.png,35.8557,0.0934,0.0733,5.3613 +Kodak,8x8,ldr-rgb-kodak16.png,37.0420,0.0767,0.0583,6.7481 +Kodak,8x8,ldr-rgb-kodak17.png,35.6788,0.0783,0.0577,6.8179 +Kodak,8x8,ldr-rgb-kodak18.png,31.5601,0.1406,0.1197,3.2859 +Kodak,8x8,ldr-rgb-kodak19.png,34.7706,0.0994,0.0787,4.9961 +Kodak,8x8,ldr-rgb-kodak20.png,35.9106,0.0781,0.0595,6.6074 +Kodak,8x8,ldr-rgb-kodak21.png,33.1168,0.1075,0.0885,4.4430 +Kodak,8x8,ldr-rgb-kodak22.png,34.0527,0.1220,0.1015,3.8725 +Kodak,8x8,ldr-rgb-kodak23.png,37.6898,0.0718,0.0520,7.5639 +Kodak,8x8,ldr-rgb-kodak24.png,31.1316,0.1197,0.0993,3.9613 +Kodak,12x12,ldr-rgb-kodak01.png,27.7556,0.1754,0.1532,2.5668 +Kodak,12x12,ldr-rgb-kodak02.png,32.4643,0.0846,0.0616,6.3832 +Kodak,12x12,ldr-rgb-kodak03.png,33.8360,0.0626,0.0411,9.5624 +Kodak,12x12,ldr-rgb-kodak04.png,32.4512,0.0738,0.0505,7.7901 +Kodak,12x12,ldr-rgb-kodak05.png,26.3995,0.1918,0.1687,2.3304 +Kodak,12x12,ldr-rgb-kodak06.png,29.3774,0.1137,0.0919,4.2765 +Kodak,12x12,ldr-rgb-kodak07.png,32.0484,0.0899,0.0667,5.8943 +Kodak,12x12,ldr-rgb-kodak08.png,26.0631,0.1981,0.1743,2.2565 +Kodak,12x12,ldr-rgb-kodak09.png,33.1028,0.0668,0.0440,8.9406 +Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0670,0.0437,9.0073 +Kodak,12x12,ldr-rgb-kodak11.png,29.7578,0.1081,0.0862,4.5616 +Kodak,12x12,ldr-rgb-kodak12.png,33.8888,0.0622,0.0406,9.6925 +Kodak,12x12,ldr-rgb-kodak13.png,24.5306,0.1980,0.1749,2.2481 +Kodak,12x12,ldr-rgb-kodak14.png,28.4334,0.1512,0.1290,3.0492 +Kodak,12x12,ldr-rgb-kodak15.png,32.2456,0.0837,0.0609,6.4533 +Kodak,12x12,ldr-rgb-kodak16.png,32.9899,0.0709,0.0495,7.9431 +Kodak,12x12,ldr-rgb-kodak17.png,31.7938,0.0731,0.0499,7.8837 +Kodak,12x12,ldr-rgb-kodak18.png,27.7853,0.1350,0.1110,3.5440 +Kodak,12x12,ldr-rgb-kodak19.png,30.8937,0.0948,0.0714,5.5080 +Kodak,12x12,ldr-rgb-kodak20.png,31.8665,0.0732,0.0521,7.5469 +Kodak,12x12,ldr-rgb-kodak21.png,29.1859,0.1170,0.0949,4.1431 +Kodak,12x12,ldr-rgb-kodak22.png,30.5129,0.1023,0.0789,4.9867 +Kodak,12x12,ldr-rgb-kodak23.png,33.5762,0.0579,0.0353,11.1298 +Kodak,12x12,ldr-rgb-kodak24.png,27.1069,0.1193,0.0959,4.0984 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..24b690657467ea8b6e10740b12ed732c4d8de477 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5393,0.2298,0.2117,1.8573 +Kodak,4x4,ldr-rgb-kodak02.png,45.7829,0.3366,0.3176,1.2383 +Kodak,4x4,ldr-rgb-kodak03.png,48.1286,0.2660,0.2485,1.5827 +Kodak,4x4,ldr-rgb-kodak04.png,45.7459,0.2999,0.2803,1.4029 +Kodak,4x4,ldr-rgb-kodak05.png,42.4808,0.2926,0.2735,1.4378 +Kodak,4x4,ldr-rgb-kodak06.png,45.4283,0.2424,0.2244,1.7523 +Kodak,4x4,ldr-rgb-kodak07.png,46.4346,0.2944,0.2752,1.4290 +Kodak,4x4,ldr-rgb-kodak08.png,42.8524,0.3060,0.2860,1.3747 +Kodak,4x4,ldr-rgb-kodak09.png,47.4868,0.3139,0.2948,1.3338 +Kodak,4x4,ldr-rgb-kodak10.png,47.1520,0.3108,0.2915,1.3491 +Kodak,4x4,ldr-rgb-kodak11.png,45.2020,0.2794,0.2608,1.5078 +Kodak,4x4,ldr-rgb-kodak12.png,48.3163,0.2680,0.2503,1.5708 +Kodak,4x4,ldr-rgb-kodak13.png,41.7858,0.2391,0.2197,1.7896 +Kodak,4x4,ldr-rgb-kodak14.png,43.0205,0.2746,0.2559,1.5365 +Kodak,4x4,ldr-rgb-kodak15.png,45.8894,0.2872,0.2681,1.4666 +Kodak,4x4,ldr-rgb-kodak16.png,48.1595,0.2668,0.2490,1.5789 +Kodak,4x4,ldr-rgb-kodak17.png,46.5669,0.2827,0.2632,1.4940 +Kodak,4x4,ldr-rgb-kodak18.png,42.2513,0.3283,0.3082,1.2758 +Kodak,4x4,ldr-rgb-kodak19.png,45.6248,0.2963,0.2767,1.4213 +Kodak,4x4,ldr-rgb-kodak20.png,47.2126,0.1870,0.1696,2.3179 +Kodak,4x4,ldr-rgb-kodak21.png,45.3757,0.2973,0.2792,1.4082 +Kodak,4x4,ldr-rgb-kodak22.png,44.0484,0.3380,0.3183,1.2354 +Kodak,4x4,ldr-rgb-kodak23.png,47.2672,0.3290,0.3103,1.2673 +Kodak,4x4,ldr-rgb-kodak24.png,42.6395,0.2922,0.2727,1.4420 +Kodak,5x5,ldr-rgb-kodak01.png,40.2439,0.2842,0.2647,1.4854 +Kodak,5x5,ldr-rgb-kodak02.png,42.0748,0.3774,0.3573,1.1006 +Kodak,5x5,ldr-rgb-kodak03.png,44.4104,0.2838,0.2654,1.4815 +Kodak,5x5,ldr-rgb-kodak04.png,42.3039,0.3134,0.2933,1.3409 +Kodak,5x5,ldr-rgb-kodak05.png,38.2196,0.3354,0.3152,1.2474 +Kodak,5x5,ldr-rgb-kodak06.png,41.1196,0.2666,0.2477,1.5874 +Kodak,5x5,ldr-rgb-kodak07.png,42.7728,0.3165,0.2967,1.3254 +Kodak,5x5,ldr-rgb-kodak08.png,38.5537,0.3357,0.3146,1.2499 +Kodak,5x5,ldr-rgb-kodak09.png,44.0572,0.3100,0.2899,1.3564 +Kodak,5x5,ldr-rgb-kodak10.png,43.6371,0.3172,0.2970,1.3238 +Kodak,5x5,ldr-rgb-kodak11.png,41.0491,0.2998,0.2810,1.3991 +Kodak,5x5,ldr-rgb-kodak12.png,44.6371,0.2820,0.2638,1.4907 +Kodak,5x5,ldr-rgb-kodak13.png,36.9965,0.2578,0.2374,1.6564 +Kodak,5x5,ldr-rgb-kodak14.png,38.9373,0.3085,0.2892,1.3595 +Kodak,5x5,ldr-rgb-kodak15.png,42.2057,0.3039,0.2841,1.3842 +Kodak,5x5,ldr-rgb-kodak16.png,44.3209,0.2793,0.2606,1.5087 +Kodak,5x5,ldr-rgb-kodak17.png,42.6878,0.2871,0.2669,1.4731 +Kodak,5x5,ldr-rgb-kodak18.png,38.5091,0.3384,0.3174,1.2388 +Kodak,5x5,ldr-rgb-kodak19.png,41.8288,0.3146,0.2939,1.3379 +Kodak,5x5,ldr-rgb-kodak20.png,43.3334,0.2001,0.1818,2.1634 +Kodak,5x5,ldr-rgb-kodak21.png,40.9050,0.3229,0.3041,1.2932 +Kodak,5x5,ldr-rgb-kodak22.png,40.4714,0.3652,0.3447,1.1406 +Kodak,5x5,ldr-rgb-kodak23.png,43.9456,0.3620,0.3419,1.1501 +Kodak,5x5,ldr-rgb-kodak24.png,38.3490,0.3154,0.2950,1.3330 +Kodak,6x6,ldr-rgb-kodak01.png,36.3168,0.3292,0.3106,1.2662 +Kodak,6x6,ldr-rgb-kodak02.png,39.4281,0.4157,0.3960,0.9929 +Kodak,6x6,ldr-rgb-kodak03.png,41.7707,0.2541,0.2363,1.6641 +Kodak,6x6,ldr-rgb-kodak04.png,39.6843,0.3364,0.3166,1.2420 +Kodak,6x6,ldr-rgb-kodak05.png,35.0088,0.3775,0.3576,1.0996 +Kodak,6x6,ldr-rgb-kodak06.png,37.7698,0.2936,0.2750,1.4297 +Kodak,6x6,ldr-rgb-kodak07.png,40.1464,0.2976,0.2780,1.4144 +Kodak,6x6,ldr-rgb-kodak08.png,35.1763,0.3713,0.3510,1.1204 +Kodak,6x6,ldr-rgb-kodak09.png,41.2785,0.3186,0.2987,1.3162 +Kodak,6x6,ldr-rgb-kodak10.png,40.8522,0.3459,0.3260,1.2064 +Kodak,6x6,ldr-rgb-kodak11.png,37.7933,0.3265,0.3079,1.2770 +Kodak,6x6,ldr-rgb-kodak12.png,41.8544,0.2956,0.2777,1.4161 +Kodak,6x6,ldr-rgb-kodak13.png,32.9617,0.3110,0.2910,1.3511 +Kodak,6x6,ldr-rgb-kodak14.png,36.0569,0.3548,0.3360,1.1704 +Kodak,6x6,ldr-rgb-kodak15.png,39.4918,0.3001,0.2801,1.4036 +Kodak,6x6,ldr-rgb-kodak16.png,41.2543,0.2789,0.2608,1.5077 +Kodak,6x6,ldr-rgb-kodak17.png,39.6918,0.3075,0.2878,1.3661 +Kodak,6x6,ldr-rgb-kodak18.png,35.4609,0.3774,0.3569,1.1019 +Kodak,6x6,ldr-rgb-kodak19.png,38.7173,0.3529,0.3325,1.1825 +Kodak,6x6,ldr-rgb-kodak20.png,40.1243,0.2221,0.2043,1.9247 +Kodak,6x6,ldr-rgb-kodak21.png,37.3603,0.3518,0.3329,1.1812 +Kodak,6x6,ldr-rgb-kodak22.png,37.6556,0.4036,0.3830,1.0266 +Kodak,6x6,ldr-rgb-kodak23.png,41.4655,0.3697,0.3502,1.1228 +Kodak,6x6,ldr-rgb-kodak24.png,35.1889,0.3342,0.3137,1.2536 +Kodak,8x8,ldr-rgb-kodak01.png,31.9131,0.4170,0.3964,0.9920 +Kodak,8x8,ldr-rgb-kodak02.png,36.1767,0.4205,0.3988,0.9859 +Kodak,8x8,ldr-rgb-kodak03.png,38.2083,0.2286,0.2083,1.8877 +Kodak,8x8,ldr-rgb-kodak04.png,36.3928,0.3393,0.3173,1.2394 +Kodak,8x8,ldr-rgb-kodak05.png,30.9201,0.4553,0.4338,0.9064 +Kodak,8x8,ldr-rgb-kodak06.png,33.5817,0.3460,0.3254,1.2085 +Kodak,8x8,ldr-rgb-kodak07.png,36.5160,0.2796,0.2583,1.5226 +Kodak,8x8,ldr-rgb-kodak08.png,30.7384,0.4916,0.4693,0.8379 +Kodak,8x8,ldr-rgb-kodak09.png,37.5615,0.2534,0.2322,1.6934 +Kodak,8x8,ldr-rgb-kodak10.png,37.2421,0.2925,0.2710,1.4512 +Kodak,8x8,ldr-rgb-kodak11.png,33.8416,0.4015,0.3808,1.0327 +Kodak,8x8,ldr-rgb-kodak12.png,38.2751,0.2624,0.2423,1.6227 +Kodak,8x8,ldr-rgb-kodak13.png,28.4619,0.4341,0.4122,0.9539 +Kodak,8x8,ldr-rgb-kodak14.png,32.3307,0.4379,0.4168,0.9434 +Kodak,8x8,ldr-rgb-kodak15.png,36.0804,0.3215,0.3001,1.3103 +Kodak,8x8,ldr-rgb-kodak16.png,37.2806,0.2823,0.2626,1.4975 +Kodak,8x8,ldr-rgb-kodak17.png,35.8778,0.2787,0.2570,1.5298 +Kodak,8x8,ldr-rgb-kodak18.png,31.6559,0.4445,0.4219,0.9321 +Kodak,8x8,ldr-rgb-kodak19.png,34.9339,0.3049,0.2830,1.3893 +Kodak,8x8,ldr-rgb-kodak20.png,36.1622,0.2443,0.2240,1.7553 +Kodak,8x8,ldr-rgb-kodak21.png,33.2290,0.3224,0.3015,1.3041 +Kodak,8x8,ldr-rgb-kodak22.png,34.2355,0.4212,0.3993,0.9848 +Kodak,8x8,ldr-rgb-kodak23.png,38.2086,0.2771,0.2559,1.5365 +Kodak,8x8,ldr-rgb-kodak24.png,31.2397,0.3671,0.3453,1.1388 +Kodak,12x12,ldr-rgb-kodak01.png,27.9145,0.5262,0.5016,0.7839 +Kodak,12x12,ldr-rgb-kodak02.png,33.0098,0.3917,0.3665,1.0729 +Kodak,12x12,ldr-rgb-kodak03.png,34.4588,0.2358,0.2120,1.8552 +Kodak,12x12,ldr-rgb-kodak04.png,32.9763,0.3420,0.3163,1.2431 +Kodak,12x12,ldr-rgb-kodak05.png,26.6072,0.5708,0.5451,0.7213 +Kodak,12x12,ldr-rgb-kodak06.png,29.5340,0.3852,0.3607,1.0900 +Kodak,12x12,ldr-rgb-kodak07.png,32.6336,0.3002,0.2744,1.4328 +Kodak,12x12,ldr-rgb-kodak08.png,26.2642,0.5736,0.5474,0.7183 +Kodak,12x12,ldr-rgb-kodak09.png,33.6341,0.2709,0.2456,1.6009 +Kodak,12x12,ldr-rgb-kodak10.png,32.9911,0.2683,0.2427,1.6203 +Kodak,12x12,ldr-rgb-kodak11.png,30.0562,0.4160,0.3908,1.0061 +Kodak,12x12,ldr-rgb-kodak12.png,34.4444,0.2457,0.2216,1.7742 +Kodak,12x12,ldr-rgb-kodak13.png,24.5875,0.6112,0.5854,0.6717 +Kodak,12x12,ldr-rgb-kodak14.png,28.6495,0.5050,0.4801,0.8190 +Kodak,12x12,ldr-rgb-kodak15.png,32.7427,0.3302,0.3047,1.2905 +Kodak,12x12,ldr-rgb-kodak16.png,33.3405,0.2903,0.2665,1.4758 +Kodak,12x12,ldr-rgb-kodak17.png,32.1386,0.2873,0.2618,1.5019 +Kodak,12x12,ldr-rgb-kodak18.png,27.9275,0.5012,0.4746,0.8286 +Kodak,12x12,ldr-rgb-kodak19.png,31.1080,0.3935,0.3674,1.0702 +Kodak,12x12,ldr-rgb-kodak20.png,32.1759,0.3049,0.2810,1.3993 +Kodak,12x12,ldr-rgb-kodak21.png,29.3270,0.3710,0.3464,1.1352 +Kodak,12x12,ldr-rgb-kodak22.png,30.7891,0.4407,0.4146,0.9485 +Kodak,12x12,ldr-rgb-kodak23.png,34.3878,0.2430,0.2178,1.8055 +Kodak,12x12,ldr-rgb-kodak24.png,27.2398,0.4491,0.4232,0.9291 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..2820df9d5aa99cab5dbfcfc4f51a73ffc21e1f6a --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.9062,0.0321,0.0156,25.2274 +Kodak,4x4,ldr-rgb-kodak02.png,44.3467,0.0400,0.0227,17.3055 +Kodak,4x4,ldr-rgb-kodak03.png,46.8208,0.0286,0.0126,31.1112 +Kodak,4x4,ldr-rgb-kodak04.png,44.7048,0.0377,0.0201,19.5485 +Kodak,4x4,ldr-rgb-kodak05.png,41.6833,0.0476,0.0302,13.0006 +Kodak,4x4,ldr-rgb-kodak06.png,44.8187,0.0317,0.0155,25.4344 +Kodak,4x4,ldr-rgb-kodak07.png,45.1903,0.0341,0.0172,22.8361 +Kodak,4x4,ldr-rgb-kodak08.png,42.1528,0.0497,0.0313,12.5600 +Kodak,4x4,ldr-rgb-kodak09.png,46.3750,0.0287,0.0116,34.0301 +Kodak,4x4,ldr-rgb-kodak10.png,46.1453,0.0297,0.0123,32.0782 +Kodak,4x4,ldr-rgb-kodak11.png,44.3357,0.0352,0.0188,20.9303 +Kodak,4x4,ldr-rgb-kodak12.png,47.1358,0.0269,0.0114,34.5838 +Kodak,4x4,ldr-rgb-kodak13.png,41.5073,0.0435,0.0259,15.1973 +Kodak,4x4,ldr-rgb-kodak14.png,41.9561,0.0421,0.0251,15.6498 +Kodak,4x4,ldr-rgb-kodak15.png,44.7852,0.0391,0.0219,17.9264 +Kodak,4x4,ldr-rgb-kodak16.png,47.3018,0.0256,0.0099,39.6945 +Kodak,4x4,ldr-rgb-kodak17.png,45.8895,0.0284,0.0110,35.6791 +Kodak,4x4,ldr-rgb-kodak18.png,41.7129,0.0482,0.0299,13.1607 +Kodak,4x4,ldr-rgb-kodak19.png,44.8948,0.0327,0.0150,26.2614 +Kodak,4x4,ldr-rgb-kodak20.png,46.4413,0.0288,0.0130,30.2053 +Kodak,4x4,ldr-rgb-kodak21.png,44.6688,0.0326,0.0158,24.8118 +Kodak,4x4,ldr-rgb-kodak22.png,43.2575,0.0431,0.0252,15.5743 +Kodak,4x4,ldr-rgb-kodak23.png,45.6976,0.0322,0.0154,25.5020 +Kodak,4x4,ldr-rgb-kodak24.png,42.0117,0.0421,0.0244,16.1287 +Kodak,5x5,ldr-rgb-kodak01.png,39.6381,0.0318,0.0150,26.1622 +Kodak,5x5,ldr-rgb-kodak02.png,40.6613,0.0317,0.0145,27.0531 +Kodak,5x5,ldr-rgb-kodak03.png,43.1070,0.0258,0.0098,40.0512 +Kodak,5x5,ldr-rgb-kodak04.png,41.3054,0.0311,0.0133,29.5319 +Kodak,5x5,ldr-rgb-kodak05.png,37.4812,0.0436,0.0257,15.2954 +Kodak,5x5,ldr-rgb-kodak06.png,40.6175,0.0288,0.0122,32.1940 +Kodak,5x5,ldr-rgb-kodak07.png,41.5316,0.0302,0.0127,30.9089 +Kodak,5x5,ldr-rgb-kodak08.png,37.7979,0.0445,0.0257,15.3138 +Kodak,5x5,ldr-rgb-kodak09.png,42.9386,0.0263,0.0090,43.6222 +Kodak,5x5,ldr-rgb-kodak10.png,42.6726,0.0265,0.0090,43.4933 +Kodak,5x5,ldr-rgb-kodak11.png,40.3558,0.0305,0.0139,28.3887 +Kodak,5x5,ldr-rgb-kodak12.png,43.4607,0.0244,0.0083,47.4432 +Kodak,5x5,ldr-rgb-kodak13.png,36.8488,0.0395,0.0219,17.9305 +Kodak,5x5,ldr-rgb-kodak14.png,38.0471,0.0403,0.0231,17.0106 +Kodak,5x5,ldr-rgb-kodak15.png,41.2322,0.0313,0.0139,28.2322 +Kodak,5x5,ldr-rgb-kodak16.png,43.5315,0.0234,0.0075,52.1310 +Kodak,5x5,ldr-rgb-kodak17.png,42.1157,0.0264,0.0086,45.9624 +Kodak,5x5,ldr-rgb-kodak18.png,38.1383,0.0381,0.0197,19.9967 +Kodak,5x5,ldr-rgb-kodak19.png,41.1817,0.0287,0.0108,36.4624 +Kodak,5x5,ldr-rgb-kodak20.png,42.3886,0.0254,0.0096,41.1186 +Kodak,5x5,ldr-rgb-kodak21.png,40.4523,0.0298,0.0130,30.2335 +Kodak,5x5,ldr-rgb-kodak22.png,39.8132,0.0335,0.0157,25.1194 +Kodak,5x5,ldr-rgb-kodak23.png,42.5506,0.0274,0.0105,37.5773 +Kodak,5x5,ldr-rgb-kodak24.png,37.9125,0.0361,0.0182,21.6385 +Kodak,6x6,ldr-rgb-kodak01.png,35.7576,0.0388,0.0220,17.8817 +Kodak,6x6,ldr-rgb-kodak02.png,38.1979,0.0325,0.0152,25.9258 +Kodak,6x6,ldr-rgb-kodak03.png,40.5936,0.0255,0.0097,40.3757 +Kodak,6x6,ldr-rgb-kodak04.png,38.5639,0.0316,0.0139,28.2462 +Kodak,6x6,ldr-rgb-kodak05.png,34.3707,0.0488,0.0313,12.5712 +Kodak,6x6,ldr-rgb-kodak06.png,37.3064,0.0314,0.0149,26.3638 +Kodak,6x6,ldr-rgb-kodak07.png,38.8907,0.0308,0.0136,28.8157 +Kodak,6x6,ldr-rgb-kodak08.png,34.4542,0.0496,0.0312,12.6099 +Kodak,6x6,ldr-rgb-kodak09.png,39.9832,0.0275,0.0105,37.6176 +Kodak,6x6,ldr-rgb-kodak10.png,39.7378,0.0275,0.0101,38.9713 +Kodak,6x6,ldr-rgb-kodak11.png,37.1622,0.0328,0.0164,24.0425 +Kodak,6x6,ldr-rgb-kodak12.png,40.7512,0.0244,0.0087,45.1359 +Kodak,6x6,ldr-rgb-kodak13.png,32.8161,0.0498,0.0321,12.2623 +Kodak,6x6,ldr-rgb-kodak14.png,35.3127,0.0440,0.0270,14.5501 +Kodak,6x6,ldr-rgb-kodak15.png,38.5805,0.0319,0.0147,26.6988 +Kodak,6x6,ldr-rgb-kodak16.png,40.5090,0.0243,0.0086,45.6431 +Kodak,6x6,ldr-rgb-kodak17.png,38.9529,0.0279,0.0104,37.8602 +Kodak,6x6,ldr-rgb-kodak18.png,35.1258,0.0406,0.0222,17.7228 +Kodak,6x6,ldr-rgb-kodak19.png,37.9862,0.0323,0.0146,26.8974 +Kodak,6x6,ldr-rgb-kodak20.png,39.1964,0.0272,0.0115,34.2165 +Kodak,6x6,ldr-rgb-kodak21.png,36.9178,0.0330,0.0168,23.4461 +Kodak,6x6,ldr-rgb-kodak22.png,36.9994,0.0351,0.0175,22.5082 +Kodak,6x6,ldr-rgb-kodak23.png,40.0813,0.0271,0.0103,38.0068 +Kodak,6x6,ldr-rgb-kodak24.png,34.8032,0.0380,0.0204,19.2942 +Kodak,8x8,ldr-rgb-kodak01.png,31.3412,0.0501,0.0331,11.8930 +Kodak,8x8,ldr-rgb-kodak02.png,34.9527,0.0325,0.0152,25.8985 +Kodak,8x8,ldr-rgb-kodak03.png,36.6102,0.0276,0.0114,34.5259 +Kodak,8x8,ldr-rgb-kodak04.png,35.1877,0.0329,0.0150,26.2811 +Kodak,8x8,ldr-rgb-kodak05.png,30.2580,0.0580,0.0403,9.7693 +Kodak,8x8,ldr-rgb-kodak06.png,32.9478,0.0394,0.0228,17.2691 +Kodak,8x8,ldr-rgb-kodak07.png,34.9976,0.0343,0.0170,23.1782 +Kodak,8x8,ldr-rgb-kodak08.png,29.9709,0.0601,0.0414,9.5010 +Kodak,8x8,ldr-rgb-kodak09.png,36.1754,0.0299,0.0126,31.2202 +Kodak,8x8,ldr-rgb-kodak10.png,35.8905,0.0294,0.0118,33.4191 +Kodak,8x8,ldr-rgb-kodak11.png,33.0125,0.0377,0.0211,18.6482 +Kodak,8x8,ldr-rgb-kodak12.png,36.7348,0.0271,0.0111,35.5400 +Kodak,8x8,ldr-rgb-kodak13.png,28.2212,0.0659,0.0480,8.1842 +Kodak,8x8,ldr-rgb-kodak14.png,31.5065,0.0493,0.0320,12.2734 +Kodak,8x8,ldr-rgb-kodak15.png,34.9514,0.0330,0.0156,25.1820 +Kodak,8x8,ldr-rgb-kodak16.png,36.0617,0.0297,0.0137,28.6103 +Kodak,8x8,ldr-rgb-kodak17.png,34.9137,0.0310,0.0135,29.0200 +Kodak,8x8,ldr-rgb-kodak18.png,31.2458,0.0465,0.0280,14.0438 +Kodak,8x8,ldr-rgb-kodak19.png,34.2323,0.0364,0.0186,21.1155 +Kodak,8x8,ldr-rgb-kodak20.png,35.2415,0.0296,0.0135,29.1854 +Kodak,8x8,ldr-rgb-kodak21.png,32.7559,0.0392,0.0223,17.6189 +Kodak,8x8,ldr-rgb-kodak22.png,33.4585,0.0381,0.0199,19.7527 +Kodak,8x8,ldr-rgb-kodak23.png,36.5494,0.0277,0.0107,36.8420 +Kodak,8x8,ldr-rgb-kodak24.png,30.8279,0.0435,0.0257,15.3246 +Kodak,12x12,ldr-rgb-kodak01.png,27.1096,0.0471,0.0283,13.8980 +Kodak,12x12,ldr-rgb-kodak02.png,31.1183,0.0278,0.0089,44.3912 +Kodak,12x12,ldr-rgb-kodak03.png,32.6995,0.0255,0.0078,50.3148 +Kodak,12x12,ldr-rgb-kodak04.png,31.5724,0.0268,0.0072,54.6513 +Kodak,12x12,ldr-rgb-kodak05.png,25.8234,0.0517,0.0322,12.2272 +Kodak,12x12,ldr-rgb-kodak06.png,28.6378,0.0382,0.0198,19.8504 +Kodak,12x12,ldr-rgb-kodak07.png,30.8626,0.0295,0.0104,37.7294 +Kodak,12x12,ldr-rgb-kodak08.png,25.4168,0.0578,0.0372,10.5663 +Kodak,12x12,ldr-rgb-kodak09.png,31.8375,0.0279,0.0089,44.4116 +Kodak,12x12,ldr-rgb-kodak10.png,31.5414,0.0276,0.0085,46.3968 +Kodak,12x12,ldr-rgb-kodak11.png,28.9389,0.0330,0.0147,26.7660 +Kodak,12x12,ldr-rgb-kodak12.png,32.2881,0.0250,0.0073,53.7764 +Kodak,12x12,ldr-rgb-kodak13.png,24.3214,0.0597,0.0400,9.8206 +Kodak,12x12,ldr-rgb-kodak14.png,27.5479,0.0395,0.0208,18.9253 +Kodak,12x12,ldr-rgb-kodak15.png,31.2617,0.0300,0.0110,35.8015 +Kodak,12x12,ldr-rgb-kodak16.png,31.4882,0.0270,0.0095,41.4347 +Kodak,12x12,ldr-rgb-kodak17.png,30.9019,0.0287,0.0093,42.1043 +Kodak,12x12,ldr-rgb-kodak18.png,27.4264,0.0398,0.0196,20.0519 +Kodak,12x12,ldr-rgb-kodak19.png,30.1924,0.0343,0.0146,26.9440 +Kodak,12x12,ldr-rgb-kodak20.png,31.0531,0.0281,0.0105,37.6176 +Kodak,12x12,ldr-rgb-kodak21.png,28.7189,0.0375,0.0192,20.4662 +Kodak,12x12,ldr-rgb-kodak22.png,29.8389,0.0309,0.0114,34.5990 +Kodak,12x12,ldr-rgb-kodak23.png,32.5301,0.0265,0.0077,50.9348 +Kodak,12x12,ldr-rgb-kodak24.png,26.7757,0.0397,0.0202,19.4622 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7c82d7e02c6676bc64c7715b7f58ce0f68c96b7c --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.5795,0.0272,0.0113,34.9495 +Kodak,4x4,ldr-rgb-kodak02.png,43.9381,0.0314,0.0150,26.2372 +Kodak,4x4,ldr-rgb-kodak03.png,46.2152,0.0242,0.0090,43.5071 +Kodak,4x4,ldr-rgb-kodak04.png,44.2927,0.0304,0.0135,29.2004 +Kodak,4x4,ldr-rgb-kodak05.png,41.1428,0.0348,0.0181,21.6826 +Kodak,4x4,ldr-rgb-kodak06.png,44.5411,0.0268,0.0112,35.1177 +Kodak,4x4,ldr-rgb-kodak07.png,44.7409,0.0280,0.0115,34.2193 +Kodak,4x4,ldr-rgb-kodak08.png,41.5923,0.0362,0.0186,21.1542 +Kodak,4x4,ldr-rgb-kodak09.png,46.0423,0.0252,0.0087,45.3644 +Kodak,4x4,ldr-rgb-kodak10.png,45.8041,0.0259,0.0090,43.7878 +Kodak,4x4,ldr-rgb-kodak11.png,43.9389,0.0285,0.0126,31.0989 +Kodak,4x4,ldr-rgb-kodak12.png,46.5919,0.0237,0.0086,45.9470 +Kodak,4x4,ldr-rgb-kodak13.png,41.2499,0.0340,0.0172,22.8601 +Kodak,4x4,ldr-rgb-kodak14.png,41.2988,0.0311,0.0150,26.2811 +Kodak,4x4,ldr-rgb-kodak15.png,44.3214,0.0304,0.0140,28.1796 +Kodak,4x4,ldr-rgb-kodak16.png,47.1694,0.0230,0.0081,48.7559 +Kodak,4x4,ldr-rgb-kodak17.png,45.6555,0.0253,0.0085,46.4517 +Kodak,4x4,ldr-rgb-kodak18.png,41.3733,0.0357,0.0180,21.8235 +Kodak,4x4,ldr-rgb-kodak19.png,44.6305,0.0279,0.0109,36.2110 +Kodak,4x4,ldr-rgb-kodak20.png,45.9534,0.0245,0.0093,42.1409 +Kodak,4x4,ldr-rgb-kodak21.png,44.3559,0.0270,0.0113,34.8380 +Kodak,4x4,ldr-rgb-kodak22.png,42.8876,0.0328,0.0158,24.9281 +Kodak,4x4,ldr-rgb-kodak23.png,45.3933,0.0269,0.0108,36.2819 +Kodak,4x4,ldr-rgb-kodak24.png,41.4571,0.0320,0.0149,26.4170 +Kodak,5x5,ldr-rgb-kodak01.png,39.4156,0.0285,0.0124,31.8238 +Kodak,5x5,ldr-rgb-kodak02.png,40.4404,0.0279,0.0113,34.7763 +Kodak,5x5,ldr-rgb-kodak03.png,42.7468,0.0229,0.0078,50.6983 +Kodak,5x5,ldr-rgb-kodak04.png,40.9150,0.0272,0.0105,37.6176 +Kodak,5x5,ldr-rgb-kodak05.png,37.1354,0.0350,0.0179,21.9111 +Kodak,5x5,ldr-rgb-kodak06.png,40.4615,0.0259,0.0102,38.4489 +Kodak,5x5,ldr-rgb-kodak07.png,41.2239,0.0265,0.0100,39.4713 +Kodak,5x5,ldr-rgb-kodak08.png,37.4696,0.0361,0.0184,21.3807 +Kodak,5x5,ldr-rgb-kodak09.png,42.6412,0.0238,0.0075,52.5328 +Kodak,5x5,ldr-rgb-kodak10.png,42.4794,0.0244,0.0076,51.5412 +Kodak,5x5,ldr-rgb-kodak11.png,40.1335,0.0266,0.0108,36.2644 +Kodak,5x5,ldr-rgb-kodak12.png,43.2490,0.0222,0.0071,55.7110 +Kodak,5x5,ldr-rgb-kodak13.png,36.7590,0.0344,0.0175,22.4913 +Kodak,5x5,ldr-rgb-kodak14.png,37.6107,0.0309,0.0149,26.4064 +Kodak,5x5,ldr-rgb-kodak15.png,40.9602,0.0270,0.0105,37.3492 +Kodak,5x5,ldr-rgb-kodak16.png,43.4497,0.0221,0.0068,57.9443 +Kodak,5x5,ldr-rgb-kodak17.png,41.9868,0.0242,0.0074,52.7867 +Kodak,5x5,ldr-rgb-kodak18.png,37.9866,0.0324,0.0147,26.6660 +Kodak,5x5,ldr-rgb-kodak19.png,40.9421,0.0264,0.0093,42.1129 +Kodak,5x5,ldr-rgb-kodak20.png,42.1079,0.0230,0.0079,50.0460 +Kodak,5x5,ldr-rgb-kodak21.png,40.2657,0.0264,0.0107,36.7075 +Kodak,5x5,ldr-rgb-kodak22.png,39.5405,0.0291,0.0120,32.6944 +Kodak,5x5,ldr-rgb-kodak23.png,42.2534,0.0247,0.0086,45.8232 +Kodak,5x5,ldr-rgb-kodak24.png,37.7137,0.0303,0.0133,29.5541 +Kodak,6x6,ldr-rgb-kodak01.png,35.6691,0.0326,0.0168,23.3972 +Kodak,6x6,ldr-rgb-kodak02.png,38.1041,0.0277,0.0113,34.8535 +Kodak,6x6,ldr-rgb-kodak03.png,40.4304,0.0225,0.0075,52.3112 +Kodak,6x6,ldr-rgb-kodak04.png,38.3680,0.0274,0.0107,36.7664 +Kodak,6x6,ldr-rgb-kodak05.png,34.1707,0.0377,0.0209,18.7829 +Kodak,6x6,ldr-rgb-kodak06.png,37.2480,0.0274,0.0119,33.1438 +Kodak,6x6,ldr-rgb-kodak07.png,38.7045,0.0266,0.0102,38.3774 +Kodak,6x6,ldr-rgb-kodak08.png,34.2613,0.0389,0.0215,18.3063 +Kodak,6x6,ldr-rgb-kodak09.png,39.8077,0.0245,0.0082,47.6736 +Kodak,6x6,ldr-rgb-kodak10.png,39.6100,0.0248,0.0081,48.5993 +Kodak,6x6,ldr-rgb-kodak11.png,37.0497,0.0278,0.0121,32.4110 +Kodak,6x6,ldr-rgb-kodak12.png,40.6243,0.0222,0.0071,55.1115 +Kodak,6x6,ldr-rgb-kodak13.png,32.7545,0.0405,0.0235,16.7369 +Kodak,6x6,ldr-rgb-kodak14.png,35.0210,0.0328,0.0167,23.5768 +Kodak,6x6,ldr-rgb-kodak15.png,38.4585,0.0274,0.0108,36.5076 +Kodak,6x6,ldr-rgb-kodak16.png,40.4730,0.0225,0.0074,53.1799 +Kodak,6x6,ldr-rgb-kodak17.png,38.8727,0.0253,0.0084,46.5356 +Kodak,6x6,ldr-rgb-kodak18.png,35.0331,0.0339,0.0165,23.8889 +Kodak,6x6,ldr-rgb-kodak19.png,37.8639,0.0284,0.0116,33.8020 +Kodak,6x6,ldr-rgb-kodak20.png,39.0545,0.0238,0.0090,43.8367 +Kodak,6x6,ldr-rgb-kodak21.png,36.8418,0.0282,0.0127,31.0059 +Kodak,6x6,ldr-rgb-kodak22.png,36.8948,0.0298,0.0129,30.4985 +Kodak,6x6,ldr-rgb-kodak23.png,39.9299,0.0241,0.0082,47.9885 +Kodak,6x6,ldr-rgb-kodak24.png,34.7262,0.0318,0.0150,26.1291 +Kodak,8x8,ldr-rgb-kodak01.png,31.2040,0.0410,0.0242,16.2339 +Kodak,8x8,ldr-rgb-kodak02.png,34.8028,0.0290,0.0118,33.3826 +Kodak,8x8,ldr-rgb-kodak03.png,36.4818,0.0249,0.0090,43.7646 +Kodak,8x8,ldr-rgb-kodak04.png,35.0816,0.0290,0.0114,34.4351 +Kodak,8x8,ldr-rgb-kodak05.png,30.0677,0.0468,0.0291,13.5251 +Kodak,8x8,ldr-rgb-kodak06.png,32.8194,0.0336,0.0171,22.9761 +Kodak,8x8,ldr-rgb-kodak07.png,34.8484,0.0300,0.0129,30.4018 +Kodak,8x8,ldr-rgb-kodak08.png,29.7201,0.0489,0.0304,12.9326 +Kodak,8x8,ldr-rgb-kodak09.png,35.9413,0.0272,0.0100,39.4958 +Kodak,8x8,ldr-rgb-kodak10.png,35.7419,0.0268,0.0094,41.9117 +Kodak,8x8,ldr-rgb-kodak11.png,32.8868,0.0321,0.0159,24.7727 +Kodak,8x8,ldr-rgb-kodak12.png,36.5265,0.0247,0.0089,44.2507 +Kodak,8x8,ldr-rgb-kodak13.png,28.1462,0.0522,0.0345,11.3910 +Kodak,8x8,ldr-rgb-kodak14.png,31.3256,0.0397,0.0228,17.2615 +Kodak,8x8,ldr-rgb-kodak15.png,34.7780,0.0290,0.0118,33.3914 +Kodak,8x8,ldr-rgb-kodak16.png,35.9765,0.0264,0.0107,36.7083 +Kodak,8x8,ldr-rgb-kodak17.png,34.7433,0.0282,0.0105,37.4026 +Kodak,8x8,ldr-rgb-kodak18.png,31.1790,0.0389,0.0205,19.1533 +Kodak,8x8,ldr-rgb-kodak19.png,33.9167,0.0319,0.0142,27.6060 +Kodak,8x8,ldr-rgb-kodak20.png,35.0781,0.0263,0.0105,37.2893 +Kodak,8x8,ldr-rgb-kodak21.png,32.6526,0.0331,0.0168,23.4391 +Kodak,8x8,ldr-rgb-kodak22.png,33.3447,0.0326,0.0149,26.4081 +Kodak,8x8,ldr-rgb-kodak23.png,36.4202,0.0253,0.0085,46.4949 +Kodak,8x8,ldr-rgb-kodak24.png,30.7559,0.0368,0.0191,20.5970 +Kodak,12x12,ldr-rgb-kodak01.png,26.9944,0.0385,0.0204,19.2876 +Kodak,12x12,ldr-rgb-kodak02.png,31.0451,0.0256,0.0070,56.3756 +Kodak,12x12,ldr-rgb-kodak03.png,32.6384,0.0233,0.0063,62.7623 +Kodak,12x12,ldr-rgb-kodak04.png,31.4810,0.0247,0.0060,65.7000 +Kodak,12x12,ldr-rgb-kodak05.png,25.7089,0.0418,0.0230,17.0622 +Kodak,12x12,ldr-rgb-kodak06.png,28.4876,0.0322,0.0147,26.7821 +Kodak,12x12,ldr-rgb-kodak07.png,30.8061,0.0265,0.0081,48.4608 +Kodak,12x12,ldr-rgb-kodak08.png,25.2204,0.0468,0.0271,14.5098 +Kodak,12x12,ldr-rgb-kodak09.png,31.6441,0.0255,0.0071,55.6640 +Kodak,12x12,ldr-rgb-kodak10.png,31.4535,0.0257,0.0069,56.9302 +Kodak,12x12,ldr-rgb-kodak11.png,28.8707,0.0289,0.0111,35.3071 +Kodak,12x12,ldr-rgb-kodak12.png,32.1874,0.0233,0.0061,64.7381 +Kodak,12x12,ldr-rgb-kodak13.png,24.2468,0.0477,0.0285,13.7869 +Kodak,12x12,ldr-rgb-kodak14.png,27.4618,0.0335,0.0154,25.5502 +Kodak,12x12,ldr-rgb-kodak15.png,31.1647,0.0271,0.0085,46.0496 +Kodak,12x12,ldr-rgb-kodak16.png,31.3665,0.0247,0.0076,52.0339 +Kodak,12x12,ldr-rgb-kodak17.png,30.8424,0.0262,0.0073,53.5877 +Kodak,12x12,ldr-rgb-kodak18.png,27.3760,0.0338,0.0144,27.2954 +Kodak,12x12,ldr-rgb-kodak19.png,29.8759,0.0302,0.0112,35.1776 +Kodak,12x12,ldr-rgb-kodak20.png,30.9403,0.0253,0.0083,47.5129 +Kodak,12x12,ldr-rgb-kodak21.png,28.6206,0.0319,0.0141,27.8362 +Kodak,12x12,ldr-rgb-kodak22.png,29.7607,0.0277,0.0088,44.8256 +Kodak,12x12,ldr-rgb-kodak23.png,32.4940,0.0243,0.0063,62.5552 +Kodak,12x12,ldr-rgb-kodak24.png,26.7049,0.0341,0.0151,26.1241 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f6117e651e4adcb6f86fabea4c6342c3e8568bbb --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3436,0.0901,0.0728,5.4000 +Kodak,4x4,ldr-rgb-kodak02.png,45.5149,0.1330,0.1145,3.4333 +Kodak,4x4,ldr-rgb-kodak03.png,47.7270,0.0700,0.0533,7.3787 +Kodak,4x4,ldr-rgb-kodak04.png,45.5617,0.1058,0.0872,4.5082 +Kodak,4x4,ldr-rgb-kodak05.png,42.2148,0.1174,0.0992,3.9636 +Kodak,4x4,ldr-rgb-kodak06.png,45.2285,0.0858,0.0687,5.7208 +Kodak,4x4,ldr-rgb-kodak07.png,46.0657,0.0861,0.0682,5.7657 +Kodak,4x4,ldr-rgb-kodak08.png,42.5596,0.1246,0.1055,3.7262 +Kodak,4x4,ldr-rgb-kodak09.png,47.2250,0.1027,0.0846,4.6468 +Kodak,4x4,ldr-rgb-kodak10.png,46.9183,0.1045,0.0863,4.5559 +Kodak,4x4,ldr-rgb-kodak11.png,44.9485,0.1044,0.0868,4.5309 +Kodak,4x4,ldr-rgb-kodak12.png,48.0140,0.0785,0.0618,6.3678 +Kodak,4x4,ldr-rgb-kodak13.png,41.6783,0.0975,0.0792,4.9653 +Kodak,4x4,ldr-rgb-kodak14.png,42.7635,0.1093,0.0917,4.2876 +Kodak,4x4,ldr-rgb-kodak15.png,45.6010,0.0934,0.0754,5.2153 +Kodak,4x4,ldr-rgb-kodak16.png,47.9487,0.0777,0.0613,6.4129 +Kodak,4x4,ldr-rgb-kodak17.png,46.3985,0.0892,0.0708,5.5530 +Kodak,4x4,ldr-rgb-kodak18.png,42.0873,0.1345,0.1154,3.4077 +Kodak,4x4,ldr-rgb-kodak19.png,45.4135,0.1065,0.0880,4.4706 +Kodak,4x4,ldr-rgb-kodak20.png,46.9562,0.0691,0.0522,7.5352 +Kodak,4x4,ldr-rgb-kodak21.png,45.2261,0.1075,0.0904,4.3520 +Kodak,4x4,ldr-rgb-kodak22.png,43.8626,0.1361,0.1176,3.3436 +Kodak,4x4,ldr-rgb-kodak23.png,46.9450,0.1074,0.0898,4.3788 +Kodak,4x4,ldr-rgb-kodak24.png,42.4147,0.1050,0.0866,4.5392 +Kodak,5x5,ldr-rgb-kodak01.png,40.1323,0.0966,0.0785,5.0096 +Kodak,5x5,ldr-rgb-kodak02.png,41.7976,0.1121,0.0933,4.2136 +Kodak,5x5,ldr-rgb-kodak03.png,44.1103,0.0561,0.0388,10.1295 +Kodak,5x5,ldr-rgb-kodak04.png,42.1172,0.0867,0.0676,5.8142 +Kodak,5x5,ldr-rgb-kodak05.png,38.0255,0.1157,0.0968,4.0611 +Kodak,5x5,ldr-rgb-kodak06.png,40.9959,0.0786,0.0608,6.4688 +Kodak,5x5,ldr-rgb-kodak07.png,42.5000,0.0720,0.0531,7.3992 +Kodak,5x5,ldr-rgb-kodak08.png,38.3799,0.1203,0.1004,3.9175 +Kodak,5x5,ldr-rgb-kodak09.png,43.8318,0.0636,0.0449,8.7668 +Kodak,5x5,ldr-rgb-kodak10.png,43.4528,0.0697,0.0505,7.7818 +Kodak,5x5,ldr-rgb-kodak11.png,40.8938,0.0914,0.0730,5.3884 +Kodak,5x5,ldr-rgb-kodak12.png,44.4299,0.0566,0.0392,10.0361 +Kodak,5x5,ldr-rgb-kodak13.png,36.9514,0.0977,0.0786,5.0019 +Kodak,5x5,ldr-rgb-kodak14.png,38.7191,0.1046,0.0862,4.5616 +Kodak,5x5,ldr-rgb-kodak15.png,41.9816,0.0827,0.0637,6.1715 +Kodak,5x5,ldr-rgb-kodak16.png,44.1799,0.0593,0.0419,9.3837 +Kodak,5x5,ldr-rgb-kodak17.png,42.5913,0.0620,0.0427,9.2071 +Kodak,5x5,ldr-rgb-kodak18.png,38.4192,0.1094,0.0897,4.3841 +Kodak,5x5,ldr-rgb-kodak19.png,41.6938,0.0771,0.0574,6.8507 +Kodak,5x5,ldr-rgb-kodak20.png,43.0178,0.0577,0.0405,9.7073 +Kodak,5x5,ldr-rgb-kodak21.png,40.7979,0.0791,0.0613,6.4168 +Kodak,5x5,ldr-rgb-kodak22.png,40.3244,0.1073,0.0878,4.4767 +Kodak,5x5,ldr-rgb-kodak23.png,43.6199,0.0755,0.0572,6.8792 +Kodak,5x5,ldr-rgb-kodak24.png,38.2265,0.0911,0.0719,5.4684 +Kodak,6x6,ldr-rgb-kodak01.png,36.2008,0.1000,0.0820,4.7967 +Kodak,6x6,ldr-rgb-kodak02.png,39.0638,0.0910,0.0725,5.4252 +Kodak,6x6,ldr-rgb-kodak03.png,41.3682,0.0485,0.0317,12.3926 +Kodak,6x6,ldr-rgb-kodak04.png,39.4191,0.0770,0.0581,6.7716 +Kodak,6x6,ldr-rgb-kodak05.png,34.8088,0.1135,0.0947,4.1519 +Kodak,6x6,ldr-rgb-kodak06.png,37.6472,0.0727,0.0550,7.1491 +Kodak,6x6,ldr-rgb-kodak07.png,39.8064,0.0644,0.0462,8.5196 +Kodak,6x6,ldr-rgb-kodak08.png,34.9897,0.1194,0.1001,3.9288 +Kodak,6x6,ldr-rgb-kodak09.png,40.8974,0.0520,0.0338,11.6368 +Kodak,6x6,ldr-rgb-kodak10.png,40.5253,0.0546,0.0360,10.9193 +Kodak,6x6,ldr-rgb-kodak11.png,37.6082,0.0798,0.0623,6.3119 +Kodak,6x6,ldr-rgb-kodak12.png,41.5111,0.0472,0.0301,13.0529 +Kodak,6x6,ldr-rgb-kodak13.png,32.9132,0.1077,0.0887,4.4330 +Kodak,6x6,ldr-rgb-kodak14.png,35.8599,0.1009,0.0827,4.7544 +Kodak,6x6,ldr-rgb-kodak15.png,39.2305,0.0763,0.0579,6.7968 +Kodak,6x6,ldr-rgb-kodak16.png,41.0574,0.0514,0.0345,11.3959 +Kodak,6x6,ldr-rgb-kodak17.png,39.5098,0.0544,0.0356,11.0504 +Kodak,6x6,ldr-rgb-kodak18.png,35.3754,0.1002,0.0806,4.8809 +Kodak,6x6,ldr-rgb-kodak19.png,38.5331,0.0705,0.0516,7.6183 +Kodak,6x6,ldr-rgb-kodak20.png,39.7790,0.0538,0.0370,10.6263 +Kodak,6x6,ldr-rgb-kodak21.png,37.2127,0.0713,0.0535,7.3437 +Kodak,6x6,ldr-rgb-kodak22.png,37.4858,0.0923,0.0733,5.3630 +Kodak,6x6,ldr-rgb-kodak23.png,41.0115,0.0584,0.0403,9.7522 +Kodak,6x6,ldr-rgb-kodak24.png,35.0719,0.0830,0.0642,6.1275 +Kodak,8x8,ldr-rgb-kodak01.png,31.8036,0.1386,0.1205,3.2636 +Kodak,8x8,ldr-rgb-kodak02.png,35.8059,0.0945,0.0752,5.2321 +Kodak,8x8,ldr-rgb-kodak03.png,37.7677,0.0605,0.0430,9.1541 +Kodak,8x8,ldr-rgb-kodak04.png,36.1068,0.0871,0.0678,5.8038 +Kodak,8x8,ldr-rgb-kodak05.png,30.7525,0.1526,0.1335,2.9464 +Kodak,8x8,ldr-rgb-kodak06.png,33.4479,0.0941,0.0762,5.1636 +Kodak,8x8,ldr-rgb-kodak07.png,36.1623,0.0795,0.0603,6.5175 +Kodak,8x8,ldr-rgb-kodak08.png,30.5413,0.1540,0.1338,2.9383 +Kodak,8x8,ldr-rgb-kodak09.png,37.2666,0.0619,0.0429,9.1680 +Kodak,8x8,ldr-rgb-kodak10.png,36.9291,0.0627,0.0435,9.0357 +Kodak,8x8,ldr-rgb-kodak11.png,33.6748,0.0967,0.0786,5.0024 +Kodak,8x8,ldr-rgb-kodak12.png,37.8421,0.0590,0.0413,9.5184 +Kodak,8x8,ldr-rgb-kodak13.png,28.3980,0.1488,0.1295,3.0356 +Kodak,8x8,ldr-rgb-kodak14.png,32.1539,0.1296,0.1109,3.5465 +Kodak,8x8,ldr-rgb-kodak15.png,35.8557,0.0802,0.0612,6.4286 +Kodak,8x8,ldr-rgb-kodak16.png,37.0420,0.0655,0.0482,8.1592 +Kodak,8x8,ldr-rgb-kodak17.png,35.6788,0.0667,0.0475,8.2845 +Kodak,8x8,ldr-rgb-kodak18.png,31.5601,0.1199,0.0998,3.9409 +Kodak,8x8,ldr-rgb-kodak19.png,34.7706,0.0846,0.0651,6.0426 +Kodak,8x8,ldr-rgb-kodak20.png,35.9106,0.0670,0.0496,7.9298 +Kodak,8x8,ldr-rgb-kodak21.png,33.1168,0.0914,0.0731,5.3759 +Kodak,8x8,ldr-rgb-kodak22.png,34.0527,0.1034,0.0840,4.6803 +Kodak,8x8,ldr-rgb-kodak23.png,37.6898,0.0620,0.0433,9.0775 +Kodak,8x8,ldr-rgb-kodak24.png,31.1316,0.1017,0.0824,4.7749 +Kodak,12x12,ldr-rgb-kodak01.png,27.7556,0.1567,0.1356,2.9005 +Kodak,12x12,ldr-rgb-kodak02.png,32.4643,0.0760,0.0543,7.2404 +Kodak,12x12,ldr-rgb-kodak03.png,33.8360,0.0569,0.0365,10.7733 +Kodak,12x12,ldr-rgb-kodak04.png,32.4512,0.0670,0.0446,8.8118 +Kodak,12x12,ldr-rgb-kodak05.png,26.3995,0.1704,0.1485,2.6484 +Kodak,12x12,ldr-rgb-kodak06.png,29.3774,0.1022,0.0812,4.8401 +Kodak,12x12,ldr-rgb-kodak07.png,32.0484,0.0810,0.0588,6.6859 +Kodak,12x12,ldr-rgb-kodak08.png,26.0631,0.1773,0.1544,2.5471 +Kodak,12x12,ldr-rgb-kodak09.png,33.1028,0.0608,0.0389,10.0998 +Kodak,12x12,ldr-rgb-kodak10.png,32.4884,0.0604,0.0384,10.2406 +Kodak,12x12,ldr-rgb-kodak11.png,29.7578,0.0972,0.0762,5.1571 +Kodak,12x12,ldr-rgb-kodak12.png,33.8888,0.0562,0.0357,11.0250 +Kodak,12x12,ldr-rgb-kodak13.png,24.5306,0.1767,0.1546,2.5427 +Kodak,12x12,ldr-rgb-kodak14.png,28.4334,0.1355,0.1143,3.4410 +Kodak,12x12,ldr-rgb-kodak15.png,32.2456,0.0757,0.0538,7.3095 +Kodak,12x12,ldr-rgb-kodak16.png,32.9899,0.0641,0.0436,9.0102 +Kodak,12x12,ldr-rgb-kodak17.png,31.7938,0.0663,0.0440,8.9276 +Kodak,12x12,ldr-rgb-kodak18.png,27.7853,0.1226,0.0990,3.9733 +Kodak,12x12,ldr-rgb-kodak19.png,30.8937,0.0851,0.0629,6.2518 +Kodak,12x12,ldr-rgb-kodak20.png,31.8665,0.0668,0.0463,8.4910 +Kodak,12x12,ldr-rgb-kodak21.png,29.1859,0.1056,0.0845,4.6526 +Kodak,12x12,ldr-rgb-kodak22.png,30.5129,0.0922,0.0696,5.6488 +Kodak,12x12,ldr-rgb-kodak23.png,33.5762,0.0527,0.0313,12.5809 +Kodak,12x12,ldr-rgb-kodak24.png,27.1069,0.1071,0.0849,4.6322 diff --git a/Test/Images/Kodak/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..500b13625786de2af661707a70f62319823169b4 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5393,0.1981,0.1806,2.1768 +Kodak,4x4,ldr-rgb-kodak02.png,45.7829,0.2881,0.2700,1.4566 +Kodak,4x4,ldr-rgb-kodak03.png,48.1286,0.2259,0.2094,1.8781 +Kodak,4x4,ldr-rgb-kodak04.png,45.7459,0.2548,0.2364,1.6632 +Kodak,4x4,ldr-rgb-kodak05.png,42.4808,0.2561,0.2370,1.6591 +Kodak,4x4,ldr-rgb-kodak06.png,45.4283,0.2067,0.1896,2.0743 +Kodak,4x4,ldr-rgb-kodak07.png,46.4346,0.2507,0.2321,1.6943 +Kodak,4x4,ldr-rgb-kodak08.png,42.8524,0.2607,0.2417,1.6271 +Kodak,4x4,ldr-rgb-kodak09.png,47.4868,0.2682,0.2496,1.5756 +Kodak,4x4,ldr-rgb-kodak10.png,47.1520,0.2637,0.2454,1.6025 +Kodak,4x4,ldr-rgb-kodak11.png,45.2020,0.2374,0.2202,1.7854 +Kodak,4x4,ldr-rgb-kodak12.png,48.3163,0.2296,0.2128,1.8480 +Kodak,4x4,ldr-rgb-kodak13.png,41.7858,0.2050,0.1866,2.1073 +Kodak,4x4,ldr-rgb-kodak14.png,43.0205,0.2337,0.2160,1.8201 +Kodak,4x4,ldr-rgb-kodak15.png,45.8894,0.2444,0.2262,1.7386 +Kodak,4x4,ldr-rgb-kodak16.png,48.1595,0.2256,0.2091,1.8808 +Kodak,4x4,ldr-rgb-kodak17.png,46.5669,0.2406,0.2222,1.7695 +Kodak,4x4,ldr-rgb-kodak18.png,42.2513,0.2792,0.2602,1.5112 +Kodak,4x4,ldr-rgb-kodak19.png,45.6248,0.2529,0.2336,1.6831 +Kodak,4x4,ldr-rgb-kodak20.png,47.2126,0.1597,0.1433,2.7449 +Kodak,4x4,ldr-rgb-kodak21.png,45.3757,0.2526,0.2355,1.6700 +Kodak,4x4,ldr-rgb-kodak22.png,44.0484,0.2880,0.2693,1.4600 +Kodak,4x4,ldr-rgb-kodak23.png,47.2672,0.2795,0.2617,1.5026 +Kodak,4x4,ldr-rgb-kodak24.png,42.6395,0.2501,0.2317,1.6972 +Kodak,5x5,ldr-rgb-kodak01.png,40.2439,0.2369,0.2184,1.8005 +Kodak,5x5,ldr-rgb-kodak02.png,42.0748,0.3161,0.2973,1.3226 +Kodak,5x5,ldr-rgb-kodak03.png,44.4104,0.2367,0.2188,1.7974 +Kodak,5x5,ldr-rgb-kodak04.png,42.3039,0.2605,0.2414,1.6292 +Kodak,5x5,ldr-rgb-kodak05.png,38.2196,0.2795,0.2602,1.5114 +Kodak,5x5,ldr-rgb-kodak06.png,41.1196,0.2216,0.2036,1.9317 +Kodak,5x5,ldr-rgb-kodak07.png,42.7728,0.2630,0.2441,1.6109 +Kodak,5x5,ldr-rgb-kodak08.png,38.5537,0.2773,0.2572,1.5289 +Kodak,5x5,ldr-rgb-kodak09.png,44.0572,0.2572,0.2385,1.6486 +Kodak,5x5,ldr-rgb-kodak10.png,43.6371,0.2637,0.2447,1.6066 +Kodak,5x5,ldr-rgb-kodak11.png,41.0491,0.2500,0.2317,1.6971 +Kodak,5x5,ldr-rgb-kodak12.png,44.6371,0.2353,0.2179,1.8047 +Kodak,5x5,ldr-rgb-kodak13.png,36.9965,0.2156,0.1960,2.0058 +Kodak,5x5,ldr-rgb-kodak14.png,38.9373,0.2578,0.2392,1.6441 +Kodak,5x5,ldr-rgb-kodak15.png,42.2057,0.2520,0.2329,1.6885 +Kodak,5x5,ldr-rgb-kodak16.png,44.3209,0.2327,0.2151,1.8282 +Kodak,5x5,ldr-rgb-kodak17.png,42.6878,0.2396,0.2202,1.7860 +Kodak,5x5,ldr-rgb-kodak18.png,38.5091,0.2814,0.2617,1.5027 +Kodak,5x5,ldr-rgb-kodak19.png,41.8288,0.2608,0.2410,1.6317 +Kodak,5x5,ldr-rgb-kodak20.png,43.3334,0.1680,0.1504,2.6153 +Kodak,5x5,ldr-rgb-kodak21.png,40.9050,0.2689,0.2509,1.5673 +Kodak,5x5,ldr-rgb-kodak22.png,40.4714,0.3017,0.2825,1.3919 +Kodak,5x5,ldr-rgb-kodak23.png,43.9456,0.3024,0.2837,1.3858 +Kodak,5x5,ldr-rgb-kodak24.png,38.3490,0.2650,0.2454,1.6022 +Kodak,6x6,ldr-rgb-kodak01.png,36.3168,0.2737,0.2556,1.5382 +Kodak,6x6,ldr-rgb-kodak02.png,39.4281,0.3488,0.3301,1.1911 +Kodak,6x6,ldr-rgb-kodak03.png,41.7707,0.2116,0.1942,2.0250 +Kodak,6x6,ldr-rgb-kodak04.png,39.6843,0.2797,0.2610,1.5068 +Kodak,6x6,ldr-rgb-kodak05.png,35.0088,0.3137,0.2949,1.3332 +Kodak,6x6,ldr-rgb-kodak06.png,37.7698,0.2443,0.2269,1.7332 +Kodak,6x6,ldr-rgb-kodak07.png,40.1464,0.2450,0.2265,1.7357 +Kodak,6x6,ldr-rgb-kodak08.png,35.1763,0.3106,0.2911,1.3507 +Kodak,6x6,ldr-rgb-kodak09.png,41.2785,0.2651,0.2467,1.5937 +Kodak,6x6,ldr-rgb-kodak10.png,40.8522,0.2872,0.2683,1.4655 +Kodak,6x6,ldr-rgb-kodak11.png,37.7933,0.2712,0.2533,1.5525 +Kodak,6x6,ldr-rgb-kodak12.png,41.8544,0.2438,0.2269,1.7331 +Kodak,6x6,ldr-rgb-kodak13.png,32.9617,0.2597,0.2410,1.6316 +Kodak,6x6,ldr-rgb-kodak14.png,36.0569,0.2959,0.2778,1.4157 +Kodak,6x6,ldr-rgb-kodak15.png,39.4918,0.2497,0.2314,1.6993 +Kodak,6x6,ldr-rgb-kodak16.png,41.2543,0.2301,0.2131,1.8455 +Kodak,6x6,ldr-rgb-kodak17.png,39.6918,0.2579,0.2392,1.6438 +Kodak,6x6,ldr-rgb-kodak18.png,35.4609,0.3166,0.2966,1.3258 +Kodak,6x6,ldr-rgb-kodak19.png,38.7173,0.2959,0.2769,1.4201 +Kodak,6x6,ldr-rgb-kodak20.png,40.1243,0.1862,0.1693,2.3230 +Kodak,6x6,ldr-rgb-kodak21.png,37.3603,0.2918,0.2743,1.4333 +Kodak,6x6,ldr-rgb-kodak22.png,37.6556,0.3368,0.3179,1.2369 +Kodak,6x6,ldr-rgb-kodak23.png,41.4655,0.3095,0.2913,1.3499 +Kodak,6x6,ldr-rgb-kodak24.png,35.1889,0.2771,0.2584,1.5218 +Kodak,8x8,ldr-rgb-kodak01.png,31.9131,0.3554,0.3355,1.1721 +Kodak,8x8,ldr-rgb-kodak02.png,36.1767,0.3591,0.3388,1.1607 +Kodak,8x8,ldr-rgb-kodak03.png,38.2083,0.1927,0.1738,2.2624 +Kodak,8x8,ldr-rgb-kodak04.png,36.3928,0.2898,0.2692,1.4609 +Kodak,8x8,ldr-rgb-kodak05.png,30.9201,0.3850,0.3643,1.0793 +Kodak,8x8,ldr-rgb-kodak06.png,33.5817,0.2939,0.2746,1.4320 +Kodak,8x8,ldr-rgb-kodak07.png,36.5160,0.2393,0.2190,1.7959 +Kodak,8x8,ldr-rgb-kodak08.png,30.7384,0.4190,0.3971,0.9903 +Kodak,8x8,ldr-rgb-kodak09.png,37.5615,0.2149,0.1941,2.0258 +Kodak,8x8,ldr-rgb-kodak10.png,37.2421,0.2466,0.2256,1.7428 +Kodak,8x8,ldr-rgb-kodak11.png,33.8416,0.3435,0.3236,1.2150 +Kodak,8x8,ldr-rgb-kodak12.png,38.2751,0.2230,0.2039,1.9288 +Kodak,8x8,ldr-rgb-kodak13.png,28.4619,0.3689,0.3475,1.1314 +Kodak,8x8,ldr-rgb-kodak14.png,32.3307,0.3717,0.3517,1.1179 +Kodak,8x8,ldr-rgb-kodak15.png,36.0804,0.2746,0.2543,1.5465 +Kodak,8x8,ldr-rgb-kodak16.png,37.2806,0.2390,0.2198,1.7890 +Kodak,8x8,ldr-rgb-kodak17.png,35.8778,0.2361,0.2156,1.8242 +Kodak,8x8,ldr-rgb-kodak18.png,31.6559,0.3798,0.3582,1.0978 +Kodak,8x8,ldr-rgb-kodak19.png,34.9339,0.2578,0.2369,1.6597 +Kodak,8x8,ldr-rgb-kodak20.png,36.1622,0.2061,0.1870,2.1030 +Kodak,8x8,ldr-rgb-kodak21.png,33.2290,0.2725,0.2529,1.5546 +Kodak,8x8,ldr-rgb-kodak22.png,34.2355,0.3549,0.3341,1.1770 +Kodak,8x8,ldr-rgb-kodak23.png,38.2086,0.2362,0.2162,1.8188 +Kodak,8x8,ldr-rgb-kodak24.png,31.2397,0.3135,0.2929,1.3425 +Kodak,12x12,ldr-rgb-kodak01.png,27.9145,0.4694,0.4458,0.8820 +Kodak,12x12,ldr-rgb-kodak02.png,33.0098,0.3500,0.3258,1.2068 +Kodak,12x12,ldr-rgb-kodak03.png,34.4588,0.2098,0.1868,2.1048 +Kodak,12x12,ldr-rgb-kodak04.png,32.9763,0.3061,0.2812,1.3985 +Kodak,12x12,ldr-rgb-kodak05.png,26.6072,0.5078,0.4831,0.8139 +Kodak,12x12,ldr-rgb-kodak06.png,29.5340,0.3430,0.3194,1.2311 +Kodak,12x12,ldr-rgb-kodak07.png,32.6336,0.2670,0.2428,1.6197 +Kodak,12x12,ldr-rgb-kodak08.png,26.2642,0.5100,0.4848,0.8110 +Kodak,12x12,ldr-rgb-kodak09.png,33.6341,0.2413,0.2169,1.8126 +Kodak,12x12,ldr-rgb-kodak10.png,32.9911,0.2399,0.2153,1.8267 +Kodak,12x12,ldr-rgb-kodak11.png,30.0562,0.3696,0.3461,1.1363 +Kodak,12x12,ldr-rgb-kodak12.png,34.4444,0.2193,0.1964,2.0016 +Kodak,12x12,ldr-rgb-kodak13.png,24.5875,0.5441,0.5195,0.7568 +Kodak,12x12,ldr-rgb-kodak14.png,28.6495,0.4497,0.4260,0.9231 +Kodak,12x12,ldr-rgb-kodak15.png,32.7427,0.2943,0.2699,1.4571 +Kodak,12x12,ldr-rgb-kodak16.png,33.3405,0.2597,0.2366,1.6617 +Kodak,12x12,ldr-rgb-kodak17.png,32.1386,0.2559,0.2312,1.7006 +Kodak,12x12,ldr-rgb-kodak18.png,27.9275,0.4466,0.4211,0.9338 +Kodak,12x12,ldr-rgb-kodak19.png,31.1080,0.3509,0.3262,1.2056 +Kodak,12x12,ldr-rgb-kodak20.png,32.1759,0.2725,0.2499,1.5738 +Kodak,12x12,ldr-rgb-kodak21.png,29.3270,0.3296,0.3059,1.2855 +Kodak,12x12,ldr-rgb-kodak22.png,30.7891,0.3921,0.3675,1.0699 +Kodak,12x12,ldr-rgb-kodak23.png,34.3878,0.2166,0.1928,2.0396 +Kodak,12x12,ldr-rgb-kodak24.png,27.2398,0.3997,0.3750,1.0487 diff --git a/Test/Images/Kodak/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/Kodak/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..34b285089c00ba63064640aae5e1aebcb2563560 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.9317,0.0301,0.0140,28.1291 +Kodak,4x4,ldr-rgb-kodak02.png,44.3574,0.0373,0.0205,19.1793 +Kodak,4x4,ldr-rgb-kodak03.png,46.8812,0.0265,0.0112,35.1207 +Kodak,4x4,ldr-rgb-kodak04.png,44.7563,0.0352,0.0182,21.6530 +Kodak,4x4,ldr-rgb-kodak05.png,41.6976,0.0448,0.0277,14.2036 +Kodak,4x4,ldr-rgb-kodak06.png,44.8470,0.0298,0.0137,28.6326 +Kodak,4x4,ldr-rgb-kodak07.png,45.2201,0.0323,0.0155,25.3246 +Kodak,4x4,ldr-rgb-kodak08.png,42.1710,0.0466,0.0286,13.7719 +Kodak,4x4,ldr-rgb-kodak09.png,46.4128,0.0271,0.0103,38.0436 +Kodak,4x4,ldr-rgb-kodak10.png,46.1994,0.0278,0.0108,36.2915 +Kodak,4x4,ldr-rgb-kodak11.png,44.3651,0.0331,0.0170,23.1003 +Kodak,4x4,ldr-rgb-kodak12.png,47.2299,0.0254,0.0100,39.3179 +Kodak,4x4,ldr-rgb-kodak13.png,41.5167,0.0404,0.0234,16.7827 +Kodak,4x4,ldr-rgb-kodak14.png,41.9783,0.0391,0.0227,17.3421 +Kodak,4x4,ldr-rgb-kodak15.png,44.8240,0.0366,0.0197,19.9098 +Kodak,4x4,ldr-rgb-kodak16.png,47.3632,0.0239,0.0086,45.6646 +Kodak,4x4,ldr-rgb-kodak17.png,45.9484,0.0267,0.0097,40.3510 +Kodak,4x4,ldr-rgb-kodak18.png,41.7267,0.0453,0.0273,14.3788 +Kodak,4x4,ldr-rgb-kodak19.png,44.9264,0.0306,0.0134,29.2683 +Kodak,4x4,ldr-rgb-kodak20.png,46.4925,0.0269,0.0117,33.7239 +Kodak,4x4,ldr-rgb-kodak21.png,44.6922,0.0302,0.0142,27.6310 +Kodak,4x4,ldr-rgb-kodak22.png,43.2771,0.0401,0.0228,17.2319 +Kodak,4x4,ldr-rgb-kodak23.png,45.7318,0.0301,0.0138,28.5494 +Kodak,4x4,ldr-rgb-kodak24.png,42.0324,0.0391,0.0220,17.9044 +Kodak,5x5,ldr-rgb-kodak01.png,39.6466,0.0290,0.0126,31.3269 +Kodak,5x5,ldr-rgb-kodak02.png,40.6700,0.0293,0.0123,31.9168 +Kodak,5x5,ldr-rgb-kodak03.png,43.1639,0.0242,0.0085,46.3694 +Kodak,5x5,ldr-rgb-kodak04.png,41.3369,0.0286,0.0113,34.8756 +Kodak,5x5,ldr-rgb-kodak05.png,37.4860,0.0399,0.0221,17.7997 +Kodak,5x5,ldr-rgb-kodak06.png,40.6389,0.0264,0.0104,37.7761 +Kodak,5x5,ldr-rgb-kodak07.png,41.5489,0.0278,0.0108,36.3211 +Kodak,5x5,ldr-rgb-kodak08.png,37.8058,0.0406,0.0223,17.6592 +Kodak,5x5,ldr-rgb-kodak09.png,42.9484,0.0244,0.0076,51.8002 +Kodak,5x5,ldr-rgb-kodak10.png,42.6891,0.0251,0.0077,50.7842 +Kodak,5x5,ldr-rgb-kodak11.png,40.3663,0.0278,0.0119,33.0601 +Kodak,5x5,ldr-rgb-kodak12.png,43.5162,0.0226,0.0071,55.6489 +Kodak,5x5,ldr-rgb-kodak13.png,36.8526,0.0363,0.0189,20.8436 +Kodak,5x5,ldr-rgb-kodak14.png,38.0531,0.0367,0.0199,19.7179 +Kodak,5x5,ldr-rgb-kodak15.png,41.2632,0.0288,0.0120,32.8526 +Kodak,5x5,ldr-rgb-kodak16.png,43.5545,0.0220,0.0063,62.4557 +Kodak,5x5,ldr-rgb-kodak17.png,42.1276,0.0247,0.0072,54.8421 +Kodak,5x5,ldr-rgb-kodak18.png,38.1414,0.0349,0.0168,23.4311 +Kodak,5x5,ldr-rgb-kodak19.png,41.1956,0.0266,0.0090,43.7286 +Kodak,5x5,ldr-rgb-kodak20.png,42.5313,0.0240,0.0082,48.0108 +Kodak,5x5,ldr-rgb-kodak21.png,40.4616,0.0271,0.0109,36.0354 +Kodak,5x5,ldr-rgb-kodak22.png,39.8231,0.0309,0.0134,29.4034 +Kodak,5x5,ldr-rgb-kodak23.png,42.5879,0.0255,0.0088,44.5917 +Kodak,5x5,ldr-rgb-kodak24.png,37.9173,0.0331,0.0157,25.0519 +Kodak,6x6,ldr-rgb-kodak01.png,35.7615,0.0336,0.0176,22.3315 +Kodak,6x6,ldr-rgb-kodak02.png,38.1999,0.0289,0.0125,31.5179 +Kodak,6x6,ldr-rgb-kodak03.png,40.6124,0.0230,0.0079,49.6857 +Kodak,6x6,ldr-rgb-kodak04.png,38.5770,0.0283,0.0113,34.8072 +Kodak,6x6,ldr-rgb-kodak05.png,34.3732,0.0421,0.0254,15.4913 +Kodak,6x6,ldr-rgb-kodak06.png,37.3128,0.0276,0.0120,32.6568 +Kodak,6x6,ldr-rgb-kodak07.png,38.8989,0.0277,0.0111,35.5591 +Kodak,6x6,ldr-rgb-kodak08.png,34.4575,0.0431,0.0252,15.6138 +Kodak,6x6,ldr-rgb-kodak09.png,39.9869,0.0249,0.0083,47.2786 +Kodak,6x6,ldr-rgb-kodak10.png,39.7423,0.0252,0.0082,48.0822 +Kodak,6x6,ldr-rgb-kodak11.png,37.1667,0.0291,0.0134,29.4433 +Kodak,6x6,ldr-rgb-kodak12.png,40.7648,0.0222,0.0071,55.2889 +Kodak,6x6,ldr-rgb-kodak13.png,32.8162,0.0426,0.0259,15.1686 +Kodak,6x6,ldr-rgb-kodak14.png,35.3137,0.0382,0.0220,17.8660 +Kodak,6x6,ldr-rgb-kodak15.png,38.5886,0.0281,0.0118,33.3630 +Kodak,6x6,ldr-rgb-kodak16.png,40.5218,0.0221,0.0070,56.5050 +Kodak,6x6,ldr-rgb-kodak17.png,38.9577,0.0252,0.0083,47.1650 +Kodak,6x6,ldr-rgb-kodak18.png,35.1265,0.0356,0.0181,21.7352 +Kodak,6x6,ldr-rgb-kodak19.png,37.9929,0.0287,0.0115,34.0800 +Kodak,6x6,ldr-rgb-kodak20.png,39.2444,0.0244,0.0093,42.1861 +Kodak,6x6,ldr-rgb-kodak21.png,36.9206,0.0291,0.0135,29.2159 +Kodak,6x6,ldr-rgb-kodak22.png,37.0036,0.0312,0.0141,27.8564 +Kodak,6x6,ldr-rgb-kodak23.png,40.0996,0.0246,0.0084,46.6277 +Kodak,6x6,ldr-rgb-kodak24.png,34.8065,0.0334,0.0165,23.8616 +Kodak,8x8,ldr-rgb-kodak01.png,31.3431,0.0413,0.0250,15.7550 +Kodak,8x8,ldr-rgb-kodak02.png,34.9568,0.0287,0.0118,33.2279 +Kodak,8x8,ldr-rgb-kodak03.png,36.6268,0.0244,0.0089,44.0533 +Kodak,8x8,ldr-rgb-kodak04.png,35.2057,0.0293,0.0117,33.7322 +Kodak,8x8,ldr-rgb-kodak05.png,30.2614,0.0479,0.0307,12.8108 +Kodak,8x8,ldr-rgb-kodak06.png,32.9533,0.0333,0.0174,22.5377 +Kodak,8x8,ldr-rgb-kodak07.png,35.0042,0.0299,0.0133,29.6364 +Kodak,8x8,ldr-rgb-kodak08.png,29.9748,0.0496,0.0314,12.5096 +Kodak,8x8,ldr-rgb-kodak09.png,36.1799,0.0264,0.0097,40.4669 +Kodak,8x8,ldr-rgb-kodak10.png,35.8943,0.0264,0.0092,42.5233 +Kodak,8x8,ldr-rgb-kodak11.png,33.0179,0.0324,0.0164,23.9198 +Kodak,8x8,ldr-rgb-kodak12.png,36.7460,0.0242,0.0086,45.8729 +Kodak,8x8,ldr-rgb-kodak13.png,28.2226,0.0540,0.0369,10.6612 +Kodak,8x8,ldr-rgb-kodak14.png,31.5109,0.0413,0.0248,15.8287 +Kodak,8x8,ldr-rgb-kodak15.png,34.9611,0.0290,0.0121,32.4921 +Kodak,8x8,ldr-rgb-kodak16.png,36.0680,0.0259,0.0106,36.9949 +Kodak,8x8,ldr-rgb-kodak17.png,34.9238,0.0277,0.0105,37.3425 +Kodak,8x8,ldr-rgb-kodak18.png,31.2485,0.0394,0.0217,18.1206 +Kodak,8x8,ldr-rgb-kodak19.png,34.2422,0.0316,0.0144,27.3392 +Kodak,8x8,ldr-rgb-kodak20.png,35.2601,0.0257,0.0105,37.4672 +Kodak,8x8,ldr-rgb-kodak21.png,32.7603,0.0334,0.0173,22.6781 +Kodak,8x8,ldr-rgb-kodak22.png,33.4648,0.0329,0.0155,25.3262 +Kodak,8x8,ldr-rgb-kodak23.png,36.5647,0.0247,0.0084,46.7440 +Kodak,8x8,ldr-rgb-kodak24.png,30.8292,0.0372,0.0199,19.7856 +Kodak,12x12,ldr-rgb-kodak01.png,27.1130,0.0387,0.0209,18.8305 +Kodak,12x12,ldr-rgb-kodak02.png,31.1202,0.0251,0.0067,58.8898 +Kodak,12x12,ldr-rgb-kodak03.png,32.7096,0.0236,0.0060,65.3201 +Kodak,12x12,ldr-rgb-kodak04.png,31.5842,0.0247,0.0057,68.9119 +Kodak,12x12,ldr-rgb-kodak05.png,25.8256,0.0427,0.0240,16.3574 +Kodak,12x12,ldr-rgb-kodak06.png,28.6395,0.0323,0.0148,26.6264 +Kodak,12x12,ldr-rgb-kodak07.png,30.8700,0.0265,0.0079,49.7607 +Kodak,12x12,ldr-rgb-kodak08.png,25.4195,0.0471,0.0274,14.3531 +Kodak,12x12,ldr-rgb-kodak09.png,31.8404,0.0252,0.0067,58.3853 +Kodak,12x12,ldr-rgb-kodak10.png,31.5462,0.0255,0.0065,60.9170 +Kodak,12x12,ldr-rgb-kodak11.png,28.9427,0.0291,0.0111,35.4376 +Kodak,12x12,ldr-rgb-kodak12.png,32.2913,0.0226,0.0057,69.4721 +Kodak,12x12,ldr-rgb-kodak13.png,24.3223,0.0486,0.0300,13.1090 +Kodak,12x12,ldr-rgb-kodak14.png,27.5500,0.0339,0.0157,24.9836 +Kodak,12x12,ldr-rgb-kodak15.png,31.2676,0.0272,0.0084,46.5395 +Kodak,12x12,ldr-rgb-kodak16.png,31.4918,0.0244,0.0072,54.6441 +Kodak,12x12,ldr-rgb-kodak17.png,30.9085,0.0257,0.0071,55.4917 +Kodak,12x12,ldr-rgb-kodak18.png,27.4273,0.0344,0.0148,26.5561 +Kodak,12x12,ldr-rgb-kodak19.png,30.1952,0.0300,0.0108,36.3115 +Kodak,12x12,ldr-rgb-kodak20.png,31.0607,0.0250,0.0079,49.5112 +Kodak,12x12,ldr-rgb-kodak21.png,28.7210,0.0323,0.0144,27.3465 +Kodak,12x12,ldr-rgb-kodak22.png,29.8449,0.0276,0.0087,45.4056 +Kodak,12x12,ldr-rgb-kodak23.png,32.5414,0.0239,0.0059,66.6694 +Kodak,12x12,ldr-rgb-kodak24.png,26.7782,0.0344,0.0153,25.6703 diff --git a/Test/Images/Kodak/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/Kodak/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..add8e6782f503c783b6ded07c04a07036ff69fcd --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,44.6051,0.0257,0.0100,39.4090 +Kodak,4x4,ldr-rgb-kodak02.png,43.9476,0.0294,0.0134,29.3929 +Kodak,4x4,ldr-rgb-kodak03.png,46.2731,0.0229,0.0080,48.9629 +Kodak,4x4,ldr-rgb-kodak04.png,44.3450,0.0287,0.0121,32.5974 +Kodak,4x4,ldr-rgb-kodak05.png,41.1549,0.0326,0.0164,23.9632 +Kodak,4x4,ldr-rgb-kodak06.png,44.5686,0.0253,0.0100,39.3648 +Kodak,4x4,ldr-rgb-kodak07.png,44.7650,0.0266,0.0103,38.1545 +Kodak,4x4,ldr-rgb-kodak08.png,41.6103,0.0339,0.0168,23.3985 +Kodak,4x4,ldr-rgb-kodak09.png,46.0788,0.0242,0.0079,49.9702 +Kodak,4x4,ldr-rgb-kodak10.png,45.8575,0.0245,0.0080,49.2627 +Kodak,4x4,ldr-rgb-kodak11.png,43.9663,0.0266,0.0114,34.5230 +Kodak,4x4,ldr-rgb-kodak12.png,46.6837,0.0222,0.0075,52.5345 +Kodak,4x4,ldr-rgb-kodak13.png,41.2562,0.0320,0.0156,25.1866 +Kodak,4x4,ldr-rgb-kodak14.png,41.3164,0.0290,0.0134,29.4480 +Kodak,4x4,ldr-rgb-kodak15.png,44.3578,0.0287,0.0124,31.6728 +Kodak,4x4,ldr-rgb-kodak16.png,47.2324,0.0217,0.0071,55.2963 +Kodak,4x4,ldr-rgb-kodak17.png,45.7128,0.0241,0.0074,52.8510 +Kodak,4x4,ldr-rgb-kodak18.png,41.3877,0.0336,0.0165,23.8675 +Kodak,4x4,ldr-rgb-kodak19.png,44.6609,0.0264,0.0097,40.7227 +Kodak,4x4,ldr-rgb-kodak20.png,46.0012,0.0231,0.0082,47.8367 +Kodak,4x4,ldr-rgb-kodak21.png,44.3779,0.0253,0.0100,39.2786 +Kodak,4x4,ldr-rgb-kodak22.png,42.9051,0.0307,0.0141,27.8918 +Kodak,4x4,ldr-rgb-kodak23.png,45.4275,0.0253,0.0096,40.7599 +Kodak,4x4,ldr-rgb-kodak24.png,41.4746,0.0301,0.0134,29.2854 +Kodak,5x5,ldr-rgb-kodak01.png,39.4243,0.0259,0.0106,37.1591 +Kodak,5x5,ldr-rgb-kodak02.png,40.4498,0.0258,0.0098,40.3224 +Kodak,5x5,ldr-rgb-kodak03.png,42.7990,0.0214,0.0066,59.5511 +Kodak,5x5,ldr-rgb-kodak04.png,40.9468,0.0255,0.0090,43.8169 +Kodak,5x5,ldr-rgb-kodak05.png,37.1407,0.0316,0.0154,25.5720 +Kodak,5x5,ldr-rgb-kodak06.png,40.4855,0.0238,0.0087,45.3332 +Kodak,5x5,ldr-rgb-kodak07.png,41.2422,0.0245,0.0084,46.8449 +Kodak,5x5,ldr-rgb-kodak08.png,37.4788,0.0332,0.0158,24.9281 +Kodak,5x5,ldr-rgb-kodak09.png,42.6511,0.0235,0.0066,59.7214 +Kodak,5x5,ldr-rgb-kodak10.png,42.4955,0.0233,0.0067,58.7325 +Kodak,5x5,ldr-rgb-kodak11.png,40.1431,0.0243,0.0092,42.9642 +Kodak,5x5,ldr-rgb-kodak12.png,43.3005,0.0208,0.0061,64.4195 +Kodak,5x5,ldr-rgb-kodak13.png,36.7632,0.0317,0.0149,26.3672 +Kodak,5x5,ldr-rgb-kodak14.png,37.6159,0.0284,0.0127,30.8482 +Kodak,5x5,ldr-rgb-kodak15.png,40.9893,0.0249,0.0089,44.0180 +Kodak,5x5,ldr-rgb-kodak16.png,43.4719,0.0206,0.0058,68.1234 +Kodak,5x5,ldr-rgb-kodak17.png,41.9982,0.0229,0.0063,62.6526 +Kodak,5x5,ldr-rgb-kodak18.png,37.9906,0.0297,0.0124,31.7338 +Kodak,5x5,ldr-rgb-kodak19.png,40.9548,0.0246,0.0078,50.6065 +Kodak,5x5,ldr-rgb-kodak20.png,42.2419,0.0216,0.0067,58.3832 +Kodak,5x5,ldr-rgb-kodak21.png,40.2762,0.0242,0.0090,43.7251 +Kodak,5x5,ldr-rgb-kodak22.png,39.5485,0.0267,0.0101,38.9015 +Kodak,5x5,ldr-rgb-kodak23.png,42.2922,0.0229,0.0073,53.7396 +Kodak,5x5,ldr-rgb-kodak24.png,37.7182,0.0281,0.0114,34.5136 +Kodak,6x6,ldr-rgb-kodak01.png,35.6736,0.0285,0.0134,29.3882 +Kodak,6x6,ldr-rgb-kodak02.png,38.1064,0.0249,0.0091,43.3915 +Kodak,6x6,ldr-rgb-kodak03.png,40.4479,0.0205,0.0061,64.4522 +Kodak,6x6,ldr-rgb-kodak04.png,38.3808,0.0247,0.0085,46.1682 +Kodak,6x6,ldr-rgb-kodak05.png,34.1732,0.0330,0.0169,23.2921 +Kodak,6x6,ldr-rgb-kodak06.png,37.2543,0.0244,0.0095,41.4389 +Kodak,6x6,ldr-rgb-kodak07.png,38.7125,0.0241,0.0084,47.0185 +Kodak,6x6,ldr-rgb-kodak08.png,34.2641,0.0347,0.0172,22.7963 +Kodak,6x6,ldr-rgb-kodak09.png,39.8130,0.0224,0.0065,60.4017 +Kodak,6x6,ldr-rgb-kodak10.png,39.6157,0.0227,0.0065,60.3376 +Kodak,6x6,ldr-rgb-kodak11.png,37.0550,0.0246,0.0098,40.0337 +Kodak,6x6,ldr-rgb-kodak12.png,40.6384,0.0202,0.0059,66.4224 +Kodak,6x6,ldr-rgb-kodak13.png,32.7544,0.0350,0.0191,20.6380 +Kodak,6x6,ldr-rgb-kodak14.png,35.0224,0.0288,0.0136,28.9961 +Kodak,6x6,ldr-rgb-kodak15.png,38.4672,0.0245,0.0087,45.0570 +Kodak,6x6,ldr-rgb-kodak16.png,40.4858,0.0203,0.0060,65.1447 +Kodak,6x6,ldr-rgb-kodak17.png,38.8772,0.0233,0.0069,56.8321 +Kodak,6x6,ldr-rgb-kodak18.png,35.0337,0.0299,0.0132,29.7712 +Kodak,6x6,ldr-rgb-kodak19.png,37.8697,0.0254,0.0092,42.8994 +Kodak,6x6,ldr-rgb-kodak20.png,39.1009,0.0213,0.0072,54.8513 +Kodak,6x6,ldr-rgb-kodak21.png,36.8444,0.0251,0.0102,38.3631 +Kodak,6x6,ldr-rgb-kodak22.png,36.8981,0.0267,0.0104,37.8420 +Kodak,6x6,ldr-rgb-kodak23.png,39.9470,0.0219,0.0066,59.2005 +Kodak,6x6,ldr-rgb-kodak24.png,34.7290,0.0284,0.0121,32.5994 +Kodak,8x8,ldr-rgb-kodak01.png,31.2060,0.0345,0.0186,21.1258 +Kodak,8x8,ldr-rgb-kodak02.png,34.8063,0.0261,0.0094,41.7959 +Kodak,8x8,ldr-rgb-kodak03.png,36.4991,0.0226,0.0072,54.8640 +Kodak,8x8,ldr-rgb-kodak04.png,35.0979,0.0261,0.0091,43.4441 +Kodak,8x8,ldr-rgb-kodak05.png,30.0700,0.0396,0.0227,17.2867 +Kodak,8x8,ldr-rgb-kodak06.png,32.8235,0.0292,0.0134,29.2969 +Kodak,8x8,ldr-rgb-kodak07.png,34.8554,0.0270,0.0101,39.0064 +Kodak,8x8,ldr-rgb-kodak08.png,29.7239,0.0414,0.0237,16.5697 +Kodak,8x8,ldr-rgb-kodak09.png,35.9451,0.0246,0.0079,49.7862 +Kodak,8x8,ldr-rgb-kodak10.png,35.7446,0.0245,0.0075,52.3527 +Kodak,8x8,ldr-rgb-kodak11.png,32.8923,0.0284,0.0125,31.5076 +Kodak,8x8,ldr-rgb-kodak12.png,36.5389,0.0222,0.0070,56.4412 +Kodak,8x8,ldr-rgb-kodak13.png,28.1470,0.0439,0.0271,14.5328 +Kodak,8x8,ldr-rgb-kodak14.png,31.3282,0.0340,0.0178,22.0856 +Kodak,8x8,ldr-rgb-kodak15.png,34.7865,0.0257,0.0093,42.4500 +Kodak,8x8,ldr-rgb-kodak16.png,35.9827,0.0235,0.0083,47.2610 +Kodak,8x8,ldr-rgb-kodak17.png,34.7536,0.0256,0.0084,46.5566 +Kodak,8x8,ldr-rgb-kodak18.png,31.1816,0.0338,0.0161,24.4720 +Kodak,8x8,ldr-rgb-kodak19.png,33.9260,0.0285,0.0112,35.2408 +Kodak,8x8,ldr-rgb-kodak20.png,35.0947,0.0236,0.0083,47.2895 +Kodak,8x8,ldr-rgb-kodak21.png,32.6566,0.0291,0.0131,30.1269 +Kodak,8x8,ldr-rgb-kodak22.png,33.3499,0.0289,0.0117,33.6833 +Kodak,8x8,ldr-rgb-kodak23.png,36.4367,0.0231,0.0067,58.4101 +Kodak,8x8,ldr-rgb-kodak24.png,30.7581,0.0321,0.0150,26.1519 +Kodak,12x12,ldr-rgb-kodak01.png,26.9975,0.0325,0.0153,25.7593 +Kodak,12x12,ldr-rgb-kodak02.png,31.0470,0.0234,0.0055,72.1496 +Kodak,12x12,ldr-rgb-kodak03.png,32.6477,0.0213,0.0049,80.8266 +Kodak,12x12,ldr-rgb-kodak04.png,31.4913,0.0231,0.0047,84.0220 +Kodak,12x12,ldr-rgb-kodak05.png,25.7103,0.0358,0.0174,22.5896 +Kodak,12x12,ldr-rgb-kodak06.png,28.4887,0.0280,0.0110,35.6560 +Kodak,12x12,ldr-rgb-kodak07.png,30.8142,0.0246,0.0064,61.8955 +Kodak,12x12,ldr-rgb-kodak08.png,25.2212,0.0393,0.0202,19.4565 +Kodak,12x12,ldr-rgb-kodak09.png,31.6462,0.0232,0.0055,71.4278 +Kodak,12x12,ldr-rgb-kodak10.png,31.4588,0.0239,0.0053,73.7894 +Kodak,12x12,ldr-rgb-kodak11.png,28.8739,0.0254,0.0084,46.6066 +Kodak,12x12,ldr-rgb-kodak12.png,32.1905,0.0214,0.0047,83.1326 +Kodak,12x12,ldr-rgb-kodak13.png,24.2484,0.0398,0.0216,18.1768 +Kodak,12x12,ldr-rgb-kodak14.png,27.4629,0.0291,0.0117,33.6895 +Kodak,12x12,ldr-rgb-kodak15.png,31.1696,0.0244,0.0065,60.9463 +Kodak,12x12,ldr-rgb-kodak16.png,31.3703,0.0223,0.0058,67.8543 +Kodak,12x12,ldr-rgb-kodak17.png,30.8499,0.0240,0.0057,68.3861 +Kodak,12x12,ldr-rgb-kodak18.png,27.3767,0.0300,0.0110,35.8973 +Kodak,12x12,ldr-rgb-kodak19.png,29.8781,0.0268,0.0085,46.4242 +Kodak,12x12,ldr-rgb-kodak20.png,30.9470,0.0228,0.0063,62.2765 +Kodak,12x12,ldr-rgb-kodak21.png,28.6223,0.0279,0.0105,37.3070 +Kodak,12x12,ldr-rgb-kodak22.png,29.7651,0.0252,0.0068,57.6909 +Kodak,12x12,ldr-rgb-kodak23.png,32.5037,0.0223,0.0049,80.3462 +Kodak,12x12,ldr-rgb-kodak24.png,26.7066,0.0300,0.0115,34.1484 diff --git a/Test/Images/Kodak/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/Kodak/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c727ff5785b5176cb17ad85e1c7a874d99730306 --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.3568,0.0833,0.0662,5.9368 +Kodak,4x4,ldr-rgb-kodak02.png,45.5340,0.1203,0.1028,3.8242 +Kodak,4x4,ldr-rgb-kodak03.png,47.7539,0.0634,0.0470,8.3611 +Kodak,4x4,ldr-rgb-kodak04.png,45.5864,0.0972,0.0792,4.9672 +Kodak,4x4,ldr-rgb-kodak05.png,42.2225,0.1078,0.0900,4.3702 +Kodak,4x4,ldr-rgb-kodak06.png,45.2411,0.0787,0.0621,6.3292 +Kodak,4x4,ldr-rgb-kodak07.png,46.0876,0.0786,0.0610,6.4454 +Kodak,4x4,ldr-rgb-kodak08.png,42.5744,0.1142,0.0956,4.1133 +Kodak,4x4,ldr-rgb-kodak09.png,47.2528,0.0922,0.0746,5.2683 +Kodak,4x4,ldr-rgb-kodak10.png,46.9460,0.0941,0.0762,5.1574 +Kodak,4x4,ldr-rgb-kodak11.png,44.9646,0.0947,0.0780,5.0404 +Kodak,4x4,ldr-rgb-kodak12.png,48.0493,0.0711,0.0548,7.1759 +Kodak,4x4,ldr-rgb-kodak13.png,41.6852,0.0898,0.0720,5.4590 +Kodak,4x4,ldr-rgb-kodak14.png,42.7706,0.0991,0.0822,4.7818 +Kodak,4x4,ldr-rgb-kodak15.png,45.6220,0.0845,0.0671,5.8575 +Kodak,4x4,ldr-rgb-kodak16.png,47.9704,0.0701,0.0542,7.2529 +Kodak,4x4,ldr-rgb-kodak17.png,46.4165,0.0809,0.0631,6.2355 +Kodak,4x4,ldr-rgb-kodak18.png,42.0984,0.1230,0.1044,3.7673 +Kodak,4x4,ldr-rgb-kodak19.png,45.4350,0.0974,0.0789,4.9845 +Kodak,4x4,ldr-rgb-kodak20.png,46.9806,0.0626,0.0466,8.4394 +Kodak,4x4,ldr-rgb-kodak21.png,45.2504,0.0974,0.0805,4.8821 +Kodak,4x4,ldr-rgb-kodak22.png,43.8883,0.1239,0.1059,3.7135 +Kodak,4x4,ldr-rgb-kodak23.png,46.9903,0.0960,0.0789,4.9819 +Kodak,4x4,ldr-rgb-kodak24.png,42.4274,0.0956,0.0776,5.0646 +Kodak,5x5,ldr-rgb-kodak01.png,40.1394,0.0843,0.0667,5.8945 +Kodak,5x5,ldr-rgb-kodak02.png,41.8034,0.0964,0.0783,5.0226 +Kodak,5x5,ldr-rgb-kodak03.png,44.1200,0.0494,0.0324,12.1386 +Kodak,5x5,ldr-rgb-kodak04.png,42.1317,0.0759,0.0573,6.8633 +Kodak,5x5,ldr-rgb-kodak05.png,38.0317,0.1002,0.0820,4.7975 +Kodak,5x5,ldr-rgb-kodak06.png,41.0138,0.0687,0.0513,7.6689 +Kodak,5x5,ldr-rgb-kodak07.png,42.5100,0.0631,0.0447,8.7870 +Kodak,5x5,ldr-rgb-kodak08.png,38.3863,0.1047,0.0852,4.6163 +Kodak,5x5,ldr-rgb-kodak09.png,43.8383,0.0558,0.0376,10.4459 +Kodak,5x5,ldr-rgb-kodak10.png,43.4630,0.0612,0.0426,9.2391 +Kodak,5x5,ldr-rgb-kodak11.png,40.9008,0.0793,0.0617,6.3680 +Kodak,5x5,ldr-rgb-kodak12.png,44.4587,0.0495,0.0326,12.0767 +Kodak,5x5,ldr-rgb-kodak13.png,36.9554,0.0853,0.0667,5.8996 +Kodak,5x5,ldr-rgb-kodak14.png,38.7246,0.0902,0.0722,5.4444 +Kodak,5x5,ldr-rgb-kodak15.png,41.9924,0.0719,0.0536,7.3379 +Kodak,5x5,ldr-rgb-kodak16.png,44.1901,0.0519,0.0351,11.1894 +Kodak,5x5,ldr-rgb-kodak17.png,42.5999,0.0544,0.0358,10.9693 +Kodak,5x5,ldr-rgb-kodak18.png,38.4228,0.0954,0.0763,5.1562 +Kodak,5x5,ldr-rgb-kodak19.png,41.7034,0.0675,0.0486,8.0895 +Kodak,5x5,ldr-rgb-kodak20.png,43.1224,0.0503,0.0335,11.7483 +Kodak,5x5,ldr-rgb-kodak21.png,40.8044,0.0689,0.0515,7.6388 +Kodak,5x5,ldr-rgb-kodak22.png,40.3325,0.0933,0.0743,5.2903 +Kodak,5x5,ldr-rgb-kodak23.png,43.6344,0.0658,0.0481,8.1831 +Kodak,5x5,ldr-rgb-kodak24.png,38.2309,0.0796,0.0610,6.4456 +Kodak,6x6,ldr-rgb-kodak01.png,36.2047,0.0830,0.0660,5.9621 +Kodak,6x6,ldr-rgb-kodak02.png,39.0679,0.0765,0.0585,6.7183 +Kodak,6x6,ldr-rgb-kodak03.png,41.3734,0.0417,0.0255,15.4111 +Kodak,6x6,ldr-rgb-kodak04.png,39.4288,0.0653,0.0470,8.3699 +Kodak,6x6,ldr-rgb-kodak05.png,34.8106,0.0942,0.0762,5.1617 +Kodak,6x6,ldr-rgb-kodak06.png,37.6521,0.0607,0.0438,8.9835 +Kodak,6x6,ldr-rgb-kodak07.png,39.8104,0.0547,0.0368,10.6936 +Kodak,6x6,ldr-rgb-kodak08.png,34.9941,0.0992,0.0805,4.8876 +Kodak,6x6,ldr-rgb-kodak09.png,40.9014,0.0446,0.0269,14.6014 +Kodak,6x6,ldr-rgb-kodak10.png,40.5320,0.0468,0.0287,13.6843 +Kodak,6x6,ldr-rgb-kodak11.png,37.6118,0.0672,0.0504,7.8059 +Kodak,6x6,ldr-rgb-kodak12.png,41.5184,0.0404,0.0240,16.3548 +Kodak,6x6,ldr-rgb-kodak13.png,32.9144,0.0891,0.0711,5.5293 +Kodak,6x6,ldr-rgb-kodak14.png,35.8617,0.0838,0.0663,5.9330 +Kodak,6x6,ldr-rgb-kodak15.png,39.2395,0.0644,0.0467,8.4231 +Kodak,6x6,ldr-rgb-kodak16.png,41.0630,0.0436,0.0274,14.3619 +Kodak,6x6,ldr-rgb-kodak17.png,39.5139,0.0464,0.0282,13.9468 +Kodak,6x6,ldr-rgb-kodak18.png,35.3772,0.0837,0.0650,6.0481 +Kodak,6x6,ldr-rgb-kodak19.png,38.5375,0.0593,0.0411,9.5584 +Kodak,6x6,ldr-rgb-kodak20.png,39.8196,0.0455,0.0295,13.3281 +Kodak,6x6,ldr-rgb-kodak21.png,37.2159,0.0598,0.0430,9.1395 +Kodak,6x6,ldr-rgb-kodak22.png,37.4905,0.0775,0.0591,6.6496 +Kodak,6x6,ldr-rgb-kodak23.png,41.0187,0.0495,0.0322,12.1928 +Kodak,6x6,ldr-rgb-kodak24.png,35.0748,0.0697,0.0515,7.6326 +Kodak,8x8,ldr-rgb-kodak01.png,31.8056,0.1093,0.0916,4.2936 +Kodak,8x8,ldr-rgb-kodak02.png,35.8077,0.0761,0.0576,6.8268 +Kodak,8x8,ldr-rgb-kodak03.png,37.7749,0.0494,0.0325,12.0859 +Kodak,8x8,ldr-rgb-kodak04.png,36.1111,0.0702,0.0513,7.6628 +Kodak,8x8,ldr-rgb-kodak05.png,30.7540,0.1191,0.1006,3.9072 +Kodak,8x8,ldr-rgb-kodak06.png,33.4516,0.0751,0.0575,6.8353 +Kodak,8x8,ldr-rgb-kodak07.png,36.1675,0.0638,0.0453,8.6866 +Kodak,8x8,ldr-rgb-kodak08.png,30.5430,0.1216,0.1021,3.8527 +Kodak,8x8,ldr-rgb-kodak09.png,37.2689,0.0508,0.0324,12.1355 +Kodak,8x8,ldr-rgb-kodak10.png,36.9309,0.0517,0.0328,11.9927 +Kodak,8x8,ldr-rgb-kodak11.png,33.6775,0.0775,0.0599,6.5635 +Kodak,8x8,ldr-rgb-kodak12.png,37.8485,0.0480,0.0311,12.6420 +Kodak,8x8,ldr-rgb-kodak13.png,28.3991,0.1176,0.0988,3.9789 +Kodak,8x8,ldr-rgb-kodak14.png,32.1559,0.1022,0.0841,4.6761 +Kodak,8x8,ldr-rgb-kodak15.png,35.8598,0.0650,0.0466,8.4338 +Kodak,8x8,ldr-rgb-kodak16.png,37.0456,0.0532,0.0361,10.8861 +Kodak,8x8,ldr-rgb-kodak17.png,35.6829,0.0544,0.0358,10.9947 +Kodak,8x8,ldr-rgb-kodak18.png,31.5621,0.0954,0.0755,5.2109 +Kodak,8x8,ldr-rgb-kodak19.png,34.7741,0.0688,0.0496,7.9321 +Kodak,8x8,ldr-rgb-kodak20.png,35.9272,0.0548,0.0378,10.4088 +Kodak,8x8,ldr-rgb-kodak21.png,33.1188,0.0730,0.0555,7.0879 +Kodak,8x8,ldr-rgb-kodak22.png,34.0552,0.0825,0.0638,6.1645 +Kodak,8x8,ldr-rgb-kodak23.png,37.6964,0.0510,0.0330,11.9305 +Kodak,8x8,ldr-rgb-kodak24.png,31.1333,0.0815,0.0627,6.2719 +Kodak,12x12,ldr-rgb-kodak01.png,27.7567,0.1223,0.1016,3.8686 +Kodak,12x12,ldr-rgb-kodak02.png,32.4652,0.0614,0.0403,9.7500 +Kodak,12x12,ldr-rgb-kodak03.png,33.8457,0.0466,0.0269,14.6064 +Kodak,12x12,ldr-rgb-kodak04.png,32.4611,0.0545,0.0329,11.9348 +Kodak,12x12,ldr-rgb-kodak05.png,26.4003,0.1338,0.1120,3.5104 +Kodak,12x12,ldr-rgb-kodak06.png,29.3790,0.0803,0.0602,6.5336 +Kodak,12x12,ldr-rgb-kodak07.png,32.0521,0.0651,0.0438,8.9776 +Kodak,12x12,ldr-rgb-kodak08.png,26.0645,0.1385,0.1159,3.3913 +Kodak,12x12,ldr-rgb-kodak09.png,33.1056,0.0498,0.0287,13.7157 +Kodak,12x12,ldr-rgb-kodak10.png,32.4919,0.0499,0.0283,13.8916 +Kodak,12x12,ldr-rgb-kodak11.png,29.7599,0.0771,0.0567,6.9327 +Kodak,12x12,ldr-rgb-kodak12.png,33.8930,0.0459,0.0262,15.0341 +Kodak,12x12,ldr-rgb-kodak13.png,24.5317,0.1379,0.1159,3.3931 +Kodak,12x12,ldr-rgb-kodak14.png,28.4341,0.1068,0.0860,4.5739 +Kodak,12x12,ldr-rgb-kodak15.png,32.2518,0.0614,0.0403,9.7507 +Kodak,12x12,ldr-rgb-kodak16.png,32.9941,0.0516,0.0318,12.3732 +Kodak,12x12,ldr-rgb-kodak17.png,31.7966,0.0539,0.0324,12.1345 +Kodak,12x12,ldr-rgb-kodak18.png,27.7851,0.0956,0.0732,5.3695 +Kodak,12x12,ldr-rgb-kodak19.png,30.8983,0.0680,0.0463,8.4900 +Kodak,12x12,ldr-rgb-kodak20.png,31.8747,0.0539,0.0342,11.4962 +Kodak,12x12,ldr-rgb-kodak21.png,29.1883,0.0834,0.0628,6.2603 +Kodak,12x12,ldr-rgb-kodak22.png,30.5162,0.0739,0.0520,7.5569 +Kodak,12x12,ldr-rgb-kodak23.png,33.5863,0.0440,0.0233,16.8929 +Kodak,12x12,ldr-rgb-kodak24.png,27.1080,0.0850,0.0634,6.1974 diff --git a/Test/Images/Kodak/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/Kodak/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..edc176ed3f0f6110ef1ac25ff759941e2cf7319b --- /dev/null +++ b/Test/Images/Kodak/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,121 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Kodak,4x4,ldr-rgb-kodak01.png,45.5518,0.1780,0.1612,2.4386 +Kodak,4x4,ldr-rgb-kodak02.png,45.8013,0.2555,0.2380,1.6524 +Kodak,4x4,ldr-rgb-kodak03.png,48.1838,0.2035,0.1872,2.1008 +Kodak,4x4,ldr-rgb-kodak04.png,45.7743,0.2323,0.2143,1.8351 +Kodak,4x4,ldr-rgb-kodak05.png,42.4897,0.2247,0.2070,1.8995 +Kodak,4x4,ldr-rgb-kodak06.png,45.4437,0.1857,0.1693,2.3225 +Kodak,4x4,ldr-rgb-kodak07.png,46.4733,0.2256,0.2081,1.8894 +Kodak,4x4,ldr-rgb-kodak08.png,42.8702,0.2349,0.2161,1.8195 +Kodak,4x4,ldr-rgb-kodak09.png,47.5182,0.2395,0.2218,1.7725 +Kodak,4x4,ldr-rgb-kodak10.png,47.1848,0.2370,0.2191,1.7949 +Kodak,4x4,ldr-rgb-kodak11.png,45.2213,0.2136,0.1969,1.9969 +Kodak,4x4,ldr-rgb-kodak12.png,48.3699,0.2060,0.1899,2.0705 +Kodak,4x4,ldr-rgb-kodak13.png,41.7923,0.1845,0.1666,2.3600 +Kodak,4x4,ldr-rgb-kodak14.png,43.0274,0.2090,0.1919,2.0490 +Kodak,4x4,ldr-rgb-kodak15.png,45.9168,0.2203,0.2027,1.9399 +Kodak,4x4,ldr-rgb-kodak16.png,48.1944,0.2022,0.1860,2.1140 +Kodak,4x4,ldr-rgb-kodak17.png,46.5896,0.2171,0.1990,1.9764 +Kodak,4x4,ldr-rgb-kodak18.png,42.2629,0.2519,0.2329,1.6885 +Kodak,4x4,ldr-rgb-kodak19.png,45.6456,0.2287,0.2102,1.8703 +Kodak,4x4,ldr-rgb-kodak20.png,47.2444,0.1443,0.1282,3.0663 +Kodak,4x4,ldr-rgb-kodak21.png,45.4013,0.2266,0.2100,1.8728 +Kodak,4x4,ldr-rgb-kodak22.png,44.0722,0.2583,0.2403,1.6362 +Kodak,4x4,ldr-rgb-kodak23.png,47.3258,0.2517,0.2346,1.6762 +Kodak,4x4,ldr-rgb-kodak24.png,42.6529,0.2228,0.2049,1.9194 +Kodak,5x5,ldr-rgb-kodak01.png,40.2511,0.2050,0.1870,2.1033 +Kodak,5x5,ldr-rgb-kodak02.png,42.0812,0.2711,0.2525,1.5574 +Kodak,5x5,ldr-rgb-kodak03.png,44.4289,0.2035,0.1867,2.1057 +Kodak,5x5,ldr-rgb-kodak04.png,42.3228,0.2250,0.2062,1.9072 +Kodak,5x5,ldr-rgb-kodak05.png,38.2254,0.2404,0.2218,1.7732 +Kodak,5x5,ldr-rgb-kodak06.png,41.1286,0.1901,0.1728,2.2758 +Kodak,5x5,ldr-rgb-kodak07.png,42.7863,0.2267,0.2084,1.8870 +Kodak,5x5,ldr-rgb-kodak08.png,38.5611,0.2391,0.2198,1.7890 +Kodak,5x5,ldr-rgb-kodak09.png,44.0635,0.2206,0.2023,1.9439 +Kodak,5x5,ldr-rgb-kodak10.png,43.6474,0.2268,0.2075,1.8951 +Kodak,5x5,ldr-rgb-kodak11.png,41.0580,0.2151,0.1976,1.9898 +Kodak,5x5,ldr-rgb-kodak12.png,44.6632,0.2024,0.1856,2.1185 +Kodak,5x5,ldr-rgb-kodak13.png,37.0002,0.1863,0.1677,2.3447 +Kodak,5x5,ldr-rgb-kodak14.png,38.9421,0.2201,0.2023,1.9434 +Kodak,5x5,ldr-rgb-kodak15.png,42.2162,0.2173,0.1988,1.9775 +Kodak,5x5,ldr-rgb-kodak16.png,44.3346,0.2001,0.1829,2.1496 +Kodak,5x5,ldr-rgb-kodak17.png,42.6982,0.2063,0.1874,2.0979 +Kodak,5x5,ldr-rgb-kodak18.png,38.5129,0.2415,0.2220,1.7712 +Kodak,5x5,ldr-rgb-kodak19.png,41.8400,0.2248,0.2060,1.9084 +Kodak,5x5,ldr-rgb-kodak20.png,43.3551,0.1433,0.1265,3.1081 +Kodak,5x5,ldr-rgb-kodak21.png,40.9121,0.2288,0.2115,1.8590 +Kodak,5x5,ldr-rgb-kodak22.png,40.4818,0.2612,0.2423,1.6228 +Kodak,5x5,ldr-rgb-kodak23.png,43.9659,0.2596,0.2418,1.6265 +Kodak,5x5,ldr-rgb-kodak24.png,38.3539,0.2272,0.2086,1.8854 +Kodak,6x6,ldr-rgb-kodak01.png,36.3209,0.2240,0.2066,1.9029 +Kodak,6x6,ldr-rgb-kodak02.png,39.4327,0.2850,0.2671,1.4720 +Kodak,6x6,ldr-rgb-kodak03.png,41.7843,0.1721,0.1559,2.5224 +Kodak,6x6,ldr-rgb-kodak04.png,39.6966,0.2305,0.2118,1.8565 +Kodak,6x6,ldr-rgb-kodak05.png,35.0128,0.2557,0.2377,1.6543 +Kodak,6x6,ldr-rgb-kodak06.png,37.7748,0.1983,0.1813,2.1685 +Kodak,6x6,ldr-rgb-kodak07.png,40.1544,0.2020,0.1841,2.1356 +Kodak,6x6,ldr-rgb-kodak08.png,35.1815,0.2535,0.2345,1.6765 +Kodak,6x6,ldr-rgb-kodak09.png,41.2856,0.2166,0.1989,1.9770 +Kodak,6x6,ldr-rgb-kodak10.png,40.8624,0.2339,0.2158,1.8219 +Kodak,6x6,ldr-rgb-kodak11.png,37.7970,0.2215,0.2047,1.9212 +Kodak,6x6,ldr-rgb-kodak12.png,41.8706,0.1995,0.1832,2.1468 +Kodak,6x6,ldr-rgb-kodak13.png,32.9634,0.2122,0.1940,2.0266 +Kodak,6x6,ldr-rgb-kodak14.png,36.0611,0.2399,0.2227,1.7660 +Kodak,6x6,ldr-rgb-kodak15.png,39.5012,0.2036,0.1857,2.1172 +Kodak,6x6,ldr-rgb-kodak16.png,41.2627,0.1875,0.1712,2.2966 +Kodak,6x6,ldr-rgb-kodak17.png,39.6994,0.2083,0.1900,2.0699 +Kodak,6x6,ldr-rgb-kodak18.png,35.4627,0.2574,0.2387,1.6471 +Kodak,6x6,ldr-rgb-kodak19.png,38.7241,0.2411,0.2226,1.7666 +Kodak,6x6,ldr-rgb-kodak20.png,40.1538,0.1500,0.1337,2.9404 +Kodak,6x6,ldr-rgb-kodak21.png,37.3645,0.2398,0.2225,1.7669 +Kodak,6x6,ldr-rgb-kodak22.png,37.6612,0.2765,0.2581,1.5236 +Kodak,6x6,ldr-rgb-kodak23.png,41.4821,0.2508,0.2334,1.6848 +Kodak,6x6,ldr-rgb-kodak24.png,35.1912,0.2260,0.2075,1.8948 +Kodak,8x8,ldr-rgb-kodak01.png,31.9146,0.2733,0.2541,1.5473 +Kodak,8x8,ldr-rgb-kodak02.png,36.1788,0.2764,0.2568,1.5311 +Kodak,8x8,ldr-rgb-kodak03.png,38.2155,0.1498,0.1316,2.9888 +Kodak,8x8,ldr-rgb-kodak04.png,36.3982,0.2245,0.2043,1.9251 +Kodak,8x8,ldr-rgb-kodak05.png,30.9222,0.2986,0.2783,1.4128 +Kodak,8x8,ldr-rgb-kodak06.png,33.5846,0.2267,0.2080,1.8905 +Kodak,8x8,ldr-rgb-kodak07.png,36.5202,0.1840,0.1639,2.3989 +Kodak,8x8,ldr-rgb-kodak08.png,30.7397,0.3247,0.3035,1.2955 +Kodak,8x8,ldr-rgb-kodak09.png,37.5621,0.1659,0.1461,2.6921 +Kodak,8x8,ldr-rgb-kodak10.png,37.2442,0.1899,0.1699,2.3143 +Kodak,8x8,ldr-rgb-kodak11.png,33.8442,0.2649,0.2458,1.6001 +Kodak,8x8,ldr-rgb-kodak12.png,38.2828,0.1718,0.1534,2.5631 +Kodak,8x8,ldr-rgb-kodak13.png,28.4632,0.2876,0.2674,1.4704 +Kodak,8x8,ldr-rgb-kodak14.png,32.3317,0.2869,0.2677,1.4691 +Kodak,8x8,ldr-rgb-kodak15.png,36.0836,0.2126,0.1929,2.0387 +Kodak,8x8,ldr-rgb-kodak16.png,37.2842,0.1847,0.1660,2.3691 +Kodak,8x8,ldr-rgb-kodak17.png,35.8800,0.1825,0.1624,2.4220 +Kodak,8x8,ldr-rgb-kodak18.png,31.6579,0.2942,0.2735,1.4379 +Kodak,8x8,ldr-rgb-kodak19.png,34.9377,0.2006,0.1801,2.1834 +Kodak,8x8,ldr-rgb-kodak20.png,36.1780,0.1604,0.1422,2.7650 +Kodak,8x8,ldr-rgb-kodak21.png,33.2310,0.2109,0.1921,2.0470 +Kodak,8x8,ldr-rgb-kodak22.png,34.2375,0.2764,0.2556,1.5382 +Kodak,8x8,ldr-rgb-kodak23.png,38.2142,0.1825,0.1631,2.4114 +Kodak,8x8,ldr-rgb-kodak24.png,31.2419,0.2438,0.2237,1.7577 +Kodak,12x12,ldr-rgb-kodak01.png,27.9150,0.3592,0.3362,1.1696 +Kodak,12x12,ldr-rgb-kodak02.png,33.0105,0.2696,0.2460,1.5983 +Kodak,12x12,ldr-rgb-kodak03.png,34.4619,0.1619,0.1396,2.8157 +Kodak,12x12,ldr-rgb-kodak04.png,32.9796,0.2339,0.2096,1.8756 +Kodak,12x12,ldr-rgb-kodak05.png,26.6079,0.3892,0.3655,1.0759 +Kodak,12x12,ldr-rgb-kodak06.png,29.5353,0.2637,0.2406,1.6342 +Kodak,12x12,ldr-rgb-kodak07.png,32.6362,0.2057,0.1819,2.1612 +Kodak,12x12,ldr-rgb-kodak08.png,26.2650,0.3937,0.3680,1.0684 +Kodak,12x12,ldr-rgb-kodak09.png,33.6345,0.1850,0.1610,2.4419 +Kodak,12x12,ldr-rgb-kodak10.png,32.9944,0.1832,0.1594,2.4673 +Kodak,12x12,ldr-rgb-kodak11.png,30.0568,0.2842,0.2606,1.5089 +Kodak,12x12,ldr-rgb-kodak12.png,34.4463,0.1681,0.1460,2.6939 +Kodak,12x12,ldr-rgb-kodak13.png,24.5880,0.4208,0.3965,0.9918 +Kodak,12x12,ldr-rgb-kodak14.png,28.6503,0.3452,0.3218,1.2220 +Kodak,12x12,ldr-rgb-kodak15.png,32.7455,0.2269,0.2032,1.9355 +Kodak,12x12,ldr-rgb-kodak16.png,33.3415,0.1988,0.1761,2.2323 +Kodak,12x12,ldr-rgb-kodak17.png,32.1383,0.1969,0.1726,2.2779 +Kodak,12x12,ldr-rgb-kodak18.png,27.9277,0.3428,0.3178,1.2373 +Kodak,12x12,ldr-rgb-kodak19.png,31.1090,0.2691,0.2446,1.6074 +Kodak,12x12,ldr-rgb-kodak20.png,32.1815,0.2088,0.1865,2.1087 +Kodak,12x12,ldr-rgb-kodak21.png,29.3291,0.2546,0.2317,1.6969 +Kodak,12x12,ldr-rgb-kodak22.png,30.7908,0.3030,0.2788,1.4103 +Kodak,12x12,ldr-rgb-kodak23.png,34.3884,0.1669,0.1438,2.7342 +Kodak,12x12,ldr-rgb-kodak24.png,27.2407,0.3073,0.2831,1.3890 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index e4c781dc547030c7b21b162b7f08c8ac831b361c..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.0285,0.9335,0.4855,19.4397 -KodakMnt,5x5,ldr-rgb-montage.png,40.0752,0.8331,0.3832,24.6246 -KodakMnt,6x6,ldr-rgb-montage.png,36.9706,0.8835,0.4352,21.6869 -KodakMnt,8x8,ldr-rgb-montage.png,32.9355,0.9718,0.5221,18.0745 -KodakMnt,12x12,ldr-rgb-montage.png,28.8476,0.7950,0.3383,27.8987 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index bfe76608e14bc24eae03192c681cd51458827269..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,43.5838,0.7789,0.3348,28.1869 -KodakMnt,5x5,ldr-rgb-montage.png,39.7683,0.7431,0.2956,31.9224 -KodakMnt,6x6,ldr-rgb-montage.png,36.8150,0.7529,0.3055,30.8934 -KodakMnt,8x8,ldr-rgb-montage.png,32.7960,0.8211,0.3731,25.2920 -KodakMnt,12x12,ldr-rgb-montage.png,28.7205,0.7095,0.2570,36.7156 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index 181aed0b3d5d4d2c2dfdf3c8c8cc6949ff3b4852..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.6446,2.9943,2.5459,3.7068 -KodakMnt,5x5,ldr-rgb-montage.png,40.6449,2.6102,2.1637,4.3617 -KodakMnt,6x6,ldr-rgb-montage.png,37.4701,2.2729,1.8186,5.1893 -KodakMnt,8x8,ldr-rgb-montage.png,33.5265,2.5586,2.1095,4.4737 -KodakMnt,12x12,ldr-rgb-montage.png,29.5216,2.3645,1.9069,4.9489 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index b2a1c6c1e946c1e23749d6dc42d8bdf7a7ba7529..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.8801,7.8539,7.4086,1.2738 -KodakMnt,5x5,ldr-rgb-montage.png,40.8097,9.0340,8.5810,1.0998 -KodakMnt,6x6,ldr-rgb-montage.png,37.6501,9.7971,9.3483,1.0095 -KodakMnt,8x8,ldr-rgb-montage.png,33.6999,8.9916,8.5375,1.1054 -KodakMnt,12x12,ldr-rgb-montage.png,29.7666,9.0339,8.5698,1.1012 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index 3a48b6a0c5678b965dc4ded6b5dbfa8ff7e8231b..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.0285,1.1007,0.6467,14.5933 -KodakMnt,5x5,ldr-rgb-montage.png,40.0752,0.9750,0.5187,18.1942 -KodakMnt,6x6,ldr-rgb-montage.png,36.9706,1.0866,0.6312,14.9516 -KodakMnt,8x8,ldr-rgb-montage.png,32.9355,1.2433,0.7827,12.0580 -KodakMnt,12x12,ldr-rgb-montage.png,28.8476,0.9715,0.5051,18.6835 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index af21b221c5f62b45a2dac508967f79eafc4a768d..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,43.5838,0.9062,0.4529,20.8360 -KodakMnt,5x5,ldr-rgb-montage.png,39.7683,0.8594,0.4054,23.2783 -KodakMnt,6x6,ldr-rgb-montage.png,36.8150,0.8908,0.4366,21.6174 -KodakMnt,8x8,ldr-rgb-montage.png,32.7960,1.0091,0.5497,17.1667 -KodakMnt,12x12,ldr-rgb-montage.png,28.7205,0.8451,0.3833,24.6179 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index 445840bad15bf039f09abd3e00556881be46b1e7..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.6446,3.9801,3.5268,2.6759 -KodakMnt,5x5,ldr-rgb-montage.png,40.6449,3.6625,3.2025,2.9468 -KodakMnt,6x6,ldr-rgb-montage.png,37.4701,3.2110,2.7550,3.4255 -KodakMnt,8x8,ldr-rgb-montage.png,33.5265,3.7268,3.2672,2.8884 -KodakMnt,12x12,ldr-rgb-montage.png,29.5216,3.4024,2.9362,3.2141 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index 8615a670e442b8716ebc4ecfa324bd15d4354d4c..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.8801,10.5664,10.1061,0.9338 -KodakMnt,5x5,ldr-rgb-montage.png,40.8097,12.9904,12.5321,0.7530 -KodakMnt,6x6,ldr-rgb-montage.png,37.6501,14.4621,14.0009,0.6740 -KodakMnt,8x8,ldr-rgb-montage.png,33.6999,13.7376,13.2725,0.7110 -KodakMnt,12x12,ldr-rgb-montage.png,29.7666,13.6335,13.1601,0.7171 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index dbe5cb1171ccc5ad3432fa26d19ec6f461bb8272..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.0285,1.0270,0.5693,16.5768 -KodakMnt,5x5,ldr-rgb-montage.png,40.0752,0.9151,0.4556,20.7128 -KodakMnt,6x6,ldr-rgb-montage.png,36.9706,1.0055,0.5490,17.1895 -KodakMnt,8x8,ldr-rgb-montage.png,32.9355,1.1473,0.6827,13.8223 -KodakMnt,12x12,ldr-rgb-montage.png,28.8476,0.9152,0.4457,21.1734 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 152b1af8037bdbc137a5799bcdb3421a4cc68d2f..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,43.5838,0.8555,0.3979,23.7169 -KodakMnt,5x5,ldr-rgb-montage.png,39.7683,0.8151,0.3537,26.6832 -KodakMnt,6x6,ldr-rgb-montage.png,36.8150,0.8408,0.3824,24.6811 -KodakMnt,8x8,ldr-rgb-montage.png,32.7960,0.9404,0.4783,19.7320 -KodakMnt,12x12,ldr-rgb-montage.png,28.7205,0.8029,0.3370,27.9999 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 55153c4240539ab5063e3960a0deb104abd01281..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.6446,3.5124,3.0548,3.0893 -KodakMnt,5x5,ldr-rgb-montage.png,40.6449,3.2123,2.7489,3.4331 -KodakMnt,6x6,ldr-rgb-montage.png,37.4701,2.8508,2.3904,3.9480 -KodakMnt,8x8,ldr-rgb-montage.png,33.5265,3.3345,2.8688,3.2896 -KodakMnt,12x12,ldr-rgb-montage.png,29.5216,3.0703,2.5958,3.6356 diff --git a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 2789a56c8e051ab299ecb3d6b6bdf2e090fdb9c8..0000000000000000000000000000000000000000 --- a/Test/Images/KodakMnt/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,6 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakMnt,4x4,ldr-rgb-montage.png,44.8801,9.3070,8.8486,1.0665 -KodakMnt,5x5,ldr-rgb-montage.png,40.8097,11.3270,10.8648,0.8686 -KodakMnt,6x6,ldr-rgb-montage.png,37.6501,12.6749,12.2157,0.7725 -KodakMnt,8x8,ldr-rgb-montage.png,33.6999,12.1330,11.6650,0.8090 -KodakMnt,12x12,ldr-rgb-montage.png,29.7666,12.1249,11.6488,0.8101 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..a054c14b09be7bfd0266390ca470dce6f4a2f358 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1088,0.7492,0.3913,24.1199 +KodakMnt,5x5,ldr-rgb-montage.png,40.1064,0.6363,0.2816,33.5170 +KodakMnt,6x6,ldr-rgb-montage.png,36.9953,0.6636,0.3144,30.0134 +KodakMnt,8x8,ldr-rgb-montage.png,32.9627,0.7208,0.3812,24.7581 +KodakMnt,12x12,ldr-rgb-montage.png,28.8569,0.6145,0.2735,34.5104 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..872a4f8d7bb30cfa5bb8849eb6f366859f720771 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.6871,0.6060,0.2524,37.3882 +KodakMnt,5x5,ldr-rgb-montage.png,39.8465,0.5626,0.2124,44.4356 +KodakMnt,6x6,ldr-rgb-montage.png,36.8575,0.5759,0.2269,41.5867 +KodakMnt,8x8,ldr-rgb-montage.png,32.8170,0.6268,0.2860,32.9973 +KodakMnt,12x12,ldr-rgb-montage.png,28.7278,0.5429,0.2030,46.4911 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f5b6769873bfc746405b25b2d4c98d5a234a9797 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.6971,2.1278,1.7712,5.3281 +KodakMnt,5x5,ldr-rgb-montage.png,40.6736,1.6961,1.3345,7.0716 +KodakMnt,6x6,ldr-rgb-montage.png,37.4854,1.4762,1.1263,8.3787 +KodakMnt,8x8,ldr-rgb-montage.png,33.5323,1.7128,1.3675,6.9010 +KodakMnt,12x12,ldr-rgb-montage.png,29.5339,1.6556,1.3104,7.2019 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..61967046af0cce8f275d17f31bcf33badb5984bf --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9209,5.1230,4.7595,1.9828 +KodakMnt,5x5,ldr-rgb-montage.png,40.8363,5.1785,4.8236,1.9565 +KodakMnt,6x6,ldr-rgb-montage.png,37.6703,5.3110,4.9623,1.9018 +KodakMnt,8x8,ldr-rgb-montage.png,33.7079,5.3417,4.9972,1.8885 +KodakMnt,12x12,ldr-rgb-montage.png,29.7759,6.0849,5.7325,1.6463 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..690cabd10b0a33d83608e1f56a98c45f3553cde3 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1088,0.9150,0.5310,17.7737 +KodakMnt,5x5,ldr-rgb-montage.png,40.1064,0.7844,0.4043,23.3446 +KodakMnt,6x6,ldr-rgb-montage.png,36.9953,0.8556,0.4756,19.8411 +KodakMnt,8x8,ldr-rgb-montage.png,32.9627,0.9729,0.5970,15.8080 +KodakMnt,12x12,ldr-rgb-montage.png,28.8569,0.7912,0.4165,22.6597 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..049b48df6508b0675a4df0df1fc1b46eaf186c80 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.6871,0.7278,0.3456,27.3082 +KodakMnt,5x5,ldr-rgb-montage.png,39.8465,0.6854,0.3070,30.7383 +KodakMnt,6x6,ldr-rgb-montage.png,36.8575,0.7255,0.3485,27.0786 +KodakMnt,8x8,ldr-rgb-montage.png,32.8170,0.8186,0.4438,21.2624 +KodakMnt,12x12,ldr-rgb-montage.png,28.7278,0.6814,0.3088,30.5579 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..4a1c846095741181060a66c1fd75615e3f8590d4 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.6971,2.7703,2.3831,3.9601 +KodakMnt,5x5,ldr-rgb-montage.png,40.6736,2.3406,1.9568,4.8228 +KodakMnt,6x6,ldr-rgb-montage.png,37.4854,2.1096,1.7288,5.4590 +KodakMnt,8x8,ldr-rgb-montage.png,33.5323,2.5367,2.1572,4.3747 +KodakMnt,12x12,ldr-rgb-montage.png,29.5339,2.3587,1.9815,4.7626 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..095e3947ddac897f1b073d1949c93dc759aa67c2 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9209,6.7892,6.3960,1.4755 +KodakMnt,5x5,ldr-rgb-montage.png,40.8363,7.3507,6.9659,1.3548 +KodakMnt,6x6,ldr-rgb-montage.png,37.6703,7.8500,7.4645,1.2643 +KodakMnt,8x8,ldr-rgb-montage.png,33.7079,8.1896,7.8091,1.2085 +KodakMnt,12x12,ldr-rgb-montage.png,29.7759,8.9393,8.5576,1.1028 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..79b756f41617665fa28436c406a32ba1411210c2 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1088,0.8074,0.4414,21.3794 +KodakMnt,5x5,ldr-rgb-montage.png,40.1064,0.6932,0.3336,28.2905 +KodakMnt,6x6,ldr-rgb-montage.png,36.9953,0.7506,0.3927,24.0288 +KodakMnt,8x8,ldr-rgb-montage.png,32.9627,0.8479,0.4965,19.0071 +KodakMnt,12x12,ldr-rgb-montage.png,28.8569,0.7135,0.3632,25.9847 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..b8bc4a6229af54318b896303c70ce70e9023c971 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.6871,0.6524,0.2881,32.7583 +KodakMnt,5x5,ldr-rgb-montage.png,39.8465,0.6126,0.2544,37.0990 +KodakMnt,6x6,ldr-rgb-montage.png,36.8575,0.6433,0.2864,32.9490 +KodakMnt,8x8,ldr-rgb-montage.png,32.8170,0.7196,0.3676,25.6695 +KodakMnt,12x12,ldr-rgb-montage.png,28.7278,0.6178,0.2685,35.1413 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c70c12517e6186c28a0347df289afb8c8f857e88 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.6971,2.3669,2.0030,4.7116 +KodakMnt,5x5,ldr-rgb-montage.png,40.6736,1.9526,1.5888,5.9399 +KodakMnt,6x6,ldr-rgb-montage.png,37.4854,1.7613,1.4025,6.7291 +KodakMnt,8x8,ldr-rgb-montage.png,33.5323,2.1315,1.7767,5.3118 +KodakMnt,12x12,ldr-rgb-montage.png,29.5339,2.0881,1.7341,5.4422 diff --git a/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..83c35dadae022bc1978ac20f990cb6fbf9ee719f --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9209,5.7868,5.4183,1.7417 +KodakMnt,5x5,ldr-rgb-montage.png,40.8363,6.0576,5.6935,1.6575 +KodakMnt,6x6,ldr-rgb-montage.png,37.6703,6.4909,6.1316,1.5391 +KodakMnt,8x8,ldr-rgb-montage.png,33.7079,6.8737,6.5195,1.4475 +KodakMnt,12x12,ldr-rgb-montage.png,29.7759,7.8753,7.5220,1.2546 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..a582a91cf897b46487da98db55ce01677790cb5c --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1408,0.7398,0.3868,24.4008 +KodakMnt,5x5,ldr-rgb-montage.png,40.1365,0.6282,0.2765,34.1283 +KodakMnt,6x6,ldr-rgb-montage.png,37.0049,0.6606,0.3121,30.2362 +KodakMnt,8x8,ldr-rgb-montage.png,32.9679,0.7198,0.3794,24.8739 +KodakMnt,12x12,ldr-rgb-montage.png,28.8597,0.6094,0.2725,34.6277 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f5e83bcbc9d47773e2c7dbc7aeab9d6496809e36 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.7231,0.6040,0.2505,37.6762 +KodakMnt,5x5,ldr-rgb-montage.png,39.8789,0.5572,0.2085,45.2555 +KodakMnt,6x6,ldr-rgb-montage.png,36.8681,0.5724,0.2262,41.7170 +KodakMnt,8x8,ldr-rgb-montage.png,32.8239,0.6238,0.2851,33.0956 +KodakMnt,12x12,ldr-rgb-montage.png,28.7304,0.5409,0.2027,46.5556 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c40678c9e519933e785d9cb25d4bde983190cef1 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.7383,2.1161,1.7584,5.3670 +KodakMnt,5x5,ldr-rgb-montage.png,40.7011,1.6696,1.3125,7.1902 +KodakMnt,6x6,ldr-rgb-montage.png,37.4941,1.4637,1.1141,8.4704 +KodakMnt,8x8,ldr-rgb-montage.png,33.5369,1.6946,1.3521,6.9795 +KodakMnt,12x12,ldr-rgb-montage.png,29.5375,1.6430,1.2993,7.2634 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..eb17ba2db93a51c42b680e16cd2fb7396d28fc07 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9662,5.0891,4.7321,1.9943 +KodakMnt,5x5,ldr-rgb-montage.png,40.8651,5.1386,4.7785,1.9749 +KodakMnt,6x6,ldr-rgb-montage.png,37.6808,5.2830,4.9360,1.9119 +KodakMnt,8x8,ldr-rgb-montage.png,33.7126,5.2770,4.9333,1.9130 +KodakMnt,12x12,ldr-rgb-montage.png,29.7781,6.0190,5.6758,1.6627 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e565fe18f902d3a401227b188f33f521668926ef --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1408,0.9129,0.5252,17.9688 +KodakMnt,5x5,ldr-rgb-montage.png,40.1365,0.7774,0.3972,23.7621 +KodakMnt,6x6,ldr-rgb-montage.png,37.0049,0.8556,0.4727,19.9650 +KodakMnt,8x8,ldr-rgb-montage.png,32.9679,0.9688,0.5929,15.9176 +KodakMnt,12x12,ldr-rgb-montage.png,28.8597,0.7906,0.4158,22.6980 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..766b4a96a36ad0b2bb6986a0002549f21f7eda1f --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.7231,0.7247,0.3424,27.5585 +KodakMnt,5x5,ldr-rgb-montage.png,39.8789,0.6796,0.3017,31.2782 +KodakMnt,6x6,ldr-rgb-montage.png,36.8681,0.7242,0.3464,27.2403 +KodakMnt,8x8,ldr-rgb-montage.png,32.8239,0.8163,0.4427,21.3164 +KodakMnt,12x12,ldr-rgb-montage.png,28.7304,0.6785,0.3075,30.6877 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..dbbbecba65a9599193f314f025229779aeab82d8 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.7383,2.7588,2.3707,3.9807 +KodakMnt,5x5,ldr-rgb-montage.png,40.7011,2.3050,1.9220,4.9100 +KodakMnt,6x6,ldr-rgb-montage.png,37.4941,2.0918,1.7101,5.5186 +KodakMnt,8x8,ldr-rgb-montage.png,33.5369,2.5221,2.1445,4.4007 +KodakMnt,12x12,ldr-rgb-montage.png,29.5375,2.3456,1.9707,4.7887 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..00d9dd17d5f93aa313bf6116c67b8fc95b0c3197 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9662,6.7663,6.3802,1.4791 +KodakMnt,5x5,ldr-rgb-montage.png,40.8651,7.2819,6.8982,1.3681 +KodakMnt,6x6,ldr-rgb-montage.png,37.6808,7.8011,7.4182,1.2722 +KodakMnt,8x8,ldr-rgb-montage.png,33.7126,8.1140,7.7375,1.2197 +KodakMnt,12x12,ldr-rgb-montage.png,29.7781,8.8856,8.5084,1.1092 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..718c372290faf61c00891db0e3f139566675dcd4 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1408,0.8005,0.4383,21.5333 +KodakMnt,5x5,ldr-rgb-montage.png,40.1365,0.6862,0.3290,28.6831 +KodakMnt,6x6,ldr-rgb-montage.png,37.0049,0.7480,0.3904,24.1711 +KodakMnt,8x8,ldr-rgb-montage.png,32.9679,0.8432,0.4969,18.9937 +KodakMnt,12x12,ldr-rgb-montage.png,28.8597,0.7200,0.3695,25.5437 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..a2ac140e86c68b77d506948f66de4ad729c02704 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.7231,0.6447,0.2852,33.0853 +KodakMnt,5x5,ldr-rgb-montage.png,39.8789,0.6074,0.2509,37.6184 +KodakMnt,6x6,ldr-rgb-montage.png,36.8681,0.6383,0.2855,33.0601 +KodakMnt,8x8,ldr-rgb-montage.png,32.8239,0.7161,0.3676,25.6694 +KodakMnt,12x12,ldr-rgb-montage.png,28.7304,0.6181,0.2711,34.8043 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6f9e148f4b52a5beeb22e148de18b71e6666834c --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.7383,2.3548,1.9932,4.7347 +KodakMnt,5x5,ldr-rgb-montage.png,40.7011,1.9251,1.5643,6.0328 +KodakMnt,6x6,ldr-rgb-montage.png,37.4941,1.7500,1.3945,6.7676 +KodakMnt,8x8,ldr-rgb-montage.png,33.5369,2.1367,1.7812,5.2981 +KodakMnt,12x12,ldr-rgb-montage.png,29.5375,2.0997,1.7447,5.4092 diff --git a/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..5d525153f025d8c9ad6bc9e2541d15af302f97fd --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9662,5.7613,5.3998,1.7477 +KodakMnt,5x5,ldr-rgb-montage.png,40.8651,6.0351,5.6727,1.6636 +KodakMnt,6x6,ldr-rgb-montage.png,37.6808,6.4838,6.1253,1.5407 +KodakMnt,8x8,ldr-rgb-montage.png,33.7126,6.8779,6.5156,1.4484 +KodakMnt,12x12,ldr-rgb-montage.png,29.7781,7.8826,7.5287,1.2535 diff --git a/Test/Images/KodakMnt/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/KodakMnt/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..cf75532cbdb0a9d19ec8ae77ed598b2b0bce5ea5 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.1692,0.7453,0.3931,24.0049 +KodakMnt,5x5,ldr-rgb-montage.png,40.1531,0.6364,0.2781,33.9353 +KodakMnt,6x6,ldr-rgb-montage.png,37.0104,0.6591,0.3115,30.2948 +KodakMnt,8x8,ldr-rgb-montage.png,32.9733,0.7146,0.3775,24.9972 +KodakMnt,12x12,ldr-rgb-montage.png,28.8630,0.6088,0.2724,34.6489 diff --git a/Test/Images/KodakMnt/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/KodakMnt/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..fd66eb02f4196138c0596cc6062ff9bc7fda6383 --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,43.7497,0.6024,0.2536,37.2151 +KodakMnt,5x5,ldr-rgb-montage.png,39.8948,0.5615,0.2110,44.7224 +KodakMnt,6x6,ldr-rgb-montage.png,36.8734,0.5718,0.2259,41.7706 +KodakMnt,8x8,ldr-rgb-montage.png,32.8289,0.6213,0.2843,33.1992 +KodakMnt,12x12,ldr-rgb-montage.png,28.7331,0.5394,0.2022,46.6739 diff --git a/Test/Images/KodakMnt/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/KodakMnt/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..790ae8f7a4ae70c31f88a3197a615a885510153c --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.7555,2.1382,1.7860,5.2841 +KodakMnt,5x5,ldr-rgb-montage.png,40.7110,1.6752,1.3215,7.1415 +KodakMnt,6x6,ldr-rgb-montage.png,37.4987,1.4586,1.1145,8.4676 +KodakMnt,8x8,ldr-rgb-montage.png,33.5397,1.6911,1.3502,6.9897 +KodakMnt,12x12,ldr-rgb-montage.png,29.5399,1.6391,1.2986,7.2670 diff --git a/Test/Images/KodakMnt/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/KodakMnt/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9faf5b7d4163b5f8140f9a49431fe1b96a89d5de --- /dev/null +++ b/Test/Images/KodakMnt/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,6 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakMnt,4x4,ldr-rgb-montage.png,44.9866,5.1729,4.8184,1.9586 +KodakMnt,5x5,ldr-rgb-montage.png,40.8733,5.2002,4.8447,1.9479 +KodakMnt,6x6,ldr-rgb-montage.png,37.6862,5.2873,4.9399,1.9104 +KodakMnt,8x8,ldr-rgb-montage.png,33.7152,5.2905,4.9492,1.9068 +KodakMnt,12x12,ldr-rgb-montage.png,29.7791,6.0105,5.6706,1.6642 diff --git a/Test/Images/KodakSim/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/KodakSim/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index 2ea5f792f54aa0d8b9ed6134dbac517c3bbcfb2c..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3904,0.0970,0.0728,5.4050 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6546,0.0502,0.0271,14.4831 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.2501,0.0577,0.0357,11.0259 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0122,0.0387,0.0188,20.8768 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0008,0.0845,0.0591,6.6564 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1586,0.0455,0.0214,18.3713 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.3978,0.0494,0.0268,14.6920 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6115,0.0364,0.0159,24.7772 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0451,0.0878,0.0620,6.3470 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4936,0.0475,0.0235,16.7241 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3128,0.0494,0.0264,14.9109 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1307,0.0375,0.0163,24.1846 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.1671,0.0878,0.0577,6.8109 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.1803,0.0538,0.0257,15.2758 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2197,0.0512,0.0243,16.1923 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.9837,0.0404,0.0152,25.8538 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1854,0.0658,0.0298,13.1961 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7170,0.0501,0.0154,25.5649 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5222,0.0478,0.0145,27.1972 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2506,0.0416,0.0100,39.4043 diff --git a/Test/Images/KodakSim/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index 1cf31f34d25d2a9d77e7472455d7671ecbd0881e..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.1024,0.0654,0.0418,9.4179 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4493,0.0424,0.0204,19.2433 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,41.9861,0.0445,0.0236,16.6758 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8288,0.0334,0.0142,27.6774 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.3178,0.0613,0.0370,10.6390 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9569,0.0406,0.0177,22.2748 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.8333,0.0412,0.0193,20.4057 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.3913,0.0328,0.0131,30.0742 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.2760,0.0595,0.0352,11.1703 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3528,0.0406,0.0179,21.9402 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.7630,0.0397,0.0177,22.2495 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8540,0.0325,0.0125,31.4776 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,29.9876,0.0672,0.0394,9.9778 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0581,0.0458,0.0192,20.5003 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.0146,0.0429,0.0178,22.1191 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8083,0.0357,0.0123,31.9873 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1132,0.0534,0.0215,18.2714 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6182,0.0432,0.0124,31.6242 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4797,0.0408,0.0113,34.8911 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.1951,0.0361,0.0085,46.4517 diff --git a/Test/Images/KodakSim/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/KodakSim/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index 44e041b4e055c566e5188b1807ba70010f8566c5..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.0887,0.2026,0.1775,2.2155 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9182,0.1204,0.0964,4.0793 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.1886,0.1524,0.1297,3.0320 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.6672,0.1099,0.0890,4.4177 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7510,0.2513,0.2241,1.7547 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6013,0.1219,0.0965,4.0735 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.3581,0.1626,0.1378,2.8533 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.8509,0.0985,0.0760,5.1710 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5540,0.2516,0.2242,1.7539 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9809,0.1132,0.0868,4.5322 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2172,0.1386,0.1136,3.4622 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.4889,0.0800,0.0564,6.9717 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7276,0.2657,0.2348,1.6750 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7027,0.1266,0.0970,4.0542 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2516,0.1422,0.1136,3.4610 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2386,0.0847,0.0582,6.7508 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7761,0.2294,0.1898,2.0720 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3165,0.1190,0.0808,4.8662 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5646,0.1078,0.0706,5.5694 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3015,0.0743,0.0393,10.0053 diff --git a/Test/Images/KodakSim/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index da8015dbf197f75f815e0540837c11fd44dac80e..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.2942,0.4121,0.3868,1.0167 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1423,0.3012,0.2773,1.4182 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5746,0.3746,0.3515,1.1187 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1116,0.2878,0.2667,1.4744 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9652,0.4950,0.4678,0.8405 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7378,0.3728,0.3469,1.1335 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6371,0.4515,0.4271,0.9208 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1312,0.3650,0.3421,1.1493 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.6962,0.5698,0.5419,0.7257 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0965,0.4537,0.4273,0.9202 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.4884,0.5080,0.4831,0.8140 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8247,0.4390,0.4159,0.9454 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8695,0.6628,0.6305,0.6237 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8404,0.4331,0.4019,0.9785 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5648,0.4396,0.4095,0.9603 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7448,0.2907,0.2623,1.4991 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0242,0.7183,0.6768,0.5810 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5619,0.4395,0.3986,0.9866 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1782,0.4213,0.3814,1.0311 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0794,0.2535,0.2157,1.8227 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index 2aab788773914183898de71c54e7ce2635de3337..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3904,0.1174,0.0928,4.2366 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6546,0.0590,0.0353,11.1415 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.2501,0.0678,0.0457,8.6007 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0122,0.0449,0.0245,16.0438 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0008,0.1071,0.0814,4.8299 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1586,0.0546,0.0296,13.2646 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.3978,0.0590,0.0359,10.9654 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6115,0.0420,0.0209,18.8150 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0451,0.1157,0.0896,4.3910 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4936,0.0599,0.0343,11.4590 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3128,0.0611,0.0369,10.6493 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1307,0.0440,0.0225,17.4408 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.1671,0.1156,0.0853,4.6115 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.1803,0.0667,0.0374,10.5147 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2197,0.0622,0.0343,11.4617 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.9837,0.0469,0.0216,18.1625 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1854,0.0793,0.0424,9.2779 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7170,0.0569,0.0217,18.0841 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5222,0.0541,0.0203,19.3512 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2506,0.0464,0.0141,27.8998 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index 5725ce51472b5882c331500f6bcb214b0f8574f7..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.1024,0.0784,0.0544,7.2264 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4493,0.0493,0.0263,14.9597 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,41.9861,0.0517,0.0303,12.9928 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8288,0.0379,0.0188,20.9569 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.3178,0.0771,0.0518,7.5871 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9569,0.0482,0.0243,16.2071 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.8333,0.0483,0.0260,15.1191 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.3913,0.0375,0.0172,22.8361 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.2760,0.0756,0.0505,7.7832 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3528,0.0498,0.0255,15.4354 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.7630,0.0469,0.0244,16.1386 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8540,0.0377,0.0173,22.7344 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,29.9876,0.0858,0.0570,6.8951 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0581,0.0551,0.0274,14.3416 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.0146,0.0504,0.0248,15.8863 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8083,0.0408,0.0170,23.1333 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1132,0.0633,0.0309,12.7246 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6182,0.0485,0.0174,22.5794 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4797,0.0453,0.0159,24.7977 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.1951,0.0398,0.0119,33.0992 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index 8fad21e44be552ff085303f7b2c709ea1fddc786..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.0887,0.2674,0.2429,1.6189 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9182,0.1573,0.1328,2.9600 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.1886,0.2023,0.1795,2.1911 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.6672,0.1450,0.1237,3.1788 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7510,0.3569,0.3300,1.1915 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6013,0.1687,0.1424,2.7605 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.3581,0.2278,0.2030,1.9366 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.8509,0.1353,0.1125,3.4947 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5540,0.3600,0.3324,1.1829 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9809,0.1591,0.1324,2.9704 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2172,0.1947,0.1693,2.3221 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.4889,0.1093,0.0861,4.5689 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7276,0.3902,0.3592,1.0946 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7027,0.1803,0.1501,2.6194 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2516,0.2024,0.1738,2.2624 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2386,0.1157,0.0888,4.4295 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7761,0.3256,0.2863,1.3733 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3165,0.1639,0.1251,3.1421 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5646,0.1443,0.1074,3.6628 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3015,0.0947,0.0596,6.6029 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index da50d8722180fb0653a31af580b63e54780c96f0..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.2942,0.5453,0.5196,0.7568 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1423,0.4016,0.3766,1.0442 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5746,0.4998,0.4765,0.8252 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1116,0.3862,0.3649,1.0775 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9652,0.6957,0.6686,0.5881 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7378,0.5260,0.4999,0.7867 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6371,0.6391,0.6145,0.6399 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1312,0.5192,0.4955,0.7935 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.6962,0.8181,0.7901,0.4977 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0965,0.6589,0.6314,0.6227 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.4884,0.7347,0.7096,0.5542 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8247,0.6369,0.6133,0.6412 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8695,0.9919,0.9590,0.4100 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8404,0.6475,0.6155,0.6389 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5648,0.6559,0.6248,0.6293 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7448,0.4297,0.4010,0.9806 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0242,1.0631,1.0208,0.3852 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5619,0.6479,0.6056,0.6493 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1782,0.6180,0.5783,0.6799 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0794,0.3675,0.3292,1.1945 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index 4800bc7641f2b92c8e6272d01f0281ebd091a978..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3904,0.1071,0.0825,4.7685 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6546,0.0550,0.0314,12.5216 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.2501,0.0629,0.0409,9.6199 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0122,0.0421,0.0219,17.9739 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0008,0.0962,0.0704,5.5856 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1586,0.0510,0.0260,15.1149 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.3978,0.0546,0.0313,12.5464 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6115,0.0396,0.0186,21.1931 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0451,0.1043,0.0779,5.0494 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4936,0.0552,0.0299,13.1375 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3128,0.0561,0.0324,12.1389 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1307,0.0412,0.0198,19.8203 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.1671,0.1050,0.0747,5.2617 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.1803,0.0620,0.0326,12.0563 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2197,0.0581,0.0304,12.9338 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.9837,0.0446,0.0193,20.3643 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1854,0.0743,0.0380,10.3560 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7170,0.0550,0.0196,20.0612 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5222,0.0519,0.0183,21.5438 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2506,0.0446,0.0125,31.3519 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 1895c1f5a7c5345281a4d77ec307d05cc2735133..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.1024,0.0719,0.0480,8.1898 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4493,0.0462,0.0232,16.9126 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,41.9861,0.0482,0.0267,14.7272 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8288,0.0360,0.0167,23.5237 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.3178,0.0695,0.0448,8.7779 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9569,0.0449,0.0212,18.5751 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.8333,0.0446,0.0228,17.2253 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.3913,0.0353,0.0153,25.7103 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.2760,0.0691,0.0439,8.9503 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3528,0.0463,0.0226,17.3750 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.7630,0.0437,0.0218,18.0390 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8540,0.0357,0.0153,25.6265 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,29.9876,0.0789,0.0502,7.8272 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0581,0.0516,0.0242,16.2541 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.0146,0.0474,0.0221,17.7780 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8083,0.0386,0.0150,26.1880 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1132,0.0598,0.0276,14.2372 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6182,0.0469,0.0156,25.2205 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4797,0.0439,0.0140,28.0808 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.1951,0.0385,0.0105,37.3391 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 2eaf9735d0324cab182a6782afaf44732c5baced..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.0887,0.2369,0.2117,1.8570 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9182,0.1400,0.1156,3.4003 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.1886,0.1792,0.1560,2.5213 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.6672,0.1289,0.1072,3.6680 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7510,0.3097,0.2822,1.3936 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6013,0.1487,0.1225,3.2089 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.3581,0.1994,0.1750,2.2476 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.8509,0.1190,0.0964,4.0777 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5540,0.3186,0.2904,1.3538 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9809,0.1413,0.1147,3.4297 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2172,0.1727,0.1476,2.6640 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.4889,0.0979,0.0747,5.2643 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7276,0.3488,0.3174,1.2389 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7027,0.1616,0.1313,2.9939 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2516,0.1819,0.1532,2.5675 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2386,0.1047,0.0781,5.0324 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7761,0.2953,0.2558,1.5370 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3165,0.1493,0.1108,3.5486 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5646,0.1333,0.0956,4.1129 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3015,0.0879,0.0529,7.4316 diff --git a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/KodakSim/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 57f694158ad47ae7ef2db2813011673387f63d7f..0000000000000000000000000000000000000000 --- a/Test/Images/KodakSim/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,21 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.2942,0.4847,0.4596,0.8555 -KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1423,0.3555,0.3306,1.1894 -KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5746,0.4412,0.4181,0.9406 -KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1116,0.3438,0.3224,1.2195 -KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9652,0.6160,0.5888,0.6679 -KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7378,0.4642,0.4381,0.8976 -KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6371,0.5630,0.5384,0.7304 -KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1312,0.4541,0.4308,0.9127 -KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.6962,0.7258,0.6982,0.5632 -KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0965,0.5842,0.5574,0.7055 -KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.4884,0.6491,0.6238,0.6303 -KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8247,0.5602,0.5370,0.7323 -KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8695,0.8844,0.8515,0.4618 -KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8404,0.5758,0.5442,0.7226 -KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5648,0.5837,0.5536,0.7103 -KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7448,0.3833,0.3549,1.1078 -KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0242,0.9534,0.9107,0.4318 -KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5619,0.5808,0.5388,0.7299 -KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1782,0.5531,0.5136,0.7656 -KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0794,0.3297,0.2914,1.3495 diff --git a/Test/Images/KodakSim/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9794d6275a831e1f97fe516089631cf53e24d06d --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4688,0.0820,0.0620,6.3413 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6886,0.0416,0.0222,17.7046 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3209,0.0481,0.0291,13.5168 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0545,0.0326,0.0145,27.1954 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0468,0.0662,0.0460,8.5487 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1815,0.0359,0.0164,23.9038 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4661,0.0393,0.0202,19.5069 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6532,0.0297,0.0116,33.9593 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0787,0.0641,0.0443,8.8758 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5119,0.0369,0.0180,21.8843 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3780,0.0385,0.0196,20.0241 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1674,0.0302,0.0123,31.9582 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2278,0.0609,0.0409,9.6052 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2087,0.0391,0.0199,19.8003 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2938,0.0366,0.0178,22.0352 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0493,0.0293,0.0114,34.6354 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1955,0.0447,0.0232,16.9652 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7382,0.0332,0.0123,31.9638 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5348,0.0312,0.0107,36.7836 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2755,0.0271,0.0073,53.6679 diff --git a/Test/Images/KodakSim/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9b080ea80d8569b9b9a61d6073200227f4865bda --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3196,0.0555,0.0360,10.9081 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4978,0.0342,0.0157,24.9772 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1158,0.0369,0.0188,20.8858 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8520,0.0278,0.0107,36.9154 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.4962,0.0484,0.0292,13.4829 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9917,0.0308,0.0128,30.7052 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9594,0.0323,0.0145,27.1556 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4137,0.0267,0.0093,42.4085 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4494,0.0450,0.0259,15.2026 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3980,0.0314,0.0133,29.4875 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.8880,0.0309,0.0132,29.8499 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8578,0.0263,0.0092,42.7172 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0854,0.0482,0.0284,13.8276 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0724,0.0338,0.0147,26.7621 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1038,0.0317,0.0132,29.8591 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8469,0.0267,0.0089,43.9687 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1188,0.0376,0.0165,23.8038 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6485,0.0295,0.0092,42.8481 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4981,0.0281,0.0081,48.3954 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2305,0.0253,0.0060,65.7550 diff --git a/Test/Images/KodakSim/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ab5e76eadd85c8c37b164b62ddc03732e23f98a5 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1293,0.1510,0.1308,3.0072 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9525,0.0927,0.0717,5.4821 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.2439,0.1130,0.0934,4.2086 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7191,0.0813,0.0625,6.2927 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7719,0.1645,0.1430,2.7497 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6333,0.0867,0.0661,5.9486 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4004,0.1093,0.0888,4.4282 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9086,0.0723,0.0527,7.4543 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5627,0.1612,0.1402,2.8047 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9968,0.0808,0.0603,6.5180 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2394,0.0963,0.0762,5.1624 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5251,0.0618,0.0425,9.2504 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7402,0.1703,0.1489,2.6400 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7082,0.0922,0.0712,5.5244 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2732,0.1000,0.0797,4.9341 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2742,0.0652,0.0457,8.5997 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7758,0.1435,0.1189,3.3081 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3417,0.0853,0.0617,6.3767 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5760,0.0764,0.0532,7.3907 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3144,0.0538,0.0312,12.5890 diff --git a/Test/Images/KodakSim/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..fce09be55ce569847f0df864bea20b290bf7972a --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3073,0.2847,0.2644,1.4874 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1611,0.1812,0.1611,2.4401 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5999,0.2396,0.2196,1.7904 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1266,0.1739,0.1550,2.5362 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9793,0.3195,0.2978,1.3202 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7559,0.2034,0.1824,2.1554 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6657,0.2685,0.2480,1.5852 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1597,0.2039,0.1839,2.1382 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7090,0.3422,0.3210,1.2250 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1208,0.2312,0.2110,1.8635 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5196,0.2870,0.2670,1.4725 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8418,0.2322,0.2131,1.8449 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8800,0.3986,0.3759,1.0462 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8492,0.2692,0.2467,1.5938 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5803,0.2787,0.2570,1.5300 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7694,0.1991,0.1781,2.2077 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0232,0.4519,0.4249,0.9254 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5641,0.3028,0.2764,1.4229 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1778,0.2957,0.2700,1.4566 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0972,0.1922,0.1672,2.3522 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..8f789617203526dcba99ec792de4f01c4d291fd5 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4688,0.1024,0.0815,4.8243 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6886,0.0498,0.0295,13.3090 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3209,0.0585,0.0386,10.1793 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0545,0.0385,0.0196,20.0343 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0468,0.0858,0.0644,6.1011 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1815,0.0438,0.0233,16.8922 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4661,0.0484,0.0284,13.8442 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6532,0.0353,0.0163,24.1502 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0787,0.0866,0.0654,6.0137 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5119,0.0472,0.0268,14.6915 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3780,0.0489,0.0288,13.6444 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1674,0.0365,0.0176,22.3139 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2278,0.0840,0.0626,6.2812 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2087,0.0513,0.0306,12.8301 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2938,0.0472,0.0270,14.5727 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0493,0.0363,0.0170,23.1479 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1955,0.0577,0.0346,11.3649 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7382,0.0404,0.0181,21.7137 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5348,0.0372,0.0158,24.9202 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2755,0.0318,0.0108,36.5068 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..8ffb488327d860a486282785eaac5077e5a5f9c0 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3196,0.0681,0.0477,8.2418 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4978,0.0403,0.0208,18.9000 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1158,0.0444,0.0250,15.7016 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8520,0.0324,0.0143,27.5300 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.4962,0.0616,0.0413,9.5247 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9917,0.0376,0.0181,21.6983 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9594,0.0396,0.0204,19.2714 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4137,0.0313,0.0131,30.0555 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4494,0.0590,0.0388,10.1289 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3980,0.0396,0.0201,19.5571 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.8880,0.0382,0.0194,20.2648 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8578,0.0315,0.0134,29.3443 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0854,0.0644,0.0433,9.0720 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0724,0.0426,0.0222,17.6894 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1038,0.0395,0.0198,19.8805 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8469,0.0322,0.0132,29.8278 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1188,0.0465,0.0245,16.0464 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6485,0.0350,0.0136,29.0027 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4981,0.0331,0.0119,32.9715 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2305,0.0290,0.0087,45.3282 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..887dc134444967a4541a12ea9d9df1dc3ad02c85 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1293,0.1986,0.1771,2.2201 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9525,0.1176,0.0966,4.0717 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.2439,0.1475,0.1270,3.0959 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7191,0.1036,0.0841,4.6737 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7719,0.2322,0.2097,1.8752 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6333,0.1181,0.0964,4.0788 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4004,0.1529,0.1301,3.0229 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9086,0.0996,0.0788,4.9911 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5627,0.2332,0.2106,1.8674 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9968,0.1141,0.0928,4.2368 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2394,0.1364,0.1154,3.4078 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5251,0.0865,0.0662,5.9413 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7402,0.2517,0.2291,1.7165 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7082,0.1345,0.1124,3.4986 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2732,0.1462,0.1247,3.1544 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2742,0.0937,0.0730,5.3890 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7758,0.2022,0.1769,2.2234 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3417,0.1184,0.0933,4.2158 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5760,0.1042,0.0800,4.9173 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3144,0.0709,0.0471,8.3429 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7ca998f3e1da429d602b180628d5e96afea4d6d3 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3073,0.3803,0.3591,1.0949 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1611,0.2400,0.2187,1.7976 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5999,0.3186,0.2979,1.3198 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1266,0.2306,0.2103,1.8702 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9793,0.4495,0.4267,0.9214 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7559,0.2855,0.2639,1.4902 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6657,0.3821,0.3603,1.0913 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1597,0.2857,0.2649,1.4844 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7090,0.4995,0.4770,0.8244 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1208,0.3354,0.3141,1.2521 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5196,0.4180,0.3968,0.9909 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8418,0.3366,0.3165,1.2424 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8800,0.6031,0.5790,0.6791 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8492,0.4066,0.3829,1.0269 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5803,0.4199,0.3968,0.9911 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7694,0.3019,0.2798,1.4055 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0232,0.6552,0.6270,0.6271 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5641,0.4394,0.4118,0.9548 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1778,0.4290,0.4019,0.9783 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0972,0.2778,0.2516,1.5630 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..cca2d5f04c04292e7d5911b004a224e9445af7f1 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4688,0.0891,0.0690,5.6949 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.6886,0.0444,0.0250,15.7382 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3209,0.0516,0.0326,12.0636 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0545,0.0344,0.0164,23.9462 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0468,0.0736,0.0533,7.3753 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1815,0.0385,0.0193,20.4077 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4661,0.0428,0.0236,16.6539 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6532,0.0319,0.0137,28.6685 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0787,0.0739,0.0541,7.2698 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5119,0.0417,0.0222,17.7085 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3780,0.0430,0.0239,16.4291 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1674,0.0329,0.0149,26.3428 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2278,0.0723,0.0522,7.5384 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2087,0.0452,0.0256,15.3864 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.2938,0.0417,0.0226,17.3706 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0493,0.0327,0.0143,27.5148 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1955,0.0521,0.0301,13.0576 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7382,0.0370,0.0158,24.8163 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5348,0.0347,0.0138,28.5104 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2755,0.0293,0.0095,41.5485 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..a04d86657b6df4ea7e63e61727f4ccf749d96b44 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3196,0.0599,0.0405,9.7179 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.4978,0.0362,0.0176,22.3040 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1158,0.0395,0.0212,18.5419 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.8520,0.0294,0.0121,32.6052 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.4962,0.0536,0.0342,11.4811 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,38.9917,0.0337,0.0151,26.0803 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9594,0.0351,0.0171,23.0625 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4137,0.0283,0.0109,36.1009 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4494,0.0508,0.0319,12.3370 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.3980,0.0350,0.0166,23.6434 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.8880,0.0341,0.0161,24.3917 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8578,0.0285,0.0113,34.8167 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0854,0.0561,0.0360,10.9090 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0724,0.0376,0.0186,21.1147 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1038,0.0351,0.0166,23.6664 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8469,0.0292,0.0111,35.2784 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1188,0.0427,0.0215,18.3189 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6485,0.0324,0.0119,32.9708 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.4981,0.0305,0.0105,37.5388 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2305,0.0269,0.0076,51.5960 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c70c012687553f4885808eee6fd92dabfb1a53f4 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1293,0.1698,0.1493,2.6345 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9525,0.1021,0.0820,4.7930 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.2439,0.1271,0.1074,3.6608 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7191,0.0905,0.0716,5.4901 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7719,0.1939,0.1724,2.2813 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6333,0.0998,0.0790,4.9777 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4004,0.1269,0.1065,3.6925 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9086,0.0833,0.0636,6.1834 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5627,0.1942,0.1730,2.2728 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.9968,0.0960,0.0754,5.2156 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2394,0.1146,0.0944,4.1672 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5251,0.0743,0.0545,7.2205 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7402,0.2116,0.1901,2.0688 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7082,0.1137,0.0928,4.2366 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2732,0.1238,0.1032,3.8101 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2742,0.0801,0.0602,6.5360 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7758,0.1797,0.1552,2.5338 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3417,0.1054,0.0817,4.8146 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5760,0.0936,0.0702,5.6038 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3144,0.0640,0.0412,9.5413 diff --git a/Test/Images/KodakSim/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..069e93210eb12dbdc01e7ff0b63bf4635b8e4a20 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3073,0.3227,0.3022,1.3011 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.1611,0.2063,0.1856,2.1188 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.5999,0.2721,0.2522,1.5589 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.1266,0.1968,0.1778,2.2114 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9793,0.3718,0.3497,1.1244 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7559,0.2376,0.2165,1.8166 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6657,0.3165,0.2961,1.3279 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1597,0.2383,0.2188,1.7974 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7090,0.4135,0.3925,1.0019 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1208,0.2808,0.2597,1.5140 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5196,0.3478,0.3277,1.1999 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8418,0.2811,0.2616,1.5029 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8800,0.5094,0.4861,0.8089 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8492,0.3453,0.3228,1.2182 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5803,0.3566,0.3335,1.1791 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7694,0.2567,0.2352,1.6718 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0232,0.5806,0.5531,0.7109 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5641,0.3885,0.3620,1.0862 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1778,0.3796,0.3537,1.1117 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0972,0.2467,0.2215,1.7749 diff --git a/Test/Images/KodakSim/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9722eb5a557f697b2e34842bce247572a32fa66f --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4919,0.0818,0.0619,6.3486 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.7370,0.0409,0.0217,18.1097 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3614,0.0476,0.0289,13.6089 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.1424,0.0320,0.0142,27.7188 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0572,0.0660,0.0459,8.5739 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1918,0.0353,0.0162,24.3205 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4951,0.0390,0.0201,19.5756 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6991,0.0295,0.0114,34.6020 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0839,0.0639,0.0442,8.9036 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5253,0.0368,0.0179,21.9967 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3919,0.0381,0.0195,20.1277 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1835,0.0298,0.0122,32.1232 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2332,0.0608,0.0407,9.6630 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2165,0.0389,0.0197,19.9643 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.3081,0.0365,0.0178,22.1159 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0690,0.0291,0.0113,34.8035 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1972,0.0447,0.0231,17.0490 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7438,0.0330,0.0122,32.2047 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5449,0.0311,0.0107,36.7386 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2854,0.0270,0.0073,53.9541 diff --git a/Test/Images/KodakSim/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e4882004a08f797ed098b52fe23b23477abce44a --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3469,0.0553,0.0359,10.9684 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.5543,0.0337,0.0154,25.5752 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1673,0.0367,0.0187,21.0602 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.9925,0.0275,0.0104,37.9003 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.5080,0.0483,0.0291,13.4978 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.0073,0.0310,0.0127,30.9669 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9880,0.0324,0.0143,27.4247 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4665,0.0264,0.0091,43.2436 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4575,0.0446,0.0258,15.2569 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4116,0.0315,0.0134,29.4302 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.9040,0.0307,0.0131,29.9780 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8791,0.0261,0.0092,42.5980 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0901,0.0481,0.0284,13.8637 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0825,0.0335,0.0146,26.8974 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1153,0.0317,0.0131,29.9323 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8645,0.0268,0.0089,44.1323 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1227,0.0373,0.0165,23.8530 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6534,0.0295,0.0092,42.7637 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5037,0.0281,0.0082,47.9592 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2405,0.0251,0.0059,66.1533 diff --git a/Test/Images/KodakSim/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6f3dc9e5c4aab4e85bcf433bfd79f4479ce06494 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1568,0.1506,0.1301,3.0218 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9990,0.0936,0.0728,5.4016 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.3027,0.1135,0.0941,4.1808 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7847,0.0821,0.0634,6.2046 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7817,0.1639,0.1427,2.7559 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6513,0.0857,0.0653,6.0237 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4301,0.1085,0.0883,4.4553 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9353,0.0720,0.0526,7.4703 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5685,0.1621,0.1411,2.7866 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0066,0.0804,0.0603,6.5238 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2531,0.0951,0.0751,5.2381 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5379,0.0615,0.0424,9.2654 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7443,0.1692,0.1475,2.6659 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7131,0.0913,0.0706,5.5662 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2822,0.0994,0.0791,4.9681 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2854,0.0647,0.0453,8.6814 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7797,0.1430,0.1186,3.3162 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3434,0.0848,0.0611,6.4394 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5857,0.0762,0.0528,7.4502 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3311,0.0533,0.0309,12.7382 diff --git a/Test/Images/KodakSim/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..5cc24de31c2e2d1b494075a9b90a9c8cc86dac43 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3326,0.2819,0.2612,1.5052 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.2051,0.1791,0.1590,2.4732 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.6518,0.2410,0.2213,1.7768 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.2014,0.1758,0.1568,2.5077 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9922,0.3176,0.2962,1.3276 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7737,0.2012,0.1807,2.1766 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6946,0.2687,0.2486,1.5819 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1908,0.2038,0.1842,2.1350 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7163,0.3381,0.3170,1.2404 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1301,0.2295,0.2093,1.8792 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5367,0.2898,0.2699,1.4570 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8575,0.2338,0.2147,1.8315 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8852,0.3970,0.3741,1.0510 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8558,0.2687,0.2463,1.5964 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5942,0.2774,0.2555,1.5392 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7747,0.1973,0.1765,2.2280 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0247,0.4529,0.4260,0.9231 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5689,0.3006,0.2743,1.4336 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1903,0.2944,0.2686,1.4641 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0987,0.1902,0.1651,2.3816 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..8f2bc32f48f00142a2999e5f6ee478c7b60bfe07 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4919,0.1025,0.0815,4.8265 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.7370,0.0493,0.0290,13.5663 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3614,0.0583,0.0385,10.2129 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.1424,0.0383,0.0192,20.4332 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0572,0.0858,0.0643,6.1165 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1918,0.0436,0.0230,17.1008 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4951,0.0487,0.0282,13.9645 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6991,0.0351,0.0160,24.6053 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0839,0.0866,0.0653,6.0180 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5253,0.0472,0.0266,14.7581 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3919,0.0487,0.0286,13.7589 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1835,0.0366,0.0175,22.4412 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2332,0.0835,0.0620,6.3431 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2165,0.0512,0.0304,12.9432 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.3081,0.0470,0.0267,14.7156 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0690,0.0359,0.0168,23.3959 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1972,0.0575,0.0344,11.4201 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7438,0.0401,0.0182,21.6576 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5449,0.0377,0.0158,24.8728 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2854,0.0317,0.0108,36.4125 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..ee61c6949ad2dea5d5f71214b53dc890f2e89d81 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3469,0.0678,0.0474,8.2947 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.5543,0.0401,0.0205,19.2216 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1673,0.0440,0.0247,15.8895 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.9925,0.0322,0.0141,27.9390 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.5080,0.0617,0.0413,9.5173 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.0073,0.0377,0.0180,21.8576 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9880,0.0395,0.0201,19.5163 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4665,0.0311,0.0128,30.7223 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4575,0.0589,0.0386,10.1756 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4116,0.0397,0.0200,19.6334 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.9040,0.0384,0.0192,20.4363 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8791,0.0315,0.0133,29.5721 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0901,0.0644,0.0433,9.0831 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0825,0.0427,0.0222,17.7061 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1153,0.0396,0.0196,20.0283 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8645,0.0323,0.0132,29.8797 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1227,0.0465,0.0246,16.0104 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6534,0.0350,0.0136,28.9620 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5037,0.0330,0.0119,33.0515 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2405,0.0290,0.0087,45.3894 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..0173a3bb0152942a53dba24e96c8e4b657a4c82c --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1568,0.1988,0.1771,2.2201 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9990,0.1178,0.0967,4.0667 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.3027,0.1490,0.1284,3.0616 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7847,0.1059,0.0862,4.5634 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7817,0.2296,0.2072,1.8977 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6513,0.1172,0.0954,4.1220 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4301,0.1516,0.1296,3.0347 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9353,0.0994,0.0785,5.0082 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5685,0.2318,0.2098,1.8741 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0066,0.1132,0.0919,4.2778 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2531,0.1351,0.1140,3.4497 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5379,0.0860,0.0659,5.9645 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7443,0.2504,0.2272,1.7310 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7131,0.1338,0.1116,3.5225 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2822,0.1452,0.1234,3.1862 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2854,0.0924,0.0712,5.5200 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7797,0.2018,0.1765,2.2276 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3434,0.1177,0.0928,4.2365 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5857,0.1040,0.0796,4.9398 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3311,0.0703,0.0466,8.4356 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..56305cda15eb78a4fe5e90f1665375bdf7fcac78 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3326,0.3771,0.3556,1.1059 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.2051,0.2369,0.2158,1.8220 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.6518,0.3209,0.3003,1.3093 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.2014,0.2332,0.2134,1.8428 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9922,0.4452,0.4227,0.9302 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7737,0.2831,0.2614,1.5042 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6946,0.3806,0.3592,1.0947 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1908,0.2881,0.2675,1.4699 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7163,0.4946,0.4724,0.8323 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1301,0.3345,0.3130,1.2562 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5367,0.4216,0.4002,0.9827 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8575,0.3398,0.3196,1.2304 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8852,0.5961,0.5715,0.6881 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8558,0.4057,0.3824,1.0284 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5942,0.4158,0.3928,1.0010 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7747,0.2984,0.2765,1.4224 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0247,0.6535,0.6256,0.6285 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5689,0.4374,0.4099,0.9593 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1903,0.4267,0.3999,0.9832 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0987,0.2764,0.2501,1.5721 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..85abfa92bc90e1992322a3f9d4f4ba997493b1d2 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4919,0.0905,0.0698,5.6371 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.7370,0.0445,0.0244,16.0857 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3614,0.0516,0.0325,12.0881 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.1424,0.0338,0.0163,24.1488 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0572,0.0743,0.0536,7.3373 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1918,0.0392,0.0192,20.4639 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.4951,0.0432,0.0236,16.6771 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.6991,0.0345,0.0149,26.3070 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0839,0.0767,0.0557,7.0570 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5253,0.0424,0.0224,17.5748 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3919,0.0434,0.0240,16.3847 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1835,0.0333,0.0149,26.4170 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2332,0.0731,0.0525,7.4870 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2165,0.0456,0.0256,15.3583 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.3081,0.0422,0.0226,17.3805 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0690,0.0329,0.0143,27.4745 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1972,0.0532,0.0306,12.8498 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7438,0.0379,0.0161,24.4931 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5449,0.0357,0.0142,27.7753 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2854,0.0299,0.0096,41.0930 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..0296c21c7898922e6bffc7fd6a341689e6181885 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3469,0.0597,0.0404,9.7415 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.5543,0.0359,0.0173,22.6975 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1673,0.0393,0.0211,18.6508 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,44.9925,0.0293,0.0119,32.9570 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.5080,0.0537,0.0343,11.4673 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.0073,0.0337,0.0149,26.3196 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9880,0.0350,0.0170,23.1769 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4665,0.0282,0.0109,36.2110 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4575,0.0511,0.0318,12.3703 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4116,0.0349,0.0167,23.5603 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.9040,0.0340,0.0161,24.3931 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8791,0.0285,0.0113,34.7763 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0901,0.0561,0.0359,10.9394 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0825,0.0377,0.0186,21.1564 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1153,0.0352,0.0166,23.6478 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8645,0.0289,0.0111,35.3677 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1227,0.0430,0.0216,18.1776 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6534,0.0325,0.0120,32.7242 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5037,0.0305,0.0106,37.0430 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2405,0.0269,0.0077,51.3071 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..02eddfc83e37393c2c80b5b2a4d5bcd646b05c05 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1568,0.1704,0.1497,2.6269 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.9990,0.1018,0.0821,4.7911 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.3027,0.1281,0.1085,3.6231 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.7847,0.0918,0.0731,5.3816 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7817,0.1925,0.1710,2.2996 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6513,0.0989,0.0783,5.0202 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4301,0.1272,0.1063,3.6988 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9353,0.0840,0.0638,6.1595 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5685,0.1947,0.1737,2.2635 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0066,0.0958,0.0753,5.2234 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2531,0.1138,0.0939,4.1867 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5379,0.0743,0.0545,7.2160 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7443,0.2134,0.1919,2.0489 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7131,0.1137,0.0926,4.2445 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2822,0.1242,0.1037,3.7925 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2854,0.0796,0.0597,6.5849 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7797,0.1804,0.1561,2.5191 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3434,0.1060,0.0821,4.7880 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5857,0.0939,0.0705,5.5779 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3311,0.0644,0.0415,9.4689 diff --git a/Test/Images/KodakSim/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..4024ff9f1437c342ac28f035047c3a31eb131cbf --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3326,0.3232,0.3025,1.2999 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.2051,0.2050,0.1844,2.1327 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.6518,0.2761,0.2564,1.5337 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.2014,0.2009,0.1821,2.1592 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9922,0.3740,0.3520,1.1170 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7737,0.2376,0.2164,1.8168 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.6946,0.3185,0.2981,1.3190 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.1908,0.2419,0.2221,1.7705 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7163,0.4125,0.3915,1.0045 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1301,0.2816,0.2605,1.5094 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5367,0.3497,0.3295,1.1934 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8575,0.2842,0.2651,1.4835 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8852,0.5110,0.4876,0.8064 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8558,0.3454,0.3229,1.2178 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5942,0.3561,0.3337,1.1783 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7747,0.2542,0.2331,1.6867 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0247,0.5847,0.5574,0.7055 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5689,0.3905,0.3643,1.0792 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1903,0.3816,0.3556,1.1058 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.0987,0.2463,0.2213,1.7765 diff --git a/Test/Images/KodakSim/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/KodakSim/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..1a3da5e13d104e1662958f5155a61a0428571bd9 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.4947,0.0824,0.0626,6.2861 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.7575,0.0410,0.0219,17.9264 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.3771,0.0478,0.0292,13.4544 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.1921,0.0326,0.0144,27.3275 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.0593,0.0664,0.0463,8.4865 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.1990,0.0354,0.0162,24.3370 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,39.5028,0.0388,0.0202,19.4652 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.7102,0.0296,0.0115,34.2883 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.0839,0.0638,0.0440,8.9469 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.5274,0.0366,0.0178,22.0783 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,37.3933,0.0378,0.0194,20.2752 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,39.1903,0.0295,0.0120,32.6407 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.2338,0.0601,0.0404,9.7420 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.2175,0.0385,0.0196,20.0375 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.3088,0.0360,0.0176,22.3052 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,36.0715,0.0289,0.0113,34.8255 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1983,0.0442,0.0229,17.1344 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.7450,0.0332,0.0121,32.6265 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5473,0.0309,0.0106,36.9882 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2873,0.0268,0.0073,54.0885 diff --git a/Test/Images/KodakSim/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/KodakSim/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..131680a018e9acdc4a2ec73f9d98f5114c07740a --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,38.3506,0.0556,0.0364,10.7907 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,42.5776,0.0340,0.0158,24.8713 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,42.1927,0.0368,0.0189,20.7677 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.0640,0.0278,0.0106,37.2615 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,34.5082,0.0485,0.0293,13.3979 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.0139,0.0309,0.0128,30.8384 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,38.9982,0.0323,0.0145,27.1896 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,41.4803,0.0264,0.0092,42.7371 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,32.4587,0.0455,0.0261,15.0663 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,36.4142,0.0314,0.0132,29.7798 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,36.9072,0.0309,0.0131,30.0901 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,38.8826,0.0259,0.0092,42.8014 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.0911,0.0475,0.0284,13.8646 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.0838,0.0333,0.0146,26.9642 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,34.1188,0.0315,0.0131,29.9910 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,35.8675,0.0262,0.0089,44.2519 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.1239,0.0373,0.0164,24.0190 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,29.6549,0.0293,0.0092,42.6024 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,30.5059,0.0283,0.0082,47.8076 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,32.2438,0.0249,0.0059,66.2410 diff --git a/Test/Images/KodakSim/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/KodakSim/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..89fee8f95ae9f66c9da8a60fd7c7d631d0f1b7c8 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.1605,0.1523,0.1317,2.9856 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.0186,0.0928,0.0727,5.4105 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.3148,0.1148,0.0955,4.1177 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,45.8205,0.0827,0.0640,6.1424 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.7835,0.1637,0.1427,2.7563 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.6594,0.0861,0.0656,5.9928 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.4362,0.1084,0.0884,4.4489 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,42.9528,0.0716,0.0524,7.5014 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.5684,0.1611,0.1402,2.8048 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.0113,0.0799,0.0597,6.5820 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.2584,0.0947,0.0750,5.2423 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.5591,0.0611,0.0423,9.3020 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.7452,0.1689,0.1469,2.6775 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.7152,0.0912,0.0707,5.5602 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.2848,0.0986,0.0785,5.0121 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.2956,0.0642,0.0447,8.7985 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,27.7812,0.1423,0.1182,3.3263 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.3441,0.0843,0.0608,6.4700 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,31.5868,0.0757,0.0526,7.4715 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,33.3324,0.0530,0.0308,12.7469 diff --git a/Test/Images/KodakSim/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/KodakSim/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..d9eb8af888aca59c8e271dfa34cf96551d85c5f4 --- /dev/null +++ b/Test/Images/KodakSim/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,21 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +KodakSim,4x4,ldr-rgba-kodak22+24+nca.png,39.3375,0.2833,0.2632,1.4940 +KodakSim,4x4,ldr-rgba-kodak22+ca.png,43.2245,0.1807,0.1607,2.4463 +KodakSim,4x4,ldr-rgba-kodak23+20+nca.png,43.6742,0.2439,0.2243,1.7531 +KodakSim,4x4,ldr-rgba-kodak23+ca.png,46.2511,0.1790,0.1602,2.4538 +KodakSim,5x5,ldr-rgba-kodak22+24+nca.png,35.9948,0.3169,0.2953,1.3314 +KodakSim,5x5,ldr-rgba-kodak22+ca.png,39.7826,0.2023,0.1817,2.1645 +KodakSim,5x5,ldr-rgba-kodak23+20+nca.png,40.7040,0.2699,0.2495,1.5759 +KodakSim,5x5,ldr-rgba-kodak23+ca.png,43.2116,0.2055,0.1859,2.1148 +KodakSim,6x6,ldr-rgba-kodak22+24+nca.png,33.7175,0.3376,0.3170,1.2404 +KodakSim,6x6,ldr-rgba-kodak22+ca.png,37.1343,0.2298,0.2096,1.8759 +KodakSim,6x6,ldr-rgba-kodak23+20+nca.png,38.5425,0.2877,0.2680,1.4673 +KodakSim,6x6,ldr-rgba-kodak23+ca.png,40.8697,0.2333,0.2144,1.8338 +KodakSim,8x8,ldr-rgba-kodak22+24+nca.png,30.8859,0.3958,0.3730,1.0543 +KodakSim,8x8,ldr-rgba-kodak22+ca.png,33.8584,0.2666,0.2444,1.6086 +KodakSim,8x8,ldr-rgba-kodak23+20+nca.png,35.5966,0.2762,0.2547,1.5438 +KodakSim,8x8,ldr-rgba-kodak23+ca.png,37.7790,0.1969,0.1762,2.2317 +KodakSim,12x12,ldr-rgba-kodak22+24+nca.png,28.0253,0.4511,0.4243,0.9268 +KodakSim,12x12,ldr-rgba-kodak22+ca.png,30.5709,0.3001,0.2740,1.4351 +KodakSim,12x12,ldr-rgba-kodak23+20+nca.png,32.1907,0.2930,0.2673,1.4711 +KodakSim,12x12,ldr-rgba-kodak23+ca.png,34.1013,0.1891,0.1641,2.3967 diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-r16.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-r16.ktx new file mode 100644 index 0000000000000000000000000000000000000000..c3c2102d8e9821a78be4cb39acd89549d7a02c9c Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-r16.ktx differ diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-r32.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-r32.ktx new file mode 100644 index 0000000000000000000000000000000000000000..a5b660ba17cbebf04802654c88d437e612d90f1b Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-r32.ktx differ diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-rg16.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-rg16.ktx new file mode 100644 index 0000000000000000000000000000000000000000..c0f651d96073921de38c8abf325da79019fb52b0 Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-rg16.ktx differ diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-rg32.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-rg32.ktx new file mode 100644 index 0000000000000000000000000000000000000000..6ffb19e25a407784b3e575d31dcf2f7a499c21da Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-rg32.ktx differ diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-rgb16.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-rgb16.ktx new file mode 100644 index 0000000000000000000000000000000000000000..e75ea021c2bcf1347a4ba824ec2ed720e1ee7dd0 Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-rgb16.ktx differ diff --git a/Test/Images/Small/HDR-RGB/hdr-rgb-rgb32.ktx b/Test/Images/Small/HDR-RGB/hdr-rgb-rgb32.ktx new file mode 100644 index 0000000000000000000000000000000000000000..5286bcb6aeaf85f297c190c7d92b9ac67c2b49b0 Binary files /dev/null and b/Test/Images/Small/HDR-RGB/hdr-rgb-rgb32.ktx differ diff --git a/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba16.ktx b/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba16.ktx new file mode 100644 index 0000000000000000000000000000000000000000..8abff2c6065e1e380a04a9956e6f2541774e156c Binary files /dev/null and b/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba16.ktx differ diff --git a/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba32.ktx b/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba32.ktx new file mode 100644 index 0000000000000000000000000000000000000000..e40c3eca3ff63a2ce4d8d895c39122072f58f231 Binary files /dev/null and b/Test/Images/Small/HDR-RGBA/hdr-rgba-rgba32.ktx differ diff --git a/Test/Images/Small/astc_reference-3.6-avx2_fast_results.csv b/Test/Images/Small/astc_reference-3.6-avx2_fast_results.csv deleted file mode 100644 index 81d3cb6a9fa7a90aabaeb9fa57f79f5754c0577f..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-avx2_fast_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.6884,0.1058,0.0154,4.2512 -Small,4x4,ldr-rgb-00.png,38.1103,0.0146,0.0096,6.8216 -Small,4x4,ldr-rgb-01.png,39.8105,0.0132,0.0085,7.7356 -Small,4x4,ldr-rgb-02.png,35.0374,0.0180,0.0133,4.9365 -Small,4x4,ldr-rgb-03.png,45.9704,0.0078,0.0032,20.1893 -Small,4x4,ldr-rgb-04.png,41.9106,0.0108,0.0058,11.3109 -Small,4x4,ldr-rgb-05.png,37.2317,0.0174,0.0125,5.2395 -Small,4x4,ldr-rgb-06.png,35.2059,0.0172,0.0122,5.3613 -Small,4x4,ldr-rgb-07.png,38.0309,0.0182,0.0129,5.0953 -Small,4x4,ldr-rgb-08.png,43.6358,0.0098,0.0049,13.3527 -Small,4x4,ldr-rgb-09.png,41.8533,0.0111,0.0063,10.3630 -Small,4x4,ldr-rgb-10.png,44.3464,0.0044,0.0018,8.8641 -Small,4x4,ldr-rgba-00.png,35.5182,0.0177,0.0123,5.3186 -Small,4x4,ldr-rgba-01.png,38.7956,0.0127,0.0076,8.6277 -Small,4x4,ldr-rgba-02.png,34.8333,0.0161,0.0110,5.9795 -Small,4x4,ldr-xy-00.png,37.5697,0.0135,0.0061,10.7404 -Small,4x4,ldr-xy-01.png,44.1378,0.0142,0.0071,9.2176 -Small,4x4,ldr-xy-02.png,48.1786,0.0120,0.0043,15.1107 -Small,4x4,ldrs-rgba-00.png,35.5254,0.0180,0.0126,5.2066 -Small,4x4,ldrs-rgba-01.png,38.8141,0.0131,0.0080,8.1758 -Small,4x4,ldrs-rgba-02.png,34.8386,0.0161,0.0111,5.8855 -Small,5x5,hdr-rgb-00.hdr,29.4686,0.1105,0.0175,3.7464 -Small,5x5,ldr-rgb-00.png,34.3042,0.0157,0.0096,6.8132 -Small,5x5,ldr-rgb-01.png,36.1808,0.0130,0.0072,9.0495 -Small,5x5,ldr-rgb-02.png,31.0160,0.0171,0.0112,5.8280 -Small,5x5,ldr-rgb-03.png,42.6231,0.0086,0.0031,20.9590 -Small,5x5,ldr-rgb-04.png,37.2434,0.0120,0.0058,11.2738 -Small,5x5,ldr-rgb-05.png,33.1823,0.0193,0.0133,4.9123 -Small,5x5,ldr-rgb-06.png,31.0247,0.0170,0.0109,6.0080 -Small,5x5,ldr-rgb-07.png,35.1883,0.0174,0.0111,5.9282 -Small,5x5,ldr-rgb-08.png,40.0310,0.0102,0.0043,15.0692 -Small,5x5,ldr-rgb-09.png,37.2810,0.0123,0.0065,10.1211 -Small,5x5,ldr-rgb-10.png,40.1234,0.0053,0.0017,9.6303 -Small,5x5,ldr-rgba-00.png,32.0072,0.0194,0.0131,5.0197 -Small,5x5,ldr-rgba-01.png,35.1428,0.0136,0.0076,8.6792 -Small,5x5,ldr-rgba-02.png,31.1062,0.0176,0.0115,5.7017 -Small,5x5,ldr-xy-00.png,36.7258,0.0140,0.0050,13.1546 -Small,5x5,ldr-xy-01.png,39.8638,0.0145,0.0058,11.3958 -Small,5x5,ldr-xy-02.png,43.9171,0.0132,0.0045,14.6321 -Small,5x5,ldrs-rgba-00.png,32.0096,0.0196,0.0133,4.9279 -Small,5x5,ldrs-rgba-01.png,35.1497,0.0139,0.0078,8.3710 -Small,5x5,ldrs-rgba-02.png,31.1070,0.0178,0.0116,5.6711 -Small,6x6,hdr-rgb-00.hdr,26.9904,0.1131,0.0192,3.4221 -Small,6x6,ldr-rgb-00.png,31.5938,0.0186,0.0120,5.4431 -Small,6x6,ldr-rgb-01.png,32.8896,0.0156,0.0094,6.9890 -Small,6x6,ldr-rgb-02.png,27.4079,0.0204,0.0140,4.6769 -Small,6x6,ldr-rgb-03.png,40.4899,0.0093,0.0032,20.4036 -Small,6x6,ldr-rgb-04.png,33.9065,0.0140,0.0075,8.7781 -Small,6x6,ldr-rgb-05.png,29.9329,0.0229,0.0164,4.0024 -Small,6x6,ldr-rgb-06.png,27.4651,0.0202,0.0136,4.8146 -Small,6x6,ldr-rgb-07.png,32.8824,0.0179,0.0112,5.8613 -Small,6x6,ldr-rgb-08.png,37.6380,0.0108,0.0044,14.8880 -Small,6x6,ldr-rgb-09.png,33.4716,0.0140,0.0075,8.7078 -Small,6x6,ldr-rgb-10.png,36.6590,0.0062,0.0021,7.6532 -Small,6x6,ldr-rgba-00.png,29.4788,0.0229,0.0160,4.0919 -Small,6x6,ldr-rgba-01.png,32.0575,0.0159,0.0092,7.1406 -Small,6x6,ldr-rgba-02.png,27.8275,0.0207,0.0138,4.7500 -Small,6x6,ldr-xy-00.png,35.6827,0.0146,0.0051,12.8598 -Small,6x6,ldr-xy-01.png,37.1053,0.0162,0.0071,9.1684 -Small,6x6,ldr-xy-02.png,41.9446,0.0133,0.0042,15.5818 -Small,6x6,ldrs-rgba-00.png,29.4790,0.0231,0.0163,4.0152 -Small,6x6,ldrs-rgba-01.png,32.0640,0.0157,0.0091,7.1749 -Small,6x6,ldrs-rgba-02.png,27.8273,0.0209,0.0144,4.5451 -Small,8x8,hdr-rgb-00.hdr,23.7216,0.1240,0.0256,2.5609 -Small,8x8,ldr-rgb-00.png,27.9814,0.0261,0.0155,4.2408 -Small,8x8,ldr-rgb-01.png,28.7458,0.0226,0.0123,5.3207 -Small,8x8,ldr-rgb-02.png,23.0937,0.0303,0.0199,3.2868 -Small,8x8,ldr-rgb-03.png,37.2544,0.0137,0.0034,19.4123 -Small,8x8,ldr-rgb-04.png,29.3419,0.0214,0.0107,6.1061 -Small,8x8,ldr-rgb-05.png,25.7747,0.0327,0.0223,2.9325 -Small,8x8,ldr-rgb-06.png,23.1468,0.0304,0.0199,3.2967 -Small,8x8,ldr-rgb-07.png,29.6508,0.0214,0.0106,6.1850 -Small,8x8,ldr-rgb-08.png,34.2150,0.0157,0.0053,12.2911 -Small,8x8,ldr-rgb-09.png,28.6635,0.0221,0.0117,5.6201 -Small,8x8,ldr-rgb-10.png,31.9974,0.0110,0.0027,5.9155 -Small,8x8,ldr-rgba-00.png,25.3599,0.0312,0.0203,3.2268 -Small,8x8,ldr-rgba-01.png,28.2399,0.0236,0.0131,4.9924 -Small,8x8,ldr-rgba-02.png,23.9241,0.0309,0.0201,3.2576 -Small,8x8,ldr-xy-00.png,33.3965,0.0206,0.0071,9.2331 -Small,8x8,ldr-xy-01.png,34.2472,0.0219,0.0085,7.6651 -Small,8x8,ldr-xy-02.png,39.9005,0.0167,0.0030,21.5152 -Small,8x8,ldrs-rgba-00.png,25.3610,0.0315,0.0208,3.1511 -Small,8x8,ldrs-rgba-01.png,28.2419,0.0236,0.0131,4.9841 -Small,8x8,ldrs-rgba-02.png,23.9237,0.0309,0.0201,3.2552 -Small,12x12,hdr-rgb-00.hdr,20.5637,0.1398,0.0343,1.9107 -Small,12x12,ldr-rgb-00.png,23.7825,0.0297,0.0123,5.3481 -Small,12x12,ldr-rgb-01.png,24.7588,0.0253,0.0084,7.8028 -Small,12x12,ldr-rgb-02.png,19.2226,0.0391,0.0221,2.9719 -Small,12x12,ldr-rgb-03.png,33.2364,0.0198,0.0027,24.6571 -Small,12x12,ldr-rgb-04.png,24.5606,0.0257,0.0086,7.6338 -Small,12x12,ldr-rgb-05.png,21.4885,0.0354,0.0181,3.6280 -Small,12x12,ldr-rgb-06.png,19.2097,0.0404,0.0233,2.8078 -Small,12x12,ldr-rgb-07.png,25.3456,0.0248,0.0072,9.1110 -Small,12x12,ldr-rgb-08.png,30.1535,0.0211,0.0042,15.5298 -Small,12x12,ldr-rgb-09.png,23.7136,0.0291,0.0120,5.4532 -Small,12x12,ldr-rgb-10.png,27.3052,0.0176,0.0030,5.3577 -Small,12x12,ldr-rgba-00.png,21.3632,0.0385,0.0207,3.1658 -Small,12x12,ldr-rgba-01.png,24.4867,0.0271,0.0096,6.8218 -Small,12x12,ldr-rgba-02.png,20.1666,0.0444,0.0273,2.4036 -Small,12x12,ldr-xy-00.png,29.0651,0.0280,0.0064,10.2079 -Small,12x12,ldr-xy-01.png,30.4241,0.0270,0.0057,11.4290 -Small,12x12,ldr-xy-02.png,37.9951,0.0229,0.0019,34.7507 -Small,12x12,ldrs-rgba-00.png,21.3658,0.0390,0.0213,3.0769 -Small,12x12,ldrs-rgba-01.png,24.4885,0.0273,0.0098,6.7024 -Small,12x12,ldrs-rgba-02.png,20.1665,0.0446,0.0272,2.4081 -Small,3x3x3,ldr-l-00-3.dds,50.7551,0.0179,0.0116,22.5559 -Small,3x3x3,ldr-l-01-3.dds,53.8676,0.0090,0.0051,13.5348 -Small,6x6x6,ldr-l-00-3.dds,32.5264,0.0630,0.0405,6.4724 -Small,6x6x6,ldr-l-01-3.dds,40.7893,0.0366,0.0164,4.1969 diff --git a/Test/Images/Small/astc_reference-3.6-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-3.6-avx2_fastest_results.csv deleted file mode 100644 index 0822f9106bc6434bdb3b7b960293ccf055179e5b..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-avx2_fastest_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.2999,0.0997,0.0097,6.7375 -Small,4x4,ldr-rgb-00.png,37.0084,0.0102,0.0057,11.4614 -Small,4x4,ldr-rgb-01.png,39.4162,0.0097,0.0054,12.0980 -Small,4x4,ldr-rgb-02.png,34.6448,0.0122,0.0080,8.1675 -Small,4x4,ldr-rgb-03.png,45.3559,0.0066,0.0025,25.7618 -Small,4x4,ldr-rgb-04.png,41.6390,0.0086,0.0042,15.6706 -Small,4x4,ldr-rgb-05.png,36.7213,0.0119,0.0076,8.6516 -Small,4x4,ldr-rgb-06.png,34.6994,0.0118,0.0073,8.9249 -Small,4x4,ldr-rgb-07.png,37.1808,0.0122,0.0076,8.6767 -Small,4x4,ldr-rgb-08.png,42.6915,0.0077,0.0035,18.8531 -Small,4x4,ldr-rgb-09.png,41.6433,0.0086,0.0043,15.2617 -Small,4x4,ldr-rgb-10.png,43.8818,0.0034,0.0014,11.2494 -Small,4x4,ldr-rgba-00.png,34.5700,0.0118,0.0070,9.3985 -Small,4x4,ldr-rgba-01.png,38.5857,0.0101,0.0057,11.5953 -Small,4x4,ldr-rgba-02.png,34.5224,0.0127,0.0082,8.0018 -Small,4x4,ldr-xy-00.png,37.5264,0.0109,0.0041,15.9915 -Small,4x4,ldr-xy-01.png,43.8563,0.0112,0.0046,14.1763 -Small,4x4,ldr-xy-02.png,48.1786,0.0105,0.0034,19.0676 -Small,4x4,ldrs-rgba-00.png,34.5750,0.0118,0.0071,9.1942 -Small,4x4,ldrs-rgba-01.png,38.6025,0.0102,0.0057,11.4695 -Small,4x4,ldrs-rgba-02.png,34.5263,0.0125,0.0080,8.1675 -Small,5x5,hdr-rgb-00.hdr,28.8076,0.1032,0.0107,6.1191 -Small,5x5,ldr-rgb-00.png,33.4478,0.0110,0.0058,11.3840 -Small,5x5,ldr-rgb-01.png,35.9999,0.0099,0.0051,12.9287 -Small,5x5,ldr-rgb-02.png,30.8748,0.0129,0.0080,8.2412 -Small,5x5,ldr-rgb-03.png,42.2547,0.0071,0.0024,27.2291 -Small,5x5,ldr-rgb-04.png,36.9224,0.0097,0.0046,14.3285 -Small,5x5,ldr-rgb-05.png,32.6193,0.0137,0.0088,7.4610 -Small,5x5,ldr-rgb-06.png,30.8711,0.0132,0.0081,8.0977 -Small,5x5,ldr-rgb-07.png,34.2652,0.0126,0.0074,8.8756 -Small,5x5,ldr-rgb-08.png,39.3139,0.0081,0.0032,20.4477 -Small,5x5,ldr-rgb-09.png,36.9835,0.0094,0.0044,14.7277 -Small,5x5,ldr-rgb-10.png,39.7373,0.0041,0.0015,10.9460 -Small,5x5,ldr-rgba-00.png,30.7473,0.0127,0.0073,9.0145 -Small,5x5,ldr-rgba-01.png,34.9846,0.0112,0.0062,10.5548 -Small,5x5,ldr-rgba-02.png,31.0020,0.0142,0.0089,7.3289 -Small,5x5,ldr-xy-00.png,36.5568,0.0118,0.0038,17.1960 -Small,5x5,ldr-xy-01.png,38.8334,0.0119,0.0043,15.1531 -Small,5x5,ldr-xy-02.png,43.7233,0.0115,0.0036,18.3681 -Small,5x5,ldrs-rgba-00.png,30.7497,0.0129,0.0073,8.9738 -Small,5x5,ldrs-rgba-01.png,34.9913,0.0111,0.0060,10.8897 -Small,5x5,ldrs-rgba-02.png,31.0030,0.0142,0.0088,7.4854 -Small,6x6,hdr-rgb-00.hdr,26.7122,0.1034,0.0107,6.1220 -Small,6x6,ldr-rgb-00.png,31.1052,0.0119,0.0065,10.1088 -Small,6x6,ldr-rgb-01.png,32.7949,0.0109,0.0057,11.4997 -Small,6x6,ldr-rgb-02.png,27.3228,0.0141,0.0090,7.2956 -Small,6x6,ldr-rgb-03.png,40.2037,0.0073,0.0023,28.2854 -Small,6x6,ldr-rgb-04.png,33.7349,0.0104,0.0049,13.4652 -Small,6x6,ldr-rgb-05.png,29.5304,0.0145,0.0091,7.1978 -Small,6x6,ldr-rgb-06.png,27.3791,0.0143,0.0089,7.3727 -Small,6x6,ldr-rgb-07.png,32.0586,0.0125,0.0067,9.8537 -Small,6x6,ldr-rgb-08.png,37.0422,0.0082,0.0030,21.9990 -Small,6x6,ldr-rgb-09.png,33.2804,0.0105,0.0053,12.3797 -Small,6x6,ldr-rgb-10.png,36.4903,0.0046,0.0016,10.3810 -Small,6x6,ldr-rgba-00.png,28.4787,0.0138,0.0080,8.1503 -Small,6x6,ldr-rgba-01.png,31.9580,0.0121,0.0066,9.9417 -Small,6x6,ldr-rgba-02.png,27.7571,0.0148,0.0092,7.0997 -Small,6x6,ldr-xy-00.png,35.5281,0.0118,0.0039,16.9741 -Small,6x6,ldr-xy-01.png,36.2504,0.0123,0.0046,14.3278 -Small,6x6,ldr-xy-02.png,41.7327,0.0112,0.0031,20.9447 -Small,6x6,ldrs-rgba-00.png,28.4800,0.0136,0.0078,8.3924 -Small,6x6,ldrs-rgba-01.png,31.9643,0.0120,0.0064,10.2368 -Small,6x6,ldrs-rgba-02.png,27.7547,0.0148,0.0092,7.0980 -Small,8x8,hdr-rgb-00.hdr,23.5547,0.1126,0.0163,4.0226 -Small,8x8,ldr-rgb-00.png,27.6188,0.0183,0.0094,7.0092 -Small,8x8,ldr-rgb-01.png,28.6671,0.0169,0.0084,7.8188 -Small,8x8,ldr-rgb-02.png,23.0179,0.0217,0.0129,5.0634 -Small,8x8,ldr-rgb-03.png,37.0089,0.0113,0.0027,24.3621 -Small,8x8,ldr-rgb-04.png,29.0953,0.0164,0.0077,8.5036 -Small,8x8,ldr-rgb-05.png,25.5324,0.0223,0.0133,4.9365 -Small,8x8,ldr-rgb-06.png,23.0523,0.0223,0.0135,4.8692 -Small,8x8,ldr-rgb-07.png,29.3368,0.0166,0.0074,8.8983 -Small,8x8,ldr-rgb-08.png,33.7665,0.0124,0.0037,17.7788 -Small,8x8,ldr-rgb-09.png,28.4590,0.0160,0.0073,9.0230 -Small,8x8,ldr-rgb-10.png,31.8847,0.0088,0.0024,6.8560 -Small,8x8,ldr-rgba-00.png,24.9726,0.0210,0.0118,5.5638 -Small,8x8,ldr-rgba-01.png,28.1236,0.0179,0.0092,7.1375 -Small,8x8,ldr-rgba-02.png,23.8676,0.0232,0.0142,4.6120 -Small,8x8,ldr-xy-00.png,33.2085,0.0173,0.0051,12.7975 -Small,8x8,ldr-xy-01.png,33.9809,0.0175,0.0060,10.8433 -Small,8x8,ldr-xy-02.png,39.7786,0.0143,0.0026,25.2947 -Small,8x8,ldrs-rgba-00.png,24.9730,0.0213,0.0122,5.3635 -Small,8x8,ldrs-rgba-01.png,28.1260,0.0180,0.0089,7.3397 -Small,8x8,ldrs-rgba-02.png,23.8671,0.0230,0.0142,4.6302 -Small,12x12,hdr-rgb-00.hdr,20.4789,0.1228,0.0216,3.0361 -Small,12x12,ldr-rgb-00.png,23.6716,0.0212,0.0083,7.9017 -Small,12x12,ldr-rgb-01.png,24.7037,0.0187,0.0057,11.4138 -Small,12x12,ldr-rgb-02.png,19.1880,0.0277,0.0147,4.4494 -Small,12x12,ldr-rgb-03.png,33.1400,0.0152,0.0027,24.1206 -Small,12x12,ldr-rgb-04.png,24.3898,0.0192,0.0060,10.9282 -Small,12x12,ldr-rgb-05.png,21.3701,0.0254,0.0123,5.3118 -Small,12x12,ldr-rgb-06.png,19.1564,0.0286,0.0156,4.1878 -Small,12x12,ldr-rgb-07.png,25.2598,0.0191,0.0055,11.8359 -Small,12x12,ldr-rgb-08.png,29.9653,0.0161,0.0032,20.5824 -Small,12x12,ldr-rgb-09.png,23.5968,0.0213,0.0081,8.0560 -Small,12x12,ldr-rgb-10.png,27.2554,0.0128,0.0022,7.4844 -Small,12x12,ldr-rgba-00.png,21.1828,0.0267,0.0132,4.9634 -Small,12x12,ldr-rgba-01.png,24.4330,0.0207,0.0074,8.8453 -Small,12x12,ldr-rgba-02.png,20.1371,0.0322,0.0187,3.5059 -Small,12x12,ldr-xy-00.png,28.9405,0.0220,0.0050,12.9874 -Small,12x12,ldr-xy-01.png,29.6034,0.0214,0.0046,14.1639 -Small,12x12,ldr-xy-02.png,37.9716,0.0185,0.0019,33.7978 -Small,12x12,ldrs-rgba-00.png,21.1836,0.0270,0.0136,4.8288 -Small,12x12,ldrs-rgba-01.png,24.4339,0.0208,0.0078,8.4151 -Small,12x12,ldrs-rgba-02.png,20.1367,0.0319,0.0187,3.5140 -Small,3x3x3,ldr-l-00-3.dds,50.6012,0.0159,0.0104,25.1628 -Small,3x3x3,ldr-l-01-3.dds,53.7999,0.0075,0.0044,15.5367 -Small,6x6x6,ldr-l-00-3.dds,32.5074,0.0600,0.0394,6.6588 -Small,6x6x6,ldr-l-01-3.dds,40.7826,0.0340,0.0159,4.3448 diff --git a/Test/Images/Small/astc_reference-3.6-avx2_medium_results.csv b/Test/Images/Small/astc_reference-3.6-avx2_medium_results.csv deleted file mode 100644 index 3f123389e5a3356a65041bf01c2acc4a752b333c..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-avx2_medium_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.1340,0.1179,0.0259,2.5263 -Small,4x4,ldr-rgb-00.png,38.7318,0.0335,0.0275,2.3851 -Small,4x4,ldr-rgb-01.png,40.1460,0.0304,0.0247,2.6583 -Small,4x4,ldr-rgb-02.png,35.2180,0.0315,0.0259,2.5346 -Small,4x4,ldr-rgb-03.png,47.1925,0.0191,0.0136,4.8178 -Small,4x4,ldr-rgb-04.png,42.1729,0.0260,0.0201,3.2553 -Small,4x4,ldr-rgb-05.png,37.7672,0.0335,0.0277,2.3659 -Small,4x4,ldr-rgb-06.png,35.3468,0.0283,0.0224,2.9263 -Small,4x4,ldr-rgb-07.png,39.2464,0.0394,0.0330,1.9855 -Small,4x4,ldr-rgb-08.png,45.1732,0.0222,0.0165,3.9796 -Small,4x4,ldr-rgb-09.png,42.0914,0.0266,0.0209,3.1357 -Small,4x4,ldr-rgb-10.png,44.8767,0.0069,0.0035,4.6285 -Small,4x4,ldr-rgba-00.png,36.2349,0.0358,0.0296,2.2162 -Small,4x4,ldr-rgba-01.png,38.8941,0.0227,0.0168,3.9005 -Small,4x4,ldr-rgba-02.png,34.9204,0.0253,0.0192,3.4075 -Small,4x4,ldr-xy-00.png,37.7446,0.0236,0.0160,4.0957 -Small,4x4,ldr-xy-01.png,45.1462,0.0320,0.0247,2.6517 -Small,4x4,ldr-xy-02.png,50.9226,0.0382,0.0304,2.1593 -Small,4x4,ldrs-rgba-00.png,36.2418,0.0360,0.0296,2.2111 -Small,4x4,ldrs-rgba-01.png,38.9101,0.0233,0.0171,3.8289 -Small,4x4,ldrs-rgba-02.png,34.9259,0.0253,0.0194,3.3734 -Small,5x5,hdr-rgb-00.hdr,29.8514,0.1270,0.0328,1.9974 -Small,5x5,ldr-rgb-00.png,35.0732,0.0376,0.0301,2.1773 -Small,5x5,ldr-rgb-01.png,36.3975,0.0319,0.0247,2.6561 -Small,5x5,ldr-rgb-02.png,31.0670,0.0335,0.0261,2.5122 -Small,5x5,ldr-rgb-03.png,43.9478,0.0158,0.0086,7.5843 -Small,5x5,ldr-rgb-04.png,37.6667,0.0295,0.0222,2.9518 -Small,5x5,ldr-rgb-05.png,33.5193,0.0422,0.0347,1.8890 -Small,5x5,ldr-rgb-06.png,31.0773,0.0319,0.0244,2.6833 -Small,5x5,ldr-rgb-07.png,36.2042,0.0457,0.0380,1.7256 -Small,5x5,ldr-rgb-08.png,41.5462,0.0226,0.0153,4.2751 -Small,5x5,ldr-rgb-09.png,37.5873,0.0279,0.0206,3.1845 -Small,5x5,ldr-rgb-10.png,40.4902,0.0091,0.0042,3.9104 -Small,5x5,ldr-rgba-00.png,32.7858,0.0446,0.0367,1.7846 -Small,5x5,ldr-rgba-01.png,35.2722,0.0266,0.0191,3.4348 -Small,5x5,ldr-rgba-02.png,31.1225,0.0310,0.0234,2.7967 -Small,5x5,ldr-xy-00.png,37.0726,0.0247,0.0154,4.2446 -Small,5x5,ldr-xy-01.png,40.7191,0.0317,0.0227,2.8854 -Small,5x5,ldr-xy-02.png,49.0675,0.0259,0.0165,3.9832 -Small,5x5,ldrs-rgba-00.png,32.7887,0.0452,0.0371,1.7671 -Small,5x5,ldrs-rgba-01.png,35.2789,0.0270,0.0193,3.3965 -Small,5x5,ldrs-rgba-02.png,31.1234,0.0314,0.0238,2.7535 -Small,6x6,hdr-rgb-00.hdr,27.4769,0.1311,0.0355,1.8453 -Small,6x6,ldr-rgb-00.png,32.3560,0.0400,0.0318,2.0620 -Small,6x6,ldr-rgb-01.png,33.0687,0.0323,0.0246,2.6617 -Small,6x6,ldr-rgb-02.png,27.4381,0.0357,0.0278,2.3546 -Small,6x6,ldr-rgb-03.png,41.6538,0.0146,0.0071,9.2864 -Small,6x6,ldr-rgb-04.png,34.2059,0.0297,0.0217,3.0194 -Small,6x6,ldr-rgb-05.png,30.1377,0.0454,0.0372,1.7634 -Small,6x6,ldr-rgb-06.png,27.5024,0.0353,0.0271,2.4211 -Small,6x6,ldr-rgb-07.png,33.8577,0.0428,0.0343,1.9094 -Small,6x6,ldr-rgb-08.png,39.0752,0.0192,0.0114,5.7732 -Small,6x6,ldr-rgb-09.png,33.6699,0.0292,0.0212,3.0933 -Small,6x6,ldr-rgb-10.png,36.9333,0.0100,0.0045,3.6140 -Small,6x6,ldr-rgba-00.png,30.2558,0.0494,0.0407,1.6101 -Small,6x6,ldr-rgba-01.png,32.1716,0.0280,0.0200,3.2740 -Small,6x6,ldr-rgba-02.png,27.8426,0.0348,0.0267,2.4503 -Small,6x6,ldr-xy-00.png,36.2518,0.0235,0.0135,4.8384 -Small,6x6,ldr-xy-01.png,37.7318,0.0266,0.0172,3.8171 -Small,6x6,ldr-xy-02.png,46.0639,0.0217,0.0120,5.4796 -Small,6x6,ldrs-rgba-00.png,30.2570,0.0494,0.0409,1.6011 -Small,6x6,ldrs-rgba-01.png,32.1777,0.0283,0.0200,3.2699 -Small,6x6,ldrs-rgba-02.png,27.8427,0.0352,0.0270,2.4258 -Small,8x8,hdr-rgb-00.hdr,24.1157,0.1462,0.0450,1.4577 -Small,8x8,ldr-rgb-00.png,28.7123,0.0537,0.0418,1.5690 -Small,8x8,ldr-rgb-01.png,28.9240,0.0418,0.0305,2.1456 -Small,8x8,ldr-rgb-02.png,23.1517,0.0478,0.0363,1.8048 -Small,8x8,ldr-rgb-03.png,38.4615,0.0192,0.0080,8.2105 -Small,8x8,ldr-rgb-04.png,29.6546,0.0396,0.0280,2.3430 -Small,8x8,ldr-rgb-05.png,25.9295,0.0546,0.0431,1.5200 -Small,8x8,ldr-rgb-06.png,23.1918,0.0481,0.0362,1.8097 -Small,8x8,ldr-rgb-07.png,30.5823,0.0483,0.0363,1.8039 -Small,8x8,ldr-rgb-08.png,35.7743,0.0241,0.0126,5.2045 -Small,8x8,ldr-rgb-09.png,29.0115,0.0380,0.0266,2.4653 -Small,8x8,ldr-rgb-10.png,32.1619,0.0156,0.0064,2.5536 -Small,8x8,ldr-rgba-00.png,26.3940,0.0609,0.0486,1.3477 -Small,8x8,ldr-rgba-01.png,28.3383,0.0372,0.0255,2.5706 -Small,8x8,ldr-rgba-02.png,23.9368,0.0501,0.0385,1.7004 -Small,8x8,ldr-xy-00.png,34.0144,0.0347,0.0197,3.3198 -Small,8x8,ldr-xy-01.png,34.9127,0.0339,0.0195,3.3555 -Small,8x8,ldr-xy-02.png,41.7218,0.0262,0.0114,5.7357 -Small,8x8,ldrs-rgba-00.png,26.3943,0.0615,0.0492,1.3308 -Small,8x8,ldrs-rgba-01.png,28.3412,0.0373,0.0257,2.5515 -Small,8x8,ldrs-rgba-02.png,23.9363,0.0506,0.0386,1.6961 -Small,12x12,hdr-rgb-00.hdr,20.7645,0.1705,0.0619,1.0591 -Small,12x12,ldr-rgb-00.png,24.6670,0.0681,0.0475,1.3805 -Small,12x12,ldr-rgb-01.png,25.0227,0.0575,0.0379,1.7303 -Small,12x12,ldr-rgb-02.png,19.2621,0.0762,0.0563,1.1649 -Small,12x12,ldr-rgb-03.png,34.9308,0.0283,0.0085,7.6958 -Small,12x12,ldr-rgb-04.png,24.9126,0.0545,0.0349,1.8754 -Small,12x12,ldr-rgb-05.png,21.6505,0.0778,0.0576,1.1377 -Small,12x12,ldr-rgb-06.png,19.2451,0.0730,0.0530,1.2364 -Small,12x12,ldr-rgb-07.png,26.5693,0.0579,0.0374,1.7516 -Small,12x12,ldr-rgb-08.png,31.4927,0.0341,0.0138,4.7517 -Small,12x12,ldr-rgb-09.png,24.1078,0.0549,0.0354,1.8521 -Small,12x12,ldr-rgb-10.png,27.9831,0.0302,0.0126,1.2924 -Small,12x12,ldr-rgba-00.png,22.0878,0.0754,0.0552,1.1874 -Small,12x12,ldr-rgba-01.png,24.6267,0.0555,0.0351,1.8648 -Small,12x12,ldr-rgba-02.png,20.1804,0.0822,0.0619,1.0594 -Small,12x12,ldr-xy-00.png,30.0722,0.0469,0.0230,2.8522 -Small,12x12,ldr-xy-01.png,31.8391,0.0458,0.0222,2.9566 -Small,12x12,ldr-xy-02.png,38.5216,0.0293,0.0050,13.2077 -Small,12x12,ldrs-rgba-00.png,22.0882,0.0752,0.0546,1.2002 -Small,12x12,ldrs-rgba-01.png,24.6285,0.0556,0.0357,1.8362 -Small,12x12,ldrs-rgba-02.png,20.1803,0.0821,0.0618,1.0609 -Small,3x3x3,ldr-l-00-3.dds,51.9681,0.0240,0.0169,15.5243 -Small,3x3x3,ldr-l-01-3.dds,54.3395,0.0100,0.0052,13.3129 -Small,6x6x6,ldr-l-00-3.dds,32.9129,0.0739,0.0508,5.1617 -Small,6x6x6,ldr-l-01-3.dds,40.8871,0.0369,0.0163,4.2405 diff --git a/Test/Images/Small/astc_reference-3.6-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-3.6-avx2_thorough_results.csv deleted file mode 100644 index 2402002d67d6140b3a9796c8e152c91a30fbad47..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-avx2_thorough_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.3787,0.1460,0.0538,1.2176 -Small,4x4,ldr-rgb-00.png,39.1025,0.0650,0.0588,1.1145 -Small,4x4,ldr-rgb-01.png,40.3344,0.0634,0.0574,1.1420 -Small,4x4,ldr-rgb-02.png,35.3612,0.0595,0.0538,1.2188 -Small,4x4,ldr-rgb-03.png,47.6672,0.0590,0.0535,1.2256 -Small,4x4,ldr-rgb-04.png,42.3135,0.0584,0.0524,1.2507 -Small,4x4,ldr-rgb-05.png,37.9467,0.0673,0.0613,1.0692 -Small,4x4,ldr-rgb-06.png,35.4785,0.0559,0.0498,1.3165 -Small,4x4,ldr-rgb-07.png,39.8676,0.0735,0.0670,0.9779 -Small,4x4,ldr-rgb-08.png,45.7996,0.0564,0.0505,1.2987 -Small,4x4,ldr-rgb-09.png,42.2360,0.0622,0.0561,1.1684 -Small,4x4,ldr-rgb-10.png,44.9865,0.0107,0.0071,2.2809 -Small,4x4,ldr-rgba-00.png,36.7341,0.0670,0.0605,1.0830 -Small,4x4,ldr-rgba-01.png,39.0299,0.0547,0.0487,1.3449 -Small,4x4,ldr-rgba-02.png,34.9857,0.0543,0.0482,1.3603 -Small,4x4,ldr-xy-00.png,37.7552,0.0638,0.0561,1.1691 -Small,4x4,ldr-xy-01.png,45.2171,0.0713,0.0639,1.0249 -Small,4x4,ldr-xy-02.png,50.9992,0.0857,0.0778,0.8426 -Small,4x4,ldrs-rgba-00.png,36.7416,0.0675,0.0611,1.0729 -Small,4x4,ldrs-rgba-01.png,39.0514,0.0556,0.0494,1.3262 -Small,4x4,ldrs-rgba-02.png,34.9915,0.0544,0.0483,1.3559 -Small,5x5,hdr-rgb-00.hdr,30.2499,0.1593,0.0640,1.0237 -Small,5x5,ldr-rgb-00.png,35.3184,0.0780,0.0703,0.9318 -Small,5x5,ldr-rgb-01.png,36.4942,0.0745,0.0670,0.9778 -Small,5x5,ldr-rgb-02.png,31.1169,0.0710,0.0635,1.0328 -Small,5x5,ldr-rgb-03.png,44.4730,0.0685,0.0615,1.0657 -Small,5x5,ldr-rgb-04.png,37.8145,0.0707,0.0631,1.0384 -Small,5x5,ldr-rgb-05.png,33.6567,0.0798,0.0724,0.9055 -Small,5x5,ldr-rgb-06.png,31.1197,0.0677,0.0601,1.0904 -Small,5x5,ldr-rgb-07.png,36.7056,0.0885,0.0806,0.8127 -Small,5x5,ldr-rgb-08.png,42.2684,0.0653,0.0579,1.1310 -Small,5x5,ldr-rgb-09.png,37.6844,0.0730,0.0656,0.9996 -Small,5x5,ldr-rgb-10.png,40.6793,0.0145,0.0094,1.7368 -Small,5x5,ldr-rgba-00.png,33.1233,0.0816,0.0738,0.8886 -Small,5x5,ldr-rgba-01.png,35.3456,0.0673,0.0598,1.0963 -Small,5x5,ldr-rgba-02.png,31.1599,0.0670,0.0594,1.1034 -Small,5x5,ldr-xy-00.png,37.2902,0.0689,0.0596,1.0987 -Small,5x5,ldr-xy-01.png,41.5197,0.0845,0.0755,0.8684 -Small,5x5,ldr-xy-02.png,49.2647,0.0952,0.0856,0.7654 -Small,5x5,ldrs-rgba-00.png,33.1269,0.0828,0.0748,0.8760 -Small,5x5,ldrs-rgba-01.png,35.3541,0.0677,0.0601,1.0903 -Small,5x5,ldrs-rgba-02.png,31.1602,0.0676,0.0599,1.0946 -Small,6x6,hdr-rgb-00.hdr,27.6571,0.1700,0.0747,0.8769 -Small,6x6,ldr-rgb-00.png,32.6208,0.0899,0.0817,0.8018 -Small,6x6,ldr-rgb-01.png,33.1469,0.0829,0.0750,0.8733 -Small,6x6,ldr-rgb-02.png,27.4754,0.0811,0.0730,0.8975 -Small,6x6,ldr-rgb-03.png,42.5226,0.0574,0.0498,1.3170 -Small,6x6,ldr-rgb-04.png,34.3223,0.0801,0.0719,0.9111 -Small,6x6,ldr-rgb-05.png,30.2576,0.0907,0.0827,0.7924 -Small,6x6,ldr-rgb-06.png,27.5394,0.0784,0.0703,0.9323 -Small,6x6,ldr-rgb-07.png,34.3854,0.0954,0.0871,0.7528 -Small,6x6,ldr-rgb-08.png,39.8830,0.0569,0.0487,1.3461 -Small,6x6,ldr-rgb-09.png,33.7955,0.0776,0.0695,0.9436 -Small,6x6,ldr-rgb-10.png,37.1039,0.0177,0.0120,1.3545 -Small,6x6,ldr-rgba-00.png,30.5063,0.0954,0.0868,0.7550 -Small,6x6,ldr-rgba-01.png,32.2316,0.0789,0.0707,0.9263 -Small,6x6,ldr-rgba-02.png,27.8753,0.0815,0.0732,0.8949 -Small,6x6,ldr-xy-00.png,36.3838,0.0582,0.0481,1.3612 -Small,6x6,ldr-xy-01.png,38.0617,0.0824,0.0727,0.9011 -Small,6x6,ldr-xy-02.png,47.4738,0.1021,0.0920,0.7124 -Small,6x6,ldrs-rgba-00.png,30.5081,0.0951,0.0863,0.7590 -Small,6x6,ldrs-rgba-01.png,32.2377,0.0794,0.0712,0.9202 -Small,6x6,ldrs-rgba-02.png,27.8745,0.0817,0.0735,0.8920 -Small,8x8,hdr-rgb-00.hdr,24.3160,0.1959,0.0966,0.6786 -Small,8x8,ldr-rgb-00.png,28.9377,0.1142,0.1010,0.6492 -Small,8x8,ldr-rgb-01.png,28.9883,0.1019,0.0886,0.7399 -Small,8x8,ldr-rgb-02.png,23.1866,0.1062,0.0931,0.7043 -Small,8x8,ldr-rgb-03.png,39.3501,0.0393,0.0264,2.4834 -Small,8x8,ldr-rgb-04.png,29.7749,0.0947,0.0814,0.8054 -Small,8x8,ldr-rgb-05.png,26.0242,0.1114,0.0982,0.6674 -Small,8x8,ldr-rgb-06.png,23.2335,0.1062,0.0927,0.7073 -Small,8x8,ldr-rgb-07.png,31.1039,0.1068,0.0934,0.7018 -Small,8x8,ldr-rgb-08.png,36.4625,0.0551,0.0419,1.5655 -Small,8x8,ldr-rgb-09.png,29.1520,0.0819,0.0688,0.9526 -Small,8x8,ldr-rgb-10.png,32.3031,0.0266,0.0159,1.0210 -Small,8x8,ldr-rgba-00.png,26.6704,0.1200,0.1064,0.6159 -Small,8x8,ldr-rgba-01.png,28.3932,0.0943,0.0810,0.8086 -Small,8x8,ldr-rgba-02.png,23.9599,0.1129,0.0994,0.6596 -Small,8x8,ldr-xy-00.png,34.3120,0.0692,0.0539,1.2150 -Small,8x8,ldr-xy-01.png,35.2097,0.0717,0.0569,1.1515 -Small,8x8,ldr-xy-02.png,44.5878,0.0904,0.0751,0.8724 -Small,8x8,ldrs-rgba-00.png,26.6715,0.1208,0.1072,0.6111 -Small,8x8,ldrs-rgba-01.png,28.3959,0.0950,0.0817,0.8025 -Small,8x8,ldrs-rgba-02.png,23.9597,0.1132,0.0998,0.6566 -Small,12x12,hdr-rgb-00.hdr,21.0019,0.2375,0.1271,0.5158 -Small,12x12,ldr-rgb-00.png,25.0133,0.1454,0.1221,0.5367 -Small,12x12,ldr-rgb-01.png,25.1167,0.1226,0.0997,0.6572 -Small,12x12,ldr-rgb-02.png,19.2912,0.1467,0.1238,0.5295 -Small,12x12,ldr-rgb-03.png,36.1206,0.0493,0.0268,2.4446 -Small,12x12,ldr-rgb-04.png,25.0074,0.1225,0.0993,0.6599 -Small,12x12,ldr-rgb-05.png,21.7140,0.1455,0.1226,0.5345 -Small,12x12,ldr-rgb-06.png,19.2810,0.1436,0.1204,0.5445 -Small,12x12,ldr-rgb-07.png,27.0419,0.1313,0.1080,0.6068 -Small,12x12,ldr-rgb-08.png,32.3840,0.0654,0.0425,1.5438 -Small,12x12,ldr-rgb-09.png,24.3053,0.1157,0.0927,0.7071 -Small,12x12,ldr-rgb-10.png,28.1356,0.0468,0.0265,0.6144 -Small,12x12,ldr-rgba-00.png,22.7010,0.1541,0.1308,0.5012 -Small,12x12,ldr-rgba-01.png,24.7078,0.1159,0.0924,0.7092 -Small,12x12,ldr-rgba-02.png,20.1958,0.1509,0.1276,0.5134 -Small,12x12,ldr-xy-00.png,30.5742,0.0937,0.0687,0.9536 -Small,12x12,ldr-xy-01.png,32.1255,0.0721,0.0475,1.3803 -Small,12x12,ldr-xy-02.png,40.3053,0.0548,0.0300,2.1856 -Small,12x12,ldrs-rgba-00.png,22.7006,0.1559,0.1325,0.4948 -Small,12x12,ldrs-rgba-01.png,24.7093,0.1166,0.0933,0.7025 -Small,12x12,ldrs-rgba-02.png,20.1960,0.1511,0.1278,0.5129 -Small,3x3x3,ldr-l-00-3.dds,52.4159,0.0459,0.0385,6.8145 -Small,3x3x3,ldr-l-01-3.dds,55.3973,0.0203,0.0154,4.4842 -Small,6x6x6,ldr-l-00-3.dds,33.2725,0.1075,0.0821,3.1948 -Small,6x6x6,ldr-l-01-3.dds,41.5751,0.0410,0.0177,3.8888 diff --git a/Test/Images/Small/astc_reference-3.6-sse2_fast_results.csv b/Test/Images/Small/astc_reference-3.6-sse2_fast_results.csv deleted file mode 100644 index 14b3480129dd9bbc810fcb231323f0f1bdd2360d..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse2_fast_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.6884,0.1115,0.0192,3.4199 -Small,4x4,ldr-rgb-00.png,38.1103,0.0173,0.0121,5.4103 -Small,4x4,ldr-rgb-01.png,39.8105,0.0153,0.0104,6.2726 -Small,4x4,ldr-rgb-02.png,35.0374,0.0215,0.0166,3.9439 -Small,4x4,ldr-rgb-03.png,45.9704,0.0088,0.0042,15.6706 -Small,4x4,ldr-rgb-04.png,41.9106,0.0127,0.0076,8.5803 -Small,4x4,ldr-rgb-05.png,37.2317,0.0207,0.0156,4.1951 -Small,4x4,ldr-rgb-06.png,35.2059,0.0205,0.0152,4.3082 -Small,4x4,ldr-rgb-07.png,38.0309,0.0217,0.0161,4.0587 -Small,4x4,ldr-rgb-08.png,43.6358,0.0109,0.0060,10.8446 -Small,4x4,ldr-rgb-09.png,41.8533,0.0126,0.0076,8.5792 -Small,4x4,ldr-rgb-10.png,44.3464,0.0046,0.0019,8.3752 -Small,4x4,ldr-rgba-00.png,35.5182,0.0208,0.0154,4.2625 -Small,4x4,ldr-rgba-01.png,38.7956,0.0147,0.0095,6.8833 -Small,4x4,ldr-rgba-02.png,34.8333,0.0190,0.0138,4.7645 -Small,4x4,ldr-xy-00.png,37.5697,0.0150,0.0073,8.9715 -Small,4x4,ldr-xy-01.png,44.1378,0.0162,0.0089,7.3960 -Small,4x4,ldr-xy-02.png,48.1786,0.0131,0.0052,12.6666 -Small,4x4,ldrs-rgba-00.png,35.5254,0.0210,0.0155,4.2254 -Small,4x4,ldrs-rgba-01.png,38.8141,0.0149,0.0097,6.7445 -Small,4x4,ldrs-rgba-02.png,34.8386,0.0189,0.0137,4.7704 -Small,5x5,hdr-rgb-00.hdr,29.4686,0.1171,0.0234,2.7990 -Small,5x5,ldr-rgb-00.png,34.3042,0.0189,0.0127,5.1522 -Small,5x5,ldr-rgb-01.png,36.1808,0.0154,0.0096,6.8567 -Small,5x5,ldr-rgb-02.png,31.0160,0.0215,0.0156,4.2010 -Small,5x5,ldr-rgb-03.png,42.6231,0.0093,0.0036,18.2510 -Small,5x5,ldr-rgb-04.png,37.2434,0.0141,0.0080,8.1605 -Small,5x5,ldr-rgb-05.png,33.1823,0.0239,0.0178,3.6842 -Small,5x5,ldr-rgb-06.png,31.0247,0.0211,0.0148,4.4200 -Small,5x5,ldr-rgb-07.png,35.1883,0.0209,0.0144,4.5609 -Small,5x5,ldr-rgb-08.png,40.0310,0.0116,0.0055,11.8748 -Small,5x5,ldr-rgb-09.png,37.2810,0.0139,0.0081,8.0709 -Small,5x5,ldr-rgb-10.png,40.1234,0.0055,0.0020,8.3231 -Small,5x5,ldr-rgba-00.png,32.0072,0.0238,0.0174,3.7613 -Small,5x5,ldr-rgba-01.png,35.1428,0.0163,0.0101,6.4810 -Small,5x5,ldr-rgba-02.png,31.1062,0.0217,0.0154,4.2672 -Small,5x5,ldr-xy-00.png,36.7258,0.0155,0.0061,10.7207 -Small,5x5,ldr-xy-01.png,39.8638,0.0163,0.0074,8.8456 -Small,5x5,ldr-xy-02.png,43.9171,0.0144,0.0056,11.7469 -Small,5x5,ldrs-rgba-00.png,32.0096,0.0240,0.0175,3.7496 -Small,5x5,ldrs-rgba-01.png,35.1497,0.0164,0.0102,6.4064 -Small,5x5,ldrs-rgba-02.png,31.1070,0.0217,0.0155,4.2385 -Small,6x6,hdr-rgb-00.hdr,26.9904,0.1216,0.0273,2.3970 -Small,6x6,ldr-rgb-00.png,31.5938,0.0235,0.0167,3.9293 -Small,6x6,ldr-rgb-01.png,32.8896,0.0190,0.0125,5.2311 -Small,6x6,ldr-rgb-02.png,27.4079,0.0263,0.0196,3.3364 -Small,6x6,ldr-rgb-03.png,40.4899,0.0105,0.0041,16.0588 -Small,6x6,ldr-rgb-04.png,33.9065,0.0166,0.0100,6.5413 -Small,6x6,ldr-rgb-05.png,29.9329,0.0298,0.0230,2.8438 -Small,6x6,ldr-rgb-06.png,27.4651,0.0262,0.0195,3.3579 -Small,6x6,ldr-rgb-07.png,32.8824,0.0224,0.0155,4.2393 -Small,6x6,ldr-rgb-08.png,37.6380,0.0123,0.0060,10.9574 -Small,6x6,ldr-rgb-09.png,33.4716,0.0169,0.0105,6.2707 -Small,6x6,ldr-rgb-10.png,36.6590,0.0067,0.0026,6.2114 -Small,6x6,ldr-rgba-00.png,29.4788,0.0293,0.0222,2.9547 -Small,6x6,ldr-rgba-01.png,32.0575,0.0195,0.0128,5.1171 -Small,6x6,ldr-rgba-02.png,27.8275,0.0267,0.0199,3.2868 -Small,6x6,ldr-xy-00.png,35.6827,0.0165,0.0068,9.6195 -Small,6x6,ldr-xy-01.png,37.1053,0.0189,0.0099,6.6005 -Small,6x6,ldr-xy-02.png,41.9446,0.0146,0.0053,12.3864 -Small,6x6,ldrs-rgba-00.png,29.4790,0.0297,0.0223,2.9354 -Small,6x6,ldrs-rgba-01.png,32.0640,0.0196,0.0127,5.1575 -Small,6x6,ldrs-rgba-02.png,27.8273,0.0269,0.0201,3.2610 -Small,8x8,hdr-rgb-00.hdr,23.7216,0.1376,0.0383,1.7105 -Small,8x8,ldr-rgb-00.png,27.9814,0.0327,0.0219,2.9978 -Small,8x8,ldr-rgb-01.png,28.7458,0.0279,0.0177,3.7035 -Small,8x8,ldr-rgb-02.png,23.0937,0.0395,0.0287,2.2857 -Small,8x8,ldr-rgb-03.png,37.2544,0.0148,0.0045,14.5731 -Small,8x8,ldr-rgb-04.png,29.3419,0.0261,0.0156,4.2086 -Small,8x8,ldr-rgb-05.png,25.7747,0.0431,0.0325,2.0139 -Small,8x8,ldr-rgb-06.png,23.1468,0.0395,0.0288,2.2749 -Small,8x8,ldr-rgb-07.png,29.6508,0.0261,0.0152,4.3195 -Small,8x8,ldr-rgb-08.png,34.2150,0.0179,0.0075,8.7302 -Small,8x8,ldr-rgb-09.png,28.6635,0.0278,0.0174,3.7649 -Small,8x8,ldr-rgb-10.png,31.9974,0.0115,0.0034,4.8152 -Small,8x8,ldr-rgba-00.png,25.3599,0.0403,0.0292,2.2446 -Small,8x8,ldr-rgba-01.png,28.2399,0.0298,0.0189,3.4703 -Small,8x8,ldr-rgba-02.png,23.9241,0.0403,0.0294,2.2322 -Small,8x8,ldr-xy-00.png,33.3965,0.0239,0.0101,6.4670 -Small,8x8,ldr-xy-01.png,34.2472,0.0254,0.0120,5.4659 -Small,8x8,ldr-xy-02.png,39.9005,0.0176,0.0039,16.8823 -Small,8x8,ldrs-rgba-00.png,25.3610,0.0406,0.0294,2.2276 -Small,8x8,ldrs-rgba-01.png,28.2419,0.0296,0.0190,3.4522 -Small,8x8,ldrs-rgba-02.png,23.9237,0.0405,0.0297,2.2089 -Small,12x12,hdr-rgb-00.hdr,20.5637,0.1572,0.0515,1.2736 -Small,12x12,ldr-rgb-00.png,23.7825,0.0345,0.0170,3.8539 -Small,12x12,ldr-rgb-01.png,24.7588,0.0286,0.0116,5.6706 -Small,12x12,ldr-rgb-02.png,19.2226,0.0491,0.0315,2.0796 -Small,12x12,ldr-rgb-03.png,33.2364,0.0203,0.0032,20.4995 -Small,12x12,ldr-rgb-04.png,24.5606,0.0291,0.0116,5.6331 -Small,12x12,ldr-rgb-05.png,21.4885,0.0439,0.0268,2.4479 -Small,12x12,ldr-rgb-06.png,19.2097,0.0511,0.0334,1.9615 -Small,12x12,ldr-rgb-07.png,25.3456,0.0275,0.0100,6.5510 -Small,12x12,ldr-rgb-08.png,30.1535,0.0224,0.0049,13.4382 -Small,12x12,ldr-rgb-09.png,23.7136,0.0344,0.0171,3.8218 -Small,12x12,ldr-rgb-10.png,27.3052,0.0187,0.0041,3.9581 -Small,12x12,ldr-rgba-00.png,21.3632,0.0478,0.0296,2.2128 -Small,12x12,ldr-rgba-01.png,24.4867,0.0312,0.0140,4.6822 -Small,12x12,ldr-rgba-02.png,20.1666,0.0568,0.0392,1.6700 -Small,12x12,ldr-xy-00.png,29.0651,0.0302,0.0088,7.4195 -Small,12x12,ldr-xy-01.png,30.4241,0.0293,0.0081,8.1349 -Small,12x12,ldr-xy-02.png,37.9951,0.0235,0.0023,28.2100 -Small,12x12,ldrs-rgba-00.png,21.3658,0.0476,0.0300,2.1875 -Small,12x12,ldrs-rgba-01.png,24.4885,0.0316,0.0145,4.5250 -Small,12x12,ldrs-rgba-02.png,20.1665,0.0568,0.0393,1.6667 -Small,3x3x3,ldr-l-00-3.dds,50.7551,0.0237,0.0170,15.4639 -Small,3x3x3,ldr-l-01-3.dds,53.8676,0.0112,0.0072,9.5657 -Small,6x6x6,ldr-l-00-3.dds,32.5264,0.0908,0.0675,3.8859 -Small,6x6x6,ldr-l-01-3.dds,40.7893,0.0464,0.0260,2.6471 diff --git a/Test/Images/Small/astc_reference-3.6-sse2_fastest_results.csv b/Test/Images/Small/astc_reference-3.6-sse2_fastest_results.csv deleted file mode 100644 index ee5a4463114837e32db552ed0af7a7eb6adb34ac..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse2_fastest_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.2999,0.1039,0.0122,5.3631 -Small,4x4,ldr-rgb-00.png,37.0084,0.0118,0.0073,9.0109 -Small,4x4,ldr-rgb-01.png,39.4162,0.0112,0.0069,9.4626 -Small,4x4,ldr-rgb-02.png,34.6448,0.0145,0.0103,6.3925 -Small,4x4,ldr-rgb-03.png,45.3559,0.0074,0.0033,20.1597 -Small,4x4,ldr-rgb-04.png,41.6390,0.0098,0.0053,12.4763 -Small,4x4,ldr-rgb-05.png,36.7213,0.0144,0.0100,6.5282 -Small,4x4,ldr-rgb-06.png,34.6994,0.0144,0.0098,6.6833 -Small,4x4,ldr-rgb-07.png,37.1808,0.0143,0.0095,6.9307 -Small,4x4,ldr-rgb-08.png,42.6915,0.0087,0.0044,14.8880 -Small,4x4,ldr-rgb-09.png,41.6433,0.0099,0.0054,12.1252 -Small,4x4,ldr-rgb-10.png,43.8818,0.0038,0.0018,8.9361 -Small,4x4,ldr-rgba-00.png,34.5700,0.0135,0.0088,7.4754 -Small,4x4,ldr-rgba-01.png,38.5857,0.0119,0.0072,9.1086 -Small,4x4,ldr-rgba-02.png,34.5224,0.0149,0.0102,6.4466 -Small,4x4,ldr-xy-00.png,37.5264,0.0122,0.0053,12.3419 -Small,4x4,ldr-xy-01.png,43.8563,0.0128,0.0061,10.7399 -Small,4x4,ldr-xy-02.png,48.1786,0.0116,0.0045,14.5377 -Small,4x4,ldrs-rgba-00.png,34.5750,0.0137,0.0087,7.5278 -Small,4x4,ldrs-rgba-01.png,38.6025,0.0120,0.0073,8.9493 -Small,4x4,ldrs-rgba-02.png,34.5263,0.0148,0.0102,6.3974 -Small,5x5,hdr-rgb-00.hdr,28.8076,0.1070,0.0146,4.4838 -Small,5x5,ldr-rgb-00.png,33.4478,0.0129,0.0076,8.6198 -Small,5x5,ldr-rgb-01.png,35.9999,0.0119,0.0069,9.5074 -Small,5x5,ldr-rgb-02.png,30.8748,0.0160,0.0110,5.9740 -Small,5x5,ldr-rgb-03.png,42.2547,0.0078,0.0031,20.8241 -Small,5x5,ldr-rgb-04.png,36.9224,0.0116,0.0064,10.2708 -Small,5x5,ldr-rgb-05.png,32.6193,0.0167,0.0116,5.6717 -Small,5x5,ldr-rgb-06.png,30.8711,0.0161,0.0108,6.0598 -Small,5x5,ldr-rgb-07.png,34.2652,0.0152,0.0098,6.7099 -Small,5x5,ldr-rgb-08.png,39.3139,0.0091,0.0040,16.2342 -Small,5x5,ldr-rgb-09.png,36.9835,0.0112,0.0061,10.7880 -Small,5x5,ldr-rgb-10.png,39.7373,0.0043,0.0016,9.8873 -Small,5x5,ldr-rgba-00.png,30.7473,0.0153,0.0097,6.7724 -Small,5x5,ldr-rgba-01.png,34.9846,0.0132,0.0081,8.0740 -Small,5x5,ldr-rgba-02.png,31.0020,0.0171,0.0119,5.5113 -Small,5x5,ldr-xy-00.png,36.5568,0.0132,0.0049,13.3042 -Small,5x5,ldr-xy-01.png,38.8334,0.0133,0.0054,12.0518 -Small,5x5,ldr-xy-02.png,43.7233,0.0123,0.0044,14.7967 -Small,5x5,ldrs-rgba-00.png,30.7497,0.0154,0.0099,6.6527 -Small,5x5,ldrs-rgba-01.png,34.9913,0.0136,0.0082,7.9728 -Small,5x5,ldrs-rgba-02.png,31.0030,0.0173,0.0120,5.4396 -Small,6x6,hdr-rgb-00.hdr,26.7122,0.1078,0.0151,4.3434 -Small,6x6,ldr-rgb-00.png,31.1052,0.0142,0.0087,7.5720 -Small,6x6,ldr-rgb-01.png,32.7949,0.0132,0.0078,8.4443 -Small,6x6,ldr-rgb-02.png,27.3228,0.0178,0.0126,5.2050 -Small,6x6,ldr-rgb-03.png,40.2037,0.0080,0.0029,22.7869 -Small,6x6,ldr-rgb-04.png,33.7349,0.0123,0.0070,9.4136 -Small,6x6,ldr-rgb-05.png,29.5304,0.0183,0.0129,5.0634 -Small,6x6,ldr-rgb-06.png,27.3791,0.0178,0.0122,5.3604 -Small,6x6,ldr-rgb-07.png,32.0586,0.0151,0.0095,6.8949 -Small,6x6,ldr-rgb-08.png,37.0422,0.0091,0.0038,17.1199 -Small,6x6,ldr-rgb-09.png,33.2804,0.0122,0.0067,9.7278 -Small,6x6,ldr-rgb-10.png,36.4903,0.0049,0.0019,8.5743 -Small,6x6,ldr-rgba-00.png,28.4787,0.0167,0.0109,6.0185 -Small,6x6,ldr-rgba-01.png,31.9580,0.0147,0.0091,7.1899 -Small,6x6,ldr-rgba-02.png,27.7571,0.0187,0.0129,5.0775 -Small,6x6,ldr-xy-00.png,35.5281,0.0135,0.0051,12.8881 -Small,6x6,ldr-xy-01.png,36.2504,0.0142,0.0062,10.5076 -Small,6x6,ldr-xy-02.png,41.7327,0.0122,0.0040,16.5579 -Small,6x6,ldrs-rgba-00.png,28.4800,0.0168,0.0110,5.9747 -Small,6x6,ldrs-rgba-01.png,31.9643,0.0147,0.0092,7.1151 -Small,6x6,ldrs-rgba-02.png,27.7547,0.0186,0.0128,5.1160 -Small,8x8,hdr-rgb-00.hdr,23.5547,0.1194,0.0234,2.8026 -Small,8x8,ldr-rgb-00.png,27.6188,0.0219,0.0129,5.0650 -Small,8x8,ldr-rgb-01.png,28.6671,0.0202,0.0117,5.5932 -Small,8x8,ldr-rgb-02.png,23.0179,0.0277,0.0190,3.4580 -Small,8x8,ldr-rgb-03.png,37.0089,0.0120,0.0035,18.5228 -Small,8x8,ldr-rgb-04.png,29.0953,0.0196,0.0108,6.0767 -Small,8x8,ldr-rgb-05.png,25.5324,0.0280,0.0189,3.4629 -Small,8x8,ldr-rgb-06.png,23.0523,0.0284,0.0191,3.4260 -Small,8x8,ldr-rgb-07.png,29.3368,0.0198,0.0105,6.2410 -Small,8x8,ldr-rgb-08.png,33.7665,0.0139,0.0049,13.4850 -Small,8x8,ldr-rgb-09.png,28.4590,0.0193,0.0105,6.2617 -Small,8x8,ldr-rgb-10.png,31.8847,0.0090,0.0027,6.0655 -Small,8x8,ldr-rgba-00.png,24.9726,0.0263,0.0169,3.8667 -Small,8x8,ldr-rgba-01.png,28.1236,0.0218,0.0125,5.2341 -Small,8x8,ldr-rgba-02.png,23.8676,0.0289,0.0197,3.3199 -Small,8x8,ldr-xy-00.png,33.2085,0.0195,0.0073,9.0245 -Small,8x8,ldr-xy-01.png,33.9809,0.0198,0.0081,8.1207 -Small,8x8,ldr-xy-02.png,39.7786,0.0150,0.0032,20.2697 -Small,8x8,ldrs-rgba-00.png,24.9730,0.0260,0.0167,3.9354 -Small,8x8,ldrs-rgba-01.png,28.1260,0.0218,0.0127,5.1542 -Small,8x8,ldrs-rgba-02.png,23.8671,0.0290,0.0199,3.2905 -Small,12x12,hdr-rgb-00.hdr,20.4789,0.1335,0.0315,2.0777 -Small,12x12,ldr-rgb-00.png,23.6716,0.0248,0.0117,5.6119 -Small,12x12,ldr-rgb-01.png,24.7037,0.0212,0.0084,7.7915 -Small,12x12,ldr-rgb-02.png,19.1880,0.0342,0.0212,3.0928 -Small,12x12,ldr-rgb-03.png,33.1400,0.0157,0.0031,20.8446 -Small,12x12,ldr-rgb-04.png,24.3898,0.0216,0.0087,7.5414 -Small,12x12,ldr-rgb-05.png,21.3701,0.0309,0.0176,3.7255 -Small,12x12,ldr-rgb-06.png,19.1564,0.0362,0.0226,2.9042 -Small,12x12,ldr-rgb-07.png,25.2598,0.0213,0.0077,8.4737 -Small,12x12,ldr-rgb-08.png,29.9653,0.0170,0.0042,15.5439 -Small,12x12,ldr-rgb-09.png,23.5968,0.0247,0.0116,5.6496 -Small,12x12,ldr-rgb-10.png,27.2554,0.0138,0.0032,5.0754 -Small,12x12,ldr-rgba-00.png,21.1828,0.0323,0.0186,3.5231 -Small,12x12,ldr-rgba-01.png,24.4330,0.0239,0.0104,6.2816 -Small,12x12,ldr-rgba-02.png,20.1371,0.0406,0.0271,2.4215 -Small,12x12,ldr-xy-00.png,28.9405,0.0241,0.0071,9.2071 -Small,12x12,ldr-xy-01.png,29.6034,0.0227,0.0063,10.3435 -Small,12x12,ldr-xy-02.png,37.9716,0.0188,0.0022,29.5727 -Small,12x12,ldrs-rgba-00.png,21.1836,0.0325,0.0189,3.4613 -Small,12x12,ldrs-rgba-01.png,24.4339,0.0241,0.0107,6.1163 -Small,12x12,ldrs-rgba-02.png,20.1367,0.0405,0.0271,2.4223 -Small,3x3x3,ldr-l-00-3.dds,50.6012,0.0210,0.0150,17.4379 -Small,3x3x3,ldr-l-01-3.dds,53.7999,0.0097,0.0065,10.6278 -Small,6x6x6,ldr-l-00-3.dds,32.5074,0.0872,0.0658,3.9842 -Small,6x6x6,ldr-l-01-3.dds,40.7826,0.0439,0.0255,2.7029 diff --git a/Test/Images/Small/astc_reference-3.6-sse2_medium_results.csv b/Test/Images/Small/astc_reference-3.6-sse2_medium_results.csv deleted file mode 100644 index 9b2f333c1a2ad34039637073128a7a152b876344..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse2_medium_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.1340,0.1279,0.0350,1.8729 -Small,4x4,ldr-rgb-00.png,38.7318,0.0421,0.0361,1.8164 -Small,4x4,ldr-rgb-01.png,40.1460,0.0391,0.0334,1.9646 -Small,4x4,ldr-rgb-02.png,35.2180,0.0407,0.0349,1.8779 -Small,4x4,ldr-rgb-03.png,47.1925,0.0241,0.0186,3.5295 -Small,4x4,ldr-rgb-04.png,42.1729,0.0334,0.0274,2.3937 -Small,4x4,ldr-rgb-05.png,37.7672,0.0435,0.0376,1.7432 -Small,4x4,ldr-rgb-06.png,35.3468,0.0366,0.0305,2.1457 -Small,4x4,ldr-rgb-07.png,39.2464,0.0506,0.0442,1.4819 -Small,4x4,ldr-rgb-08.png,45.1732,0.0282,0.0224,2.9244 -Small,4x4,ldr-rgb-09.png,42.0914,0.0342,0.0282,2.3269 -Small,4x4,ldr-rgb-10.png,44.8767,0.0079,0.0044,3.7022 -Small,4x4,ldr-rgba-00.png,36.2349,0.0458,0.0395,1.6588 -Small,4x4,ldr-rgba-01.png,38.8941,0.0283,0.0224,2.9266 -Small,4x4,ldr-rgba-02.png,34.9204,0.0321,0.0261,2.5156 -Small,4x4,ldr-xy-00.png,37.7446,0.0288,0.0211,3.1110 -Small,4x4,ldr-xy-01.png,45.1462,0.0398,0.0323,2.0269 -Small,4x4,ldr-xy-02.png,50.9226,0.0478,0.0398,1.6482 -Small,4x4,ldrs-rgba-00.png,36.2418,0.0465,0.0401,1.6357 -Small,4x4,ldrs-rgba-01.png,38.9101,0.0289,0.0228,2.8793 -Small,4x4,ldrs-rgba-02.png,34.9259,0.0326,0.0265,2.4741 -Small,5x5,hdr-rgb-00.hdr,29.8514,0.1424,0.0478,1.3714 -Small,5x5,ldr-rgb-00.png,35.0732,0.0515,0.0437,1.4991 -Small,5x5,ldr-rgb-01.png,36.3975,0.0436,0.0360,1.8218 -Small,5x5,ldr-rgb-02.png,31.0670,0.0459,0.0384,1.7070 -Small,5x5,ldr-rgb-03.png,43.9478,0.0193,0.0122,5.3551 -Small,5x5,ldr-rgb-04.png,37.6667,0.0401,0.0325,2.0193 -Small,5x5,ldr-rgb-05.png,33.5193,0.0593,0.0516,1.2694 -Small,5x5,ldr-rgb-06.png,31.0773,0.0436,0.0360,1.8196 -Small,5x5,ldr-rgb-07.png,36.2042,0.0635,0.0556,1.1785 -Small,5x5,ldr-rgb-08.png,41.5462,0.0291,0.0217,3.0183 -Small,5x5,ldr-rgb-09.png,37.5873,0.0373,0.0300,2.1850 -Small,5x5,ldr-rgb-10.png,40.4902,0.0103,0.0054,3.0329 -Small,5x5,ldr-rgba-00.png,32.7858,0.0608,0.0530,1.2363 -Small,5x5,ldr-rgba-01.png,35.2722,0.0352,0.0276,2.3705 -Small,5x5,ldr-rgba-02.png,31.1225,0.0419,0.0344,1.9064 -Small,5x5,ldr-xy-00.png,37.0726,0.0314,0.0220,2.9753 -Small,5x5,ldr-xy-01.png,40.7191,0.0418,0.0325,2.0150 -Small,5x5,ldr-xy-02.png,49.0675,0.0329,0.0231,2.8332 -Small,5x5,ldrs-rgba-00.png,32.7887,0.0625,0.0547,1.1983 -Small,5x5,ldrs-rgba-01.png,35.2789,0.0358,0.0280,2.3378 -Small,5x5,ldrs-rgba-02.png,31.1234,0.0422,0.0346,1.8950 -Small,6x6,hdr-rgb-00.hdr,27.4769,0.1489,0.0534,1.2276 -Small,6x6,ldr-rgb-00.png,32.3560,0.0546,0.0465,1.4083 -Small,6x6,ldr-rgb-01.png,33.0687,0.0445,0.0367,1.7867 -Small,6x6,ldr-rgb-02.png,27.4381,0.0499,0.0416,1.5756 -Small,6x6,ldr-rgb-03.png,41.6538,0.0174,0.0096,6.8473 -Small,6x6,ldr-rgb-04.png,34.2059,0.0398,0.0316,2.0710 -Small,6x6,ldr-rgb-05.png,30.1377,0.0642,0.0561,1.1675 -Small,6x6,ldr-rgb-06.png,27.5024,0.0487,0.0405,1.6198 -Small,6x6,ldr-rgb-07.png,33.8577,0.0600,0.0516,1.2702 -Small,6x6,ldr-rgb-08.png,39.0752,0.0239,0.0161,4.0784 -Small,6x6,ldr-rgb-09.png,33.6699,0.0389,0.0309,2.1237 -Small,6x6,ldr-rgb-10.png,36.9333,0.0116,0.0060,2.7120 -Small,6x6,ldr-rgba-00.png,30.2558,0.0679,0.0596,1.1001 -Small,6x6,ldr-rgba-01.png,32.1716,0.0378,0.0296,2.2150 -Small,6x6,ldr-rgba-02.png,27.8426,0.0480,0.0398,1.6463 -Small,6x6,ldr-xy-00.png,36.2518,0.0299,0.0197,3.3289 -Small,6x6,ldr-xy-01.png,37.7318,0.0341,0.0243,2.7022 -Small,6x6,ldr-xy-02.png,46.0639,0.0262,0.0161,4.0683 -Small,6x6,ldrs-rgba-00.png,30.2570,0.0694,0.0610,1.0736 -Small,6x6,ldrs-rgba-01.png,32.1777,0.0380,0.0297,2.2032 -Small,6x6,ldrs-rgba-02.png,27.8427,0.0479,0.0398,1.6449 -Small,8x8,hdr-rgb-00.hdr,24.1157,0.1696,0.0700,0.9368 -Small,8x8,ldr-rgb-00.png,28.7123,0.0743,0.0623,1.0512 -Small,8x8,ldr-rgb-01.png,28.9240,0.0576,0.0461,1.4225 -Small,8x8,ldr-rgb-02.png,23.1517,0.0677,0.0560,1.1703 -Small,8x8,ldr-rgb-03.png,38.4615,0.0226,0.0115,5.7217 -Small,8x8,ldr-rgb-04.png,29.6546,0.0549,0.0429,1.5285 -Small,8x8,ldr-rgb-05.png,25.9295,0.0771,0.0654,1.0019 -Small,8x8,ldr-rgb-06.png,23.1918,0.0670,0.0554,1.1836 -Small,8x8,ldr-rgb-07.png,30.5823,0.0669,0.0549,1.1928 -Small,8x8,ldr-rgb-08.png,35.7743,0.0302,0.0187,3.4968 -Small,8x8,ldr-rgb-09.png,29.0115,0.0511,0.0395,1.6584 -Small,8x8,ldr-rgb-10.png,32.1619,0.0185,0.0090,1.7986 -Small,8x8,ldr-rgba-00.png,26.3940,0.0861,0.0741,0.8849 -Small,8x8,ldr-rgba-01.png,28.3383,0.0507,0.0388,1.6886 -Small,8x8,ldr-rgba-02.png,23.9368,0.0707,0.0588,1.1143 -Small,8x8,ldr-xy-00.png,34.0144,0.0441,0.0291,2.2536 -Small,8x8,ldr-xy-01.png,34.9127,0.0433,0.0286,2.2919 -Small,8x8,ldr-xy-02.png,41.7218,0.0312,0.0162,4.0404 -Small,8x8,ldrs-rgba-00.png,26.3943,0.0858,0.0735,0.8910 -Small,8x8,ldrs-rgba-01.png,28.3412,0.0508,0.0389,1.6851 -Small,8x8,ldrs-rgba-02.png,23.9363,0.0710,0.0592,1.1077 -Small,12x12,hdr-rgb-00.hdr,20.7645,0.1993,0.0920,0.7123 -Small,12x12,ldr-rgb-00.png,24.6670,0.0911,0.0707,0.9266 -Small,12x12,ldr-rgb-01.png,25.0227,0.0778,0.0578,1.1329 -Small,12x12,ldr-rgb-02.png,19.2621,0.1046,0.0845,0.7752 -Small,12x12,ldr-rgb-03.png,34.9308,0.0312,0.0120,5.4654 -Small,12x12,ldr-rgb-04.png,24.9126,0.0718,0.0519,1.2637 -Small,12x12,ldr-rgb-05.png,21.6505,0.1057,0.0858,0.7640 -Small,12x12,ldr-rgb-06.png,19.2451,0.1013,0.0812,0.8068 -Small,12x12,ldr-rgb-07.png,26.5693,0.0767,0.0564,1.1621 -Small,12x12,ldr-rgb-08.png,31.4927,0.0400,0.0198,3.3163 -Small,12x12,ldr-rgb-09.png,24.1078,0.0731,0.0532,1.2311 -Small,12x12,ldr-rgb-10.png,27.9831,0.0364,0.0188,0.8651 -Small,12x12,ldr-rgba-00.png,22.0878,0.1026,0.0819,0.8001 -Small,12x12,ldr-rgba-01.png,24.6267,0.0741,0.0540,1.2146 -Small,12x12,ldr-rgba-02.png,20.1804,0.1108,0.0905,0.7244 -Small,12x12,ldr-xy-00.png,30.0722,0.0574,0.0332,1.9725 -Small,12x12,ldr-xy-01.png,31.8391,0.0563,0.0324,2.0225 -Small,12x12,ldr-xy-02.png,38.5216,0.0308,0.0064,10.1939 -Small,12x12,ldrs-rgba-00.png,22.0882,0.1030,0.0825,0.7947 -Small,12x12,ldrs-rgba-01.png,24.6285,0.0739,0.0537,1.2206 -Small,12x12,ldrs-rgba-02.png,20.1803,0.1108,0.0904,0.7246 -Small,3x3x3,ldr-l-00-3.dds,51.9681,0.0322,0.0246,10.6576 -Small,3x3x3,ldr-l-01-3.dds,54.3395,0.0125,0.0076,9.0376 -Small,6x6x6,ldr-l-00-3.dds,32.9129,0.1058,0.0826,3.1733 -Small,6x6x6,ldr-l-01-3.dds,40.8871,0.0467,0.0260,2.6486 diff --git a/Test/Images/Small/astc_reference-3.6-sse2_thorough_results.csv b/Test/Images/Small/astc_reference-3.6-sse2_thorough_results.csv deleted file mode 100644 index 17892100343976d41eb619667c47a22372a7e1ce..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse2_thorough_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.3787,0.1650,0.0719,0.9109 -Small,4x4,ldr-rgb-00.png,39.1025,0.0850,0.0788,0.8312 -Small,4x4,ldr-rgb-01.png,40.3344,0.0839,0.0780,0.8397 -Small,4x4,ldr-rgb-02.png,35.3612,0.0789,0.0728,0.9005 -Small,4x4,ldr-rgb-03.png,47.6672,0.0791,0.0735,0.8919 -Small,4x4,ldr-rgb-04.png,42.3135,0.0766,0.0705,0.9302 -Small,4x4,ldr-rgb-05.png,37.9467,0.0883,0.0822,0.7972 -Small,4x4,ldr-rgb-06.png,35.4785,0.0729,0.0668,0.9813 -Small,4x4,ldr-rgb-07.png,39.8676,0.0975,0.0910,0.7202 -Small,4x4,ldr-rgb-08.png,45.7996,0.0752,0.0693,0.9461 -Small,4x4,ldr-rgb-09.png,42.2360,0.0819,0.0759,0.8635 -Small,4x4,ldr-rgb-10.png,44.9865,0.0129,0.0094,1.7305 -Small,4x4,ldr-rgba-00.png,36.7341,0.0876,0.0812,0.8074 -Small,4x4,ldr-rgba-01.png,39.0299,0.0706,0.0644,1.0172 -Small,4x4,ldr-rgba-02.png,34.9857,0.0696,0.0631,1.0381 -Small,4x4,ldr-xy-00.png,37.7552,0.0800,0.0720,0.9101 -Small,4x4,ldr-xy-01.png,45.2171,0.0906,0.0831,0.7890 -Small,4x4,ldr-xy-02.png,50.9992,0.1090,0.1009,0.6495 -Small,4x4,ldrs-rgba-00.png,36.7416,0.0882,0.0818,0.8010 -Small,4x4,ldrs-rgba-01.png,39.0514,0.0709,0.0648,1.0113 -Small,4x4,ldrs-rgba-02.png,34.9915,0.0707,0.0644,1.0182 -Small,5x5,hdr-rgb-00.hdr,30.2499,0.1884,0.0936,0.7000 -Small,5x5,ldr-rgb-00.png,35.3184,0.1087,0.1008,0.6501 -Small,5x5,ldr-rgb-01.png,36.4942,0.1056,0.0981,0.6681 -Small,5x5,ldr-rgb-02.png,31.1169,0.0996,0.0922,0.7107 -Small,5x5,ldr-rgb-03.png,44.4730,0.0957,0.0884,0.7411 -Small,5x5,ldr-rgb-04.png,37.8145,0.0978,0.0902,0.7262 -Small,5x5,ldr-rgb-05.png,33.6567,0.1121,0.1045,0.6273 -Small,5x5,ldr-rgb-06.png,31.1197,0.0949,0.0870,0.7531 -Small,5x5,ldr-rgb-07.png,36.7056,0.1251,0.1172,0.5590 -Small,5x5,ldr-rgb-08.png,42.2684,0.0926,0.0853,0.7683 -Small,5x5,ldr-rgb-09.png,37.6844,0.1041,0.0967,0.6774 -Small,5x5,ldr-rgb-10.png,40.6793,0.0179,0.0130,1.2511 -Small,5x5,ldr-rgba-00.png,33.1233,0.1144,0.1065,0.6155 -Small,5x5,ldr-rgba-01.png,35.3456,0.0915,0.0839,0.7812 -Small,5x5,ldr-rgba-02.png,31.1599,0.0924,0.0847,0.7742 -Small,5x5,ldr-xy-00.png,37.2902,0.0944,0.0849,0.7723 -Small,5x5,ldr-xy-01.png,41.5197,0.1147,0.1055,0.6213 -Small,5x5,ldr-xy-02.png,49.2647,0.1290,0.1194,0.5490 -Small,5x5,ldrs-rgba-00.png,33.1269,0.1157,0.1077,0.6082 -Small,5x5,ldrs-rgba-01.png,35.3541,0.0929,0.0851,0.7697 -Small,5x5,ldrs-rgba-02.png,31.1602,0.0928,0.0850,0.7712 -Small,6x6,hdr-rgb-00.hdr,27.6571,0.2063,0.1111,0.5899 -Small,6x6,ldr-rgb-00.png,32.6208,0.1294,0.1210,0.5416 -Small,6x6,ldr-rgb-01.png,33.1469,0.1211,0.1131,0.5795 -Small,6x6,ldr-rgb-02.png,27.4754,0.1172,0.1090,0.6014 -Small,6x6,ldr-rgb-03.png,42.5226,0.0802,0.0725,0.9038 -Small,6x6,ldr-rgb-04.png,34.3223,0.1154,0.1070,0.6124 -Small,6x6,ldr-rgb-05.png,30.2576,0.1317,0.1234,0.5312 -Small,6x6,ldr-rgb-06.png,27.5394,0.1146,0.1063,0.6164 -Small,6x6,ldr-rgb-07.png,34.3854,0.1380,0.1292,0.5074 -Small,6x6,ldr-rgb-08.png,39.8830,0.0806,0.0724,0.9050 -Small,6x6,ldr-rgb-09.png,33.7955,0.1125,0.1045,0.6270 -Small,6x6,ldr-rgb-10.png,37.1039,0.0227,0.0171,0.9501 -Small,6x6,ldr-rgba-00.png,30.5063,0.1351,0.1263,0.5189 -Small,6x6,ldr-rgba-01.png,32.2316,0.1125,0.1042,0.6287 -Small,6x6,ldr-rgba-02.png,27.8753,0.1161,0.1078,0.6077 -Small,6x6,ldr-xy-00.png,36.3838,0.0803,0.0700,0.9366 -Small,6x6,ldr-xy-01.png,38.0617,0.1164,0.1066,0.6147 -Small,6x6,ldr-xy-02.png,47.4738,0.1436,0.1331,0.4925 -Small,6x6,ldrs-rgba-00.png,30.5081,0.1360,0.1275,0.5141 -Small,6x6,ldrs-rgba-01.png,32.2377,0.1129,0.1047,0.6261 -Small,6x6,ldrs-rgba-02.png,27.8745,0.1175,0.1089,0.6018 -Small,8x8,hdr-rgb-00.hdr,24.3160,0.2483,0.1473,0.4449 -Small,8x8,ldr-rgb-00.png,28.9377,0.1668,0.1528,0.4290 -Small,8x8,ldr-rgb-01.png,28.9883,0.1495,0.1363,0.4809 -Small,8x8,ldr-rgb-02.png,23.1866,0.1572,0.1437,0.4561 -Small,8x8,ldr-rgb-03.png,39.3501,0.0527,0.0395,1.6573 -Small,8x8,ldr-rgb-04.png,29.7749,0.1414,0.1281,0.5118 -Small,8x8,ldr-rgb-05.png,26.0242,0.1650,0.1514,0.4330 -Small,8x8,ldr-rgb-06.png,23.2335,0.1565,0.1432,0.4577 -Small,8x8,ldr-rgb-07.png,31.1039,0.1574,0.1439,0.4555 -Small,8x8,ldr-rgb-08.png,36.4625,0.0773,0.0642,1.0205 -Small,8x8,ldr-rgb-09.png,29.1520,0.1192,0.1056,0.6204 -Small,8x8,ldr-rgb-10.png,32.3031,0.0330,0.0222,0.7315 -Small,8x8,ldr-rgba-00.png,26.6704,0.1756,0.1617,0.4054 -Small,8x8,ldr-rgba-01.png,28.3932,0.1359,0.1225,0.5351 -Small,8x8,ldr-rgba-02.png,23.9599,0.1660,0.1525,0.4298 -Small,8x8,ldr-xy-00.png,34.3120,0.0958,0.0806,0.8127 -Small,8x8,ldr-xy-01.png,35.2097,0.0989,0.0835,0.7847 -Small,8x8,ldr-xy-02.png,44.5878,0.1261,0.1109,0.5911 -Small,8x8,ldrs-rgba-00.png,26.6715,0.1765,0.1627,0.4028 -Small,8x8,ldrs-rgba-01.png,28.3959,0.1378,0.1241,0.5279 -Small,8x8,ldrs-rgba-02.png,23.9597,0.1654,0.1518,0.4317 -Small,12x12,hdr-rgb-00.hdr,21.0019,0.3020,0.1908,0.3435 -Small,12x12,ldr-rgb-00.png,25.0133,0.2074,0.1849,0.3545 -Small,12x12,ldr-rgb-01.png,25.1167,0.1746,0.1514,0.4328 -Small,12x12,ldr-rgb-02.png,19.2912,0.2119,0.1888,0.3471 -Small,12x12,ldr-rgb-03.png,36.1206,0.0624,0.0394,1.6641 -Small,12x12,ldr-rgb-04.png,25.0074,0.1748,0.1512,0.4336 -Small,12x12,ldr-rgb-05.png,21.7140,0.2104,0.1871,0.3503 -Small,12x12,ldr-rgb-06.png,19.2810,0.2060,0.1826,0.3588 -Small,12x12,ldr-rgb-07.png,27.0419,0.1870,0.1639,0.3999 -Small,12x12,ldr-rgb-08.png,32.3840,0.0866,0.0635,1.0324 -Small,12x12,ldr-rgb-09.png,24.3053,0.1656,0.1418,0.4620 -Small,12x12,ldr-rgb-10.png,28.1356,0.0596,0.0388,0.4185 -Small,12x12,ldr-rgba-00.png,22.7010,0.2213,0.1975,0.3318 -Small,12x12,ldr-rgba-01.png,24.7078,0.1637,0.1408,0.4654 -Small,12x12,ldr-rgba-02.png,20.1958,0.2170,0.1937,0.3384 -Small,12x12,ldr-xy-00.png,30.5742,0.1286,0.1034,0.6338 -Small,12x12,ldr-xy-01.png,32.1255,0.0968,0.0718,0.9122 -Small,12x12,ldr-xy-02.png,40.3053,0.0695,0.0444,1.4745 -Small,12x12,ldrs-rgba-00.png,22.7006,0.2215,0.1981,0.3308 -Small,12x12,ldrs-rgba-01.png,24.7093,0.1676,0.1441,0.4547 -Small,12x12,ldrs-rgba-02.png,20.1960,0.2189,0.1954,0.3354 -Small,3x3x3,ldr-l-00-3.dds,52.4159,0.0627,0.0550,4.7653 -Small,3x3x3,ldr-l-01-3.dds,55.3973,0.0269,0.0219,3.1406 -Small,6x6x6,ldr-l-00-3.dds,33.2725,0.1589,0.1327,1.9754 -Small,6x6x6,ldr-l-01-3.dds,41.5751,0.0503,0.0271,2.5473 diff --git a/Test/Images/Small/astc_reference-3.6-sse4.1_fast_results.csv b/Test/Images/Small/astc_reference-3.6-sse4.1_fast_results.csv deleted file mode 100644 index 41c29c2acf0ef0e33a0a8227739789d2d31c8465..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse4.1_fast_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.6884,0.1096,0.0172,3.8067 -Small,4x4,ldr-rgb-00.png,38.1103,0.0158,0.0108,6.0732 -Small,4x4,ldr-rgb-01.png,39.8105,0.0142,0.0093,7.0386 -Small,4x4,ldr-rgb-02.png,35.0374,0.0195,0.0146,4.4805 -Small,4x4,ldr-rgb-03.png,45.9704,0.0086,0.0041,16.1731 -Small,4x4,ldr-rgb-04.png,41.9106,0.0119,0.0067,9.7120 -Small,4x4,ldr-rgb-05.png,37.2317,0.0190,0.0140,4.6956 -Small,4x4,ldr-rgb-06.png,35.2059,0.0187,0.0136,4.8220 -Small,4x4,ldr-rgb-07.png,38.0309,0.0199,0.0144,4.5413 -Small,4x4,ldr-rgb-08.png,43.6358,0.0105,0.0056,11.6716 -Small,4x4,ldr-rgb-09.png,41.8533,0.0119,0.0071,9.2343 -Small,4x4,ldr-rgb-10.png,44.3464,0.0045,0.0019,8.4364 -Small,4x4,ldr-rgba-00.png,35.5182,0.0191,0.0138,4.7531 -Small,4x4,ldr-rgba-01.png,38.7956,0.0139,0.0089,7.3894 -Small,4x4,ldr-rgba-02.png,34.8333,0.0175,0.0124,5.2881 -Small,4x4,ldr-xy-00.png,37.5697,0.0141,0.0066,9.8746 -Small,4x4,ldr-xy-01.png,44.1378,0.0150,0.0079,8.2790 -Small,4x4,ldr-xy-02.png,48.1786,0.0128,0.0052,12.5001 -Small,4x4,ldrs-rgba-00.png,35.5254,0.0196,0.0141,4.6519 -Small,4x4,ldrs-rgba-01.png,38.8141,0.0140,0.0088,7.4685 -Small,4x4,ldrs-rgba-02.png,34.8386,0.0176,0.0125,5.2488 -Small,5x5,hdr-rgb-00.hdr,29.4686,0.1130,0.0206,3.1783 -Small,5x5,ldr-rgb-00.png,34.3042,0.0173,0.0113,5.8223 -Small,5x5,ldr-rgb-01.png,36.1808,0.0145,0.0087,7.5555 -Small,5x5,ldr-rgb-02.png,31.0160,0.0193,0.0134,4.8918 -Small,5x5,ldr-rgb-03.png,42.6231,0.0091,0.0036,18.2959 -Small,5x5,ldr-rgb-04.png,37.2434,0.0130,0.0069,9.5258 -Small,5x5,ldr-rgb-05.png,33.1823,0.0217,0.0155,4.2162 -Small,5x5,ldr-rgb-06.png,31.0247,0.0191,0.0129,5.0831 -Small,5x5,ldr-rgb-07.png,35.1883,0.0189,0.0125,5.2479 -Small,5x5,ldr-rgb-08.png,40.0310,0.0108,0.0050,13.1125 -Small,5x5,ldr-rgb-09.png,37.2810,0.0129,0.0070,9.3315 -Small,5x5,ldr-rgb-10.png,40.1234,0.0055,0.0020,8.2766 -Small,5x5,ldr-rgba-00.png,32.0072,0.0218,0.0153,4.2769 -Small,5x5,ldr-rgba-01.png,35.1428,0.0151,0.0091,7.2152 -Small,5x5,ldr-rgba-02.png,31.1062,0.0198,0.0136,4.8334 -Small,5x5,ldr-xy-00.png,36.7258,0.0147,0.0054,12.1028 -Small,5x5,ldr-xy-01.png,39.8638,0.0155,0.0070,9.3050 -Small,5x5,ldr-xy-02.png,43.9171,0.0138,0.0049,13.4962 -Small,5x5,ldrs-rgba-00.png,32.0096,0.0218,0.0153,4.2784 -Small,5x5,ldrs-rgba-01.png,35.1497,0.0153,0.0091,7.2152 -Small,5x5,ldrs-rgba-02.png,31.1070,0.0201,0.0137,4.7708 -Small,6x6,hdr-rgb-00.hdr,26.9904,0.1185,0.0240,2.7328 -Small,6x6,ldr-rgb-00.png,31.5938,0.0215,0.0149,4.3987 -Small,6x6,ldr-rgb-01.png,32.8896,0.0175,0.0111,5.9121 -Small,6x6,ldr-rgb-02.png,27.4079,0.0241,0.0175,3.7502 -Small,6x6,ldr-rgb-03.png,40.4899,0.0100,0.0037,17.8759 -Small,6x6,ldr-rgb-04.png,33.9065,0.0154,0.0089,7.3340 -Small,6x6,ldr-rgb-05.png,29.9329,0.0269,0.0202,3.2384 -Small,6x6,ldr-rgb-06.png,27.4651,0.0235,0.0169,3.8850 -Small,6x6,ldr-rgb-07.png,32.8824,0.0202,0.0132,4.9713 -Small,6x6,ldr-rgb-08.png,37.6380,0.0117,0.0053,12.4003 -Small,6x6,ldr-rgb-09.png,33.4716,0.0157,0.0093,7.0523 -Small,6x6,ldr-rgb-10.png,36.6590,0.0064,0.0023,7.2120 -Small,6x6,ldr-rgba-00.png,29.4788,0.0264,0.0194,3.3763 -Small,6x6,ldr-rgba-01.png,32.0575,0.0180,0.0112,5.8452 -Small,6x6,ldr-rgba-02.png,27.8275,0.0245,0.0175,3.7464 -Small,6x6,ldr-xy-00.png,35.6827,0.0155,0.0061,10.7492 -Small,6x6,ldr-xy-01.png,37.1053,0.0179,0.0090,7.2512 -Small,6x6,ldr-xy-02.png,41.9446,0.0138,0.0045,14.7041 -Small,6x6,ldrs-rgba-00.png,29.4790,0.0266,0.0196,3.3451 -Small,6x6,ldrs-rgba-01.png,32.0640,0.0180,0.0114,5.7715 -Small,6x6,ldrs-rgba-02.png,27.8273,0.0245,0.0177,3.7053 -Small,8x8,hdr-rgb-00.hdr,23.7216,0.1326,0.0335,1.9540 -Small,8x8,ldr-rgb-00.png,27.9814,0.0299,0.0193,3.4030 -Small,8x8,ldr-rgb-01.png,28.7458,0.0259,0.0155,4.2290 -Small,8x8,ldr-rgb-02.png,23.0937,0.0357,0.0252,2.6016 -Small,8x8,ldr-rgb-03.png,37.2544,0.0142,0.0041,16.1181 -Small,8x8,ldr-rgb-04.png,29.3419,0.0247,0.0141,4.6516 -Small,8x8,ldr-rgb-05.png,25.7747,0.0393,0.0290,2.2612 -Small,8x8,ldr-rgb-06.png,23.1468,0.0359,0.0251,2.6119 -Small,8x8,ldr-rgb-07.png,29.6508,0.0245,0.0136,4.8202 -Small,8x8,ldr-rgb-08.png,34.2150,0.0170,0.0067,9.8519 -Small,8x8,ldr-rgb-09.png,28.6635,0.0254,0.0150,4.3735 -Small,8x8,ldr-rgb-10.png,31.9974,0.0113,0.0031,5.1752 -Small,8x8,ldr-rgba-00.png,25.3599,0.0369,0.0259,2.5322 -Small,8x8,ldr-rgba-01.png,28.2399,0.0271,0.0166,3.9570 -Small,8x8,ldr-rgba-02.png,23.9241,0.0365,0.0258,2.5394 -Small,8x8,ldr-xy-00.png,33.3965,0.0227,0.0088,7.4481 -Small,8x8,ldr-xy-01.png,34.2472,0.0244,0.0108,6.0827 -Small,8x8,ldr-xy-02.png,39.9005,0.0173,0.0034,19.0795 -Small,8x8,ldrs-rgba-00.png,25.3610,0.0370,0.0259,2.5259 -Small,8x8,ldrs-rgba-01.png,28.2419,0.0278,0.0169,3.8742 -Small,8x8,ldrs-rgba-02.png,23.9237,0.0370,0.0261,2.5067 -Small,12x12,hdr-rgb-00.hdr,20.5637,0.1512,0.0447,1.4657 -Small,12x12,ldr-rgb-00.png,23.7825,0.0327,0.0154,4.2644 -Small,12x12,ldr-rgb-01.png,24.7588,0.0274,0.0105,6.2345 -Small,12x12,ldr-rgb-02.png,19.2226,0.0456,0.0282,2.3205 -Small,12x12,ldr-rgb-03.png,33.2364,0.0201,0.0031,21.3266 -Small,12x12,ldr-rgb-04.png,24.5606,0.0279,0.0106,6.1611 -Small,12x12,ldr-rgb-05.png,21.4885,0.0408,0.0236,2.7793 -Small,12x12,ldr-rgb-06.png,19.2097,0.0472,0.0298,2.2025 -Small,12x12,ldr-rgb-07.png,25.3456,0.0269,0.0090,7.3013 -Small,12x12,ldr-rgb-08.png,30.1535,0.0220,0.0045,14.4414 -Small,12x12,ldr-rgb-09.png,23.7136,0.0324,0.0154,4.2471 -Small,12x12,ldr-rgb-10.png,27.3052,0.0186,0.0037,4.4211 -Small,12x12,ldr-rgba-00.png,21.3632,0.0442,0.0267,2.4534 -Small,12x12,ldr-rgba-01.png,24.4867,0.0304,0.0131,5.0215 -Small,12x12,ldr-rgba-02.png,20.1666,0.0525,0.0347,1.8879 -Small,12x12,ldr-xy-00.png,29.0651,0.0294,0.0078,8.3935 -Small,12x12,ldr-xy-01.png,30.4241,0.0283,0.0075,8.7815 -Small,12x12,ldr-xy-02.png,37.9951,0.0230,0.0020,32.2513 -Small,12x12,ldrs-rgba-00.png,21.3658,0.0442,0.0266,2.4684 -Small,12x12,ldrs-rgba-01.png,24.4885,0.0301,0.0129,5.0705 -Small,12x12,ldrs-rgba-02.png,20.1665,0.0528,0.0349,1.8759 -Small,3x3x3,ldr-l-00-3.dds,50.7551,0.0218,0.0150,17.4845 -Small,3x3x3,ldr-l-01-3.dds,53.8676,0.0102,0.0062,11.1811 -Small,6x6x6,ldr-l-00-3.dds,32.5264,0.0827,0.0593,4.4177 -Small,6x6x6,ldr-l-01-3.dds,40.7893,0.0435,0.0231,2.9774 diff --git a/Test/Images/Small/astc_reference-3.6-sse4.1_fastest_results.csv b/Test/Images/Small/astc_reference-3.6-sse4.1_fastest_results.csv deleted file mode 100644 index 0ad680d79c2fc368f82c6c6326e83af43a90b9a0..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse4.1_fastest_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,33.2999,0.1028,0.0107,6.1072 -Small,4x4,ldr-rgb-00.png,37.0084,0.0109,0.0064,10.2193 -Small,4x4,ldr-rgb-01.png,39.4162,0.0105,0.0062,10.5926 -Small,4x4,ldr-rgb-02.png,34.6448,0.0134,0.0092,7.1358 -Small,4x4,ldr-rgb-03.png,45.3559,0.0069,0.0029,22.6535 -Small,4x4,ldr-rgb-04.png,41.6390,0.0093,0.0047,13.8464 -Small,4x4,ldr-rgb-05.png,36.7213,0.0131,0.0087,7.5477 -Small,4x4,ldr-rgb-06.png,34.6994,0.0131,0.0084,7.7651 -Small,4x4,ldr-rgb-07.png,37.1808,0.0133,0.0085,7.7055 -Small,4x4,ldr-rgb-08.png,42.6915,0.0082,0.0039,16.9961 -Small,4x4,ldr-rgb-09.png,41.6433,0.0092,0.0048,13.5155 -Small,4x4,ldr-rgb-10.png,43.8818,0.0036,0.0016,10.0907 -Small,4x4,ldr-rgba-00.png,34.5700,0.0127,0.0078,8.3989 -Small,4x4,ldr-rgba-01.png,38.5857,0.0112,0.0066,9.8998 -Small,4x4,ldr-rgba-02.png,34.5224,0.0138,0.0092,7.1343 -Small,4x4,ldr-xy-00.png,37.5264,0.0117,0.0049,13.3449 -Small,4x4,ldr-xy-01.png,43.8563,0.0119,0.0054,12.2157 -Small,4x4,ldr-xy-02.png,48.1786,0.0110,0.0039,16.5999 -Small,4x4,ldrs-rgba-00.png,34.5750,0.0127,0.0078,8.4267 -Small,4x4,ldrs-rgba-01.png,38.6025,0.0112,0.0066,9.9009 -Small,4x4,ldrs-rgba-02.png,34.5263,0.0138,0.0093,7.0827 -Small,5x5,hdr-rgb-00.hdr,28.8076,0.1055,0.0129,5.0795 -Small,5x5,ldr-rgb-00.png,33.4478,0.0122,0.0069,9.4665 -Small,5x5,ldr-rgb-01.png,35.9999,0.0111,0.0062,10.5212 -Small,5x5,ldr-rgb-02.png,30.8748,0.0145,0.0095,6.8969 -Small,5x5,ldr-rgb-03.png,42.2547,0.0076,0.0029,22.6685 -Small,5x5,ldr-rgb-04.png,36.9224,0.0107,0.0055,12.0202 -Small,5x5,ldr-rgb-05.png,32.6193,0.0151,0.0100,6.5438 -Small,5x5,ldr-rgb-06.png,30.8711,0.0147,0.0095,6.9044 -Small,5x5,ldr-rgb-07.png,34.2652,0.0142,0.0084,7.7649 -Small,5x5,ldr-rgb-08.png,39.3139,0.0088,0.0039,16.6250 -Small,5x5,ldr-rgb-09.png,36.9835,0.0104,0.0055,11.8151 -Small,5x5,ldr-rgb-10.png,39.7373,0.0043,0.0016,9.8758 -Small,5x5,ldr-rgba-00.png,30.7473,0.0140,0.0084,7.7586 -Small,5x5,ldr-rgba-01.png,34.9846,0.0123,0.0070,9.3611 -Small,5x5,ldr-rgba-02.png,31.0020,0.0158,0.0106,6.1884 -Small,5x5,ldr-xy-00.png,36.5568,0.0125,0.0042,15.5044 -Small,5x5,ldr-xy-01.png,38.8334,0.0125,0.0049,13.4513 -Small,5x5,ldr-xy-02.png,43.7233,0.0120,0.0041,16.0195 -Small,5x5,ldrs-rgba-00.png,30.7497,0.0141,0.0087,7.5458 -Small,5x5,ldrs-rgba-01.png,34.9913,0.0125,0.0073,9.0047 -Small,5x5,ldrs-rgba-02.png,31.0030,0.0159,0.0103,6.3394 -Small,6x6,hdr-rgb-00.hdr,26.7122,0.1062,0.0128,5.1029 -Small,6x6,ldr-rgb-00.png,31.1052,0.0133,0.0077,8.4870 -Small,6x6,ldr-rgb-01.png,32.7949,0.0123,0.0072,9.1495 -Small,6x6,ldr-rgb-02.png,27.3228,0.0164,0.0111,5.8920 -Small,6x6,ldr-rgb-03.png,40.2037,0.0077,0.0026,24.8421 -Small,6x6,ldr-rgb-04.png,33.7349,0.0117,0.0063,10.3825 -Small,6x6,ldr-rgb-05.png,29.5304,0.0168,0.0113,5.7828 -Small,6x6,ldr-rgb-06.png,27.3791,0.0163,0.0108,6.0665 -Small,6x6,ldr-rgb-07.png,32.0586,0.0142,0.0083,7.9254 -Small,6x6,ldr-rgb-08.png,37.0422,0.0089,0.0036,18.4086 -Small,6x6,ldr-rgb-09.png,33.2804,0.0115,0.0060,10.8630 -Small,6x6,ldr-rgb-10.png,36.4903,0.0048,0.0019,8.7774 -Small,6x6,ldr-rgba-00.png,28.4787,0.0157,0.0099,6.6494 -Small,6x6,ldr-rgba-01.png,31.9580,0.0138,0.0080,8.1736 -Small,6x6,ldr-rgba-02.png,27.7571,0.0170,0.0113,5.7772 -Small,6x6,ldr-xy-00.png,35.5281,0.0127,0.0045,14.5123 -Small,6x6,ldr-xy-01.png,36.2504,0.0134,0.0056,11.7514 -Small,6x6,ldr-xy-02.png,41.7327,0.0117,0.0036,18.3069 -Small,6x6,ldrs-rgba-00.png,28.4800,0.0156,0.0097,6.7900 -Small,6x6,ldrs-rgba-01.png,31.9643,0.0138,0.0082,7.9612 -Small,6x6,ldrs-rgba-02.png,27.7547,0.0172,0.0116,5.6375 -Small,8x8,hdr-rgb-00.hdr,23.5547,0.1176,0.0204,3.2154 -Small,8x8,ldr-rgb-00.png,27.6188,0.0204,0.0114,5.7247 -Small,8x8,ldr-rgb-01.png,28.6671,0.0189,0.0104,6.3192 -Small,8x8,ldr-rgb-02.png,23.0179,0.0255,0.0167,3.9328 -Small,8x8,ldr-rgb-03.png,37.0089,0.0117,0.0032,20.6800 -Small,8x8,ldr-rgb-04.png,29.0953,0.0183,0.0094,6.9757 -Small,8x8,ldr-rgb-05.png,25.5324,0.0256,0.0166,3.9432 -Small,8x8,ldr-rgb-06.png,23.0523,0.0261,0.0170,3.8555 -Small,8x8,ldr-rgb-07.png,29.3368,0.0186,0.0094,6.9794 -Small,8x8,ldr-rgb-08.png,33.7665,0.0134,0.0047,13.9320 -Small,8x8,ldr-rgb-09.png,28.4590,0.0182,0.0094,6.9653 -Small,8x8,ldr-rgb-10.png,31.8847,0.0088,0.0025,6.5655 -Small,8x8,ldr-rgba-00.png,24.9726,0.0242,0.0149,4.4031 -Small,8x8,ldr-rgba-01.png,28.1236,0.0202,0.0114,5.7695 -Small,8x8,ldr-rgba-02.png,23.8676,0.0264,0.0174,3.7725 -Small,8x8,ldr-xy-00.png,33.2085,0.0185,0.0062,10.5060 -Small,8x8,ldr-xy-01.png,33.9809,0.0189,0.0072,9.0743 -Small,8x8,ldr-xy-02.png,39.7786,0.0148,0.0028,23.3640 -Small,8x8,ldrs-rgba-00.png,24.9730,0.0243,0.0151,4.3298 -Small,8x8,ldrs-rgba-01.png,28.1260,0.0202,0.0112,5.8636 -Small,8x8,ldrs-rgba-02.png,23.8671,0.0268,0.0179,3.6696 -Small,12x12,hdr-rgb-00.hdr,20.4789,0.1292,0.0280,2.3382 -Small,12x12,ldr-rgb-00.png,23.6716,0.0234,0.0103,6.3332 -Small,12x12,ldr-rgb-01.png,24.7037,0.0205,0.0075,8.7113 -Small,12x12,ldr-rgb-02.png,19.1880,0.0320,0.0189,3.4677 -Small,12x12,ldr-rgb-03.png,33.1400,0.0155,0.0028,23.1165 -Small,12x12,ldr-rgb-04.png,24.3898,0.0207,0.0077,8.5400 -Small,12x12,ldr-rgb-05.png,21.3701,0.0294,0.0160,4.0926 -Small,12x12,ldr-rgb-06.png,19.1564,0.0337,0.0204,3.2058 -Small,12x12,ldr-rgb-07.png,25.2598,0.0204,0.0071,9.1917 -Small,12x12,ldr-rgb-08.png,29.9653,0.0167,0.0039,16.7313 -Small,12x12,ldr-rgb-09.png,23.5968,0.0234,0.0106,6.1669 -Small,12x12,ldr-rgb-10.png,27.2554,0.0135,0.0026,6.1860 -Small,12x12,ldr-rgba-00.png,21.1828,0.0304,0.0169,3.8685 -Small,12x12,ldr-rgba-01.png,24.4330,0.0229,0.0095,6.9298 -Small,12x12,ldr-rgba-02.png,20.1371,0.0376,0.0239,2.7374 -Small,12x12,ldr-xy-00.png,28.9405,0.0230,0.0064,10.1954 -Small,12x12,ldr-xy-01.png,29.6034,0.0222,0.0058,11.2085 -Small,12x12,ldr-xy-02.png,37.9716,0.0187,0.0021,31.5082 -Small,12x12,ldrs-rgba-00.png,21.1836,0.0304,0.0170,3.8496 -Small,12x12,ldrs-rgba-01.png,24.4339,0.0226,0.0097,6.7849 -Small,12x12,ldrs-rgba-02.png,20.1367,0.0376,0.0241,2.7191 -Small,3x3x3,ldr-l-00-3.dds,50.6012,0.0193,0.0132,19.9288 -Small,3x3x3,ldr-l-01-3.dds,53.7999,0.0091,0.0059,11.6305 -Small,6x6x6,ldr-l-00-3.dds,32.5074,0.0803,0.0590,4.4415 -Small,6x6x6,ldr-l-01-3.dds,40.7826,0.0411,0.0229,3.0066 diff --git a/Test/Images/Small/astc_reference-3.6-sse4.1_medium_results.csv b/Test/Images/Small/astc_reference-3.6-sse4.1_medium_results.csv deleted file mode 100644 index 8cfd86901fd2745cafa5083a9b3751ec1ab1e991..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse4.1_medium_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.1340,0.1239,0.0307,2.1365 -Small,4x4,ldr-rgb-00.png,38.7318,0.0378,0.0318,2.0599 -Small,4x4,ldr-rgb-01.png,40.1460,0.0348,0.0291,2.2545 -Small,4x4,ldr-rgb-02.png,35.2180,0.0361,0.0304,2.1562 -Small,4x4,ldr-rgb-03.png,47.1925,0.0216,0.0161,4.0683 -Small,4x4,ldr-rgb-04.png,42.1729,0.0298,0.0238,2.7534 -Small,4x4,ldr-rgb-05.png,37.7672,0.0387,0.0326,2.0087 -Small,4x4,ldr-rgb-06.png,35.3468,0.0327,0.0267,2.4589 -Small,4x4,ldr-rgb-07.png,39.2464,0.0449,0.0386,1.6958 -Small,4x4,ldr-rgb-08.png,45.1732,0.0253,0.0195,3.3534 -Small,4x4,ldr-rgb-09.png,42.0914,0.0302,0.0245,2.6775 -Small,4x4,ldr-rgb-10.png,44.8767,0.0073,0.0039,4.1712 -Small,4x4,ldr-rgba-00.png,36.2349,0.0410,0.0347,1.8895 -Small,4x4,ldr-rgba-01.png,38.8941,0.0257,0.0197,3.3299 -Small,4x4,ldr-rgba-02.png,34.9204,0.0291,0.0230,2.8488 -Small,4x4,ldr-xy-00.png,37.7446,0.0265,0.0188,3.4898 -Small,4x4,ldr-xy-01.png,45.1462,0.0359,0.0286,2.2903 -Small,4x4,ldr-xy-02.png,50.9226,0.0432,0.0350,1.8699 -Small,4x4,ldrs-rgba-00.png,36.2418,0.0413,0.0349,1.8765 -Small,4x4,ldrs-rgba-01.png,38.9101,0.0260,0.0200,3.2788 -Small,4x4,ldrs-rgba-02.png,34.9259,0.0294,0.0232,2.8274 -Small,5x5,hdr-rgb-00.hdr,29.8514,0.1364,0.0409,1.6007 -Small,5x5,ldr-rgb-00.png,35.0732,0.0457,0.0379,1.7312 -Small,5x5,ldr-rgb-01.png,36.3975,0.0384,0.0312,2.1022 -Small,5x5,ldr-rgb-02.png,31.0670,0.0405,0.0330,1.9850 -Small,5x5,ldr-rgb-03.png,43.9478,0.0177,0.0106,6.1646 -Small,5x5,ldr-rgb-04.png,37.6667,0.0357,0.0282,2.3255 -Small,5x5,ldr-rgb-05.png,33.5193,0.0513,0.0438,1.4973 -Small,5x5,ldr-rgb-06.png,31.0773,0.0384,0.0309,2.1195 -Small,5x5,ldr-rgb-07.png,36.2042,0.0549,0.0471,1.3922 -Small,5x5,ldr-rgb-08.png,41.5462,0.0265,0.0189,3.4637 -Small,5x5,ldr-rgb-09.png,37.5873,0.0331,0.0257,2.5489 -Small,5x5,ldr-rgb-10.png,40.4902,0.0098,0.0049,3.3161 -Small,5x5,ldr-rgba-00.png,32.7858,0.0539,0.0459,1.4285 -Small,5x5,ldr-rgba-01.png,35.2722,0.0315,0.0240,2.7328 -Small,5x5,ldr-rgba-02.png,31.1225,0.0375,0.0298,2.1957 -Small,5x5,ldr-xy-00.png,37.0726,0.0287,0.0193,3.3930 -Small,5x5,ldr-xy-01.png,40.7191,0.0372,0.0282,2.3281 -Small,5x5,ldr-xy-02.png,49.0675,0.0295,0.0201,3.2668 -Small,5x5,ldrs-rgba-00.png,32.7887,0.0551,0.0472,1.3894 -Small,5x5,ldrs-rgba-01.png,35.2789,0.0316,0.0241,2.7202 -Small,5x5,ldrs-rgba-02.png,31.1234,0.0376,0.0298,2.1957 -Small,6x6,hdr-rgb-00.hdr,27.4769,0.1416,0.0461,1.4227 -Small,6x6,ldr-rgb-00.png,32.3560,0.0486,0.0404,1.6212 -Small,6x6,ldr-rgb-01.png,33.0687,0.0399,0.0320,2.0509 -Small,6x6,ldr-rgb-02.png,27.4381,0.0441,0.0363,1.8046 -Small,6x6,ldr-rgb-03.png,41.6538,0.0160,0.0085,7.6956 -Small,6x6,ldr-rgb-04.png,34.2059,0.0358,0.0277,2.3653 -Small,6x6,ldr-rgb-05.png,30.1377,0.0567,0.0484,1.3546 -Small,6x6,ldr-rgb-06.png,27.5024,0.0432,0.0351,1.8676 -Small,6x6,ldr-rgb-07.png,33.8577,0.0528,0.0444,1.4768 -Small,6x6,ldr-rgb-08.png,39.0752,0.0221,0.0144,4.5590 -Small,6x6,ldr-rgb-09.png,33.6699,0.0344,0.0267,2.4576 -Small,6x6,ldr-rgb-10.png,36.9333,0.0112,0.0057,2.8671 -Small,6x6,ldr-rgba-00.png,30.2558,0.0607,0.0522,1.2545 -Small,6x6,ldr-rgba-01.png,32.1716,0.0338,0.0258,2.5378 -Small,6x6,ldr-rgba-02.png,27.8426,0.0427,0.0346,1.8935 -Small,6x6,ldr-xy-00.png,36.2518,0.0275,0.0174,3.7582 -Small,6x6,ldr-xy-01.png,37.7318,0.0309,0.0215,3.0496 -Small,6x6,ldr-xy-02.png,46.0639,0.0245,0.0146,4.4777 -Small,6x6,ldrs-rgba-00.png,30.2570,0.0615,0.0531,1.2352 -Small,6x6,ldrs-rgba-01.png,32.1777,0.0342,0.0261,2.5070 -Small,6x6,ldrs-rgba-02.png,27.8427,0.0429,0.0347,1.8888 -Small,8x8,hdr-rgb-00.hdr,24.1157,0.1613,0.0602,1.0891 -Small,8x8,ldr-rgb-00.png,28.7123,0.0666,0.0551,1.1888 -Small,8x8,ldr-rgb-01.png,28.9240,0.0526,0.0409,1.6037 -Small,8x8,ldr-rgb-02.png,23.1517,0.0604,0.0490,1.3377 -Small,8x8,ldr-rgb-03.png,38.4615,0.0213,0.0099,6.5872 -Small,8x8,ldr-rgb-04.png,29.6546,0.0490,0.0370,1.7691 -Small,8x8,ldr-rgb-05.png,25.9295,0.0691,0.0573,1.1441 -Small,8x8,ldr-rgb-06.png,23.1918,0.0606,0.0487,1.3445 -Small,8x8,ldr-rgb-07.png,30.5823,0.0603,0.0483,1.3562 -Small,8x8,ldr-rgb-08.png,35.7743,0.0279,0.0164,3.9854 -Small,8x8,ldr-rgb-09.png,29.0115,0.0462,0.0349,1.8787 -Small,8x8,ldr-rgb-10.png,32.1619,0.0173,0.0079,2.0601 -Small,8x8,ldr-rgba-00.png,26.3940,0.0774,0.0653,1.0042 -Small,8x8,ldr-rgba-01.png,28.3383,0.0462,0.0344,1.9057 -Small,8x8,ldr-rgba-02.png,23.9368,0.0638,0.0520,1.2615 -Small,8x8,ldr-xy-00.png,34.0144,0.0407,0.0258,2.5434 -Small,8x8,ldr-xy-01.png,34.9127,0.0399,0.0253,2.5945 -Small,8x8,ldr-xy-02.png,41.7218,0.0294,0.0149,4.4103 -Small,8x8,ldrs-rgba-00.png,26.3943,0.0772,0.0650,1.0086 -Small,8x8,ldrs-rgba-01.png,28.3412,0.0461,0.0342,1.9175 -Small,8x8,ldrs-rgba-02.png,23.9363,0.0636,0.0517,1.2675 -Small,12x12,hdr-rgb-00.hdr,20.7645,0.1928,0.0827,0.7929 -Small,12x12,ldr-rgb-00.png,24.6670,0.0831,0.0623,1.0517 -Small,12x12,ldr-rgb-01.png,25.0227,0.0712,0.0510,1.2862 -Small,12x12,ldr-rgb-02.png,19.2621,0.0955,0.0756,0.8669 -Small,12x12,ldr-rgb-03.png,34.9308,0.0305,0.0109,6.0075 -Small,12x12,ldr-rgb-04.png,24.9126,0.0670,0.0469,1.3980 -Small,12x12,ldr-rgb-05.png,21.6505,0.0964,0.0764,0.8583 -Small,12x12,ldr-rgb-06.png,19.2451,0.0915,0.0714,0.9175 -Small,12x12,ldr-rgb-07.png,26.5693,0.0706,0.0498,1.3148 -Small,12x12,ldr-rgb-08.png,31.4927,0.0382,0.0180,3.6358 -Small,12x12,ldr-rgb-09.png,24.1078,0.0676,0.0473,1.3847 -Small,12x12,ldr-rgb-10.png,27.9831,0.0338,0.0165,0.9835 -Small,12x12,ldr-rgba-00.png,22.0878,0.0937,0.0732,0.8949 -Small,12x12,ldr-rgba-01.png,24.6267,0.0690,0.0488,1.3428 -Small,12x12,ldr-rgba-02.png,20.1804,0.1020,0.0817,0.8026 -Small,12x12,ldr-xy-00.png,30.0722,0.0538,0.0297,2.2065 -Small,12x12,ldr-xy-01.png,31.8391,0.0525,0.0286,2.2878 -Small,12x12,ldr-xy-02.png,38.5216,0.0303,0.0059,11.1571 -Small,12x12,ldrs-rgba-00.png,22.0882,0.0937,0.0732,0.8947 -Small,12x12,ldrs-rgba-01.png,24.6285,0.0683,0.0480,1.3639 -Small,12x12,ldrs-rgba-02.png,20.1803,0.1013,0.0808,0.8107 -Small,3x3x3,ldr-l-00-3.dds,51.9681,0.0294,0.0215,12.1848 -Small,3x3x3,ldr-l-01-3.dds,54.3395,0.0116,0.0067,10.3175 -Small,6x6x6,ldr-l-00-3.dds,32.9129,0.0970,0.0737,3.5555 -Small,6x6x6,ldr-l-01-3.dds,40.8871,0.0435,0.0234,2.9516 diff --git a/Test/Images/Small/astc_reference-3.6-sse4.1_thorough_results.csv b/Test/Images/Small/astc_reference-3.6-sse4.1_thorough_results.csv deleted file mode 100644 index 26148c78cddb640012dfeee733346853ad33aa04..0000000000000000000000000000000000000000 --- a/Test/Images/Small/astc_reference-3.6-sse4.1_thorough_results.csv +++ /dev/null @@ -1,110 +0,0 @@ -Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate -Small,4x4,hdr-rgb-00.hdr,34.3787,0.1555,0.0634,1.0332 -Small,4x4,ldr-rgb-00.png,39.1025,0.0752,0.0691,0.9484 -Small,4x4,ldr-rgb-01.png,40.3344,0.0742,0.0683,0.9589 -Small,4x4,ldr-rgb-02.png,35.3612,0.0699,0.0640,1.0247 -Small,4x4,ldr-rgb-03.png,47.6672,0.0694,0.0636,1.0306 -Small,4x4,ldr-rgb-04.png,42.3135,0.0679,0.0619,1.0584 -Small,4x4,ldr-rgb-05.png,37.9467,0.0789,0.0729,0.8994 -Small,4x4,ldr-rgb-06.png,35.4785,0.0645,0.0585,1.1209 -Small,4x4,ldr-rgb-07.png,39.8676,0.0858,0.0794,0.8255 -Small,4x4,ldr-rgb-08.png,45.7996,0.0667,0.0609,1.0756 -Small,4x4,ldr-rgb-09.png,42.2360,0.0729,0.0669,0.9801 -Small,4x4,ldr-rgb-10.png,44.9865,0.0119,0.0083,1.9489 -Small,4x4,ldr-rgba-00.png,36.7341,0.0780,0.0716,0.9154 -Small,4x4,ldr-rgba-01.png,39.0299,0.0642,0.0581,1.1272 -Small,4x4,ldr-rgba-02.png,34.9857,0.0634,0.0572,1.1451 -Small,4x4,ldr-xy-00.png,37.7552,0.0731,0.0650,1.0075 -Small,4x4,ldr-xy-01.png,45.2171,0.0811,0.0737,0.8888 -Small,4x4,ldr-xy-02.png,50.9992,0.0981,0.0901,0.7270 -Small,4x4,ldrs-rgba-00.png,36.7416,0.0786,0.0722,0.9078 -Small,4x4,ldrs-rgba-01.png,39.0514,0.0641,0.0580,1.1298 -Small,4x4,ldrs-rgba-02.png,34.9915,0.0630,0.0568,1.1538 -Small,5x5,hdr-rgb-00.hdr,30.2499,0.1753,0.0809,0.8100 -Small,5x5,ldr-rgb-00.png,35.3184,0.0958,0.0883,0.7425 -Small,5x5,ldr-rgb-01.png,36.4942,0.0921,0.0847,0.7736 -Small,5x5,ldr-rgb-02.png,31.1169,0.0866,0.0792,0.8277 -Small,5x5,ldr-rgb-03.png,44.4730,0.0843,0.0772,0.8493 -Small,5x5,ldr-rgb-04.png,37.8145,0.0865,0.0789,0.8306 -Small,5x5,ldr-rgb-05.png,33.6567,0.0988,0.0914,0.7172 -Small,5x5,ldr-rgb-06.png,31.1197,0.0829,0.0752,0.8715 -Small,5x5,ldr-rgb-07.png,36.7056,0.1097,0.1016,0.6450 -Small,5x5,ldr-rgb-08.png,42.2684,0.0797,0.0723,0.9063 -Small,5x5,ldr-rgb-09.png,37.6844,0.0903,0.0829,0.7904 -Small,5x5,ldr-rgb-10.png,40.6793,0.0164,0.0114,1.4257 -Small,5x5,ldr-rgba-00.png,33.1233,0.1005,0.0925,0.7086 -Small,5x5,ldr-rgba-01.png,35.3456,0.0816,0.0738,0.8876 -Small,5x5,ldr-rgba-02.png,31.1599,0.0814,0.0737,0.8890 -Small,5x5,ldr-xy-00.png,37.2902,0.0831,0.0736,0.8909 -Small,5x5,ldr-xy-01.png,41.5197,0.1024,0.0933,0.7022 -Small,5x5,ldr-xy-02.png,49.2647,0.1145,0.1050,0.6242 -Small,5x5,ldrs-rgba-00.png,33.1269,0.1005,0.0926,0.7079 -Small,5x5,ldrs-rgba-01.png,35.3541,0.0827,0.0751,0.8729 -Small,5x5,ldrs-rgba-02.png,31.1602,0.0827,0.0749,0.8745 -Small,6x6,hdr-rgb-00.hdr,27.6571,0.1910,0.0968,0.6769 -Small,6x6,ldr-rgb-00.png,32.6208,0.1125,0.1043,0.6285 -Small,6x6,ldr-rgb-01.png,33.1469,0.1058,0.0978,0.6699 -Small,6x6,ldr-rgb-02.png,27.4754,0.1029,0.0948,0.6916 -Small,6x6,ldr-rgb-03.png,42.5226,0.0711,0.0632,1.0367 -Small,6x6,ldr-rgb-04.png,34.3223,0.1020,0.0937,0.6992 -Small,6x6,ldr-rgb-05.png,30.2576,0.1151,0.1070,0.6123 -Small,6x6,ldr-rgb-06.png,27.5394,0.0996,0.0913,0.7176 -Small,6x6,ldr-rgb-07.png,34.3854,0.1219,0.1130,0.5801 -Small,6x6,ldr-rgb-08.png,39.8830,0.0697,0.0618,1.0599 -Small,6x6,ldr-rgb-09.png,33.7955,0.0983,0.0903,0.7254 -Small,6x6,ldr-rgb-10.png,37.1039,0.0211,0.0156,1.0417 -Small,6x6,ldr-rgba-00.png,30.5063,0.1194,0.1108,0.5916 -Small,6x6,ldr-rgba-01.png,32.2316,0.1000,0.0916,0.7156 -Small,6x6,ldr-rgba-02.png,27.8753,0.1032,0.0949,0.6908 -Small,6x6,ldr-xy-00.png,36.3838,0.0726,0.0626,1.0473 -Small,6x6,ldr-xy-01.png,38.0617,0.1050,0.0951,0.6890 -Small,6x6,ldr-xy-02.png,47.4738,0.1331,0.1227,0.5340 -Small,6x6,ldrs-rgba-00.png,30.5081,0.1272,0.1186,0.5527 -Small,6x6,ldrs-rgba-01.png,32.2377,0.1047,0.0960,0.6830 -Small,6x6,ldrs-rgba-02.png,27.8745,0.1060,0.0971,0.6753 -Small,8x8,hdr-rgb-00.hdr,24.3160,0.2350,0.1290,0.5078 -Small,8x8,ldr-rgb-00.png,28.9377,0.1472,0.1338,0.4898 -Small,8x8,ldr-rgb-01.png,28.9883,0.1339,0.1207,0.5429 -Small,8x8,ldr-rgb-02.png,23.1866,0.1399,0.1268,0.5167 -Small,8x8,ldr-rgb-03.png,39.3501,0.0476,0.0349,1.8782 -Small,8x8,ldr-rgb-04.png,29.7749,0.1248,0.1113,0.5889 -Small,8x8,ldr-rgb-05.png,26.0242,0.1454,0.1320,0.4966 -Small,8x8,ldr-rgb-06.png,23.2335,0.1378,0.1244,0.5269 -Small,8x8,ldr-rgb-07.png,31.1039,0.1397,0.1260,0.5202 -Small,8x8,ldr-rgb-08.png,36.4625,0.0694,0.0563,1.1645 -Small,8x8,ldr-rgb-09.png,29.1520,0.1056,0.0925,0.7082 -Small,8x8,ldr-rgb-10.png,32.3031,0.0311,0.0203,0.7995 -Small,8x8,ldr-rgba-00.png,26.6704,0.1556,0.1416,0.4628 -Small,8x8,ldr-rgba-01.png,28.3932,0.1236,0.1102,0.5949 -Small,8x8,ldr-rgba-02.png,23.9599,0.1471,0.1334,0.4913 -Small,8x8,ldr-xy-00.png,34.3120,0.0871,0.0717,0.9146 -Small,8x8,ldr-xy-01.png,35.2097,0.0895,0.0744,0.8808 -Small,8x8,ldr-xy-02.png,44.5878,0.1132,0.0978,0.6698 -Small,8x8,ldrs-rgba-00.png,26.6715,0.1570,0.1430,0.4584 -Small,8x8,ldrs-rgba-01.png,28.3959,0.1228,0.1090,0.6010 -Small,8x8,ldrs-rgba-02.png,23.9597,0.1471,0.1338,0.4899 -Small,12x12,hdr-rgb-00.hdr,21.0019,0.2810,0.1700,0.3854 -Small,12x12,ldr-rgb-00.png,25.0133,0.1872,0.1642,0.3991 -Small,12x12,ldr-rgb-01.png,25.1167,0.1575,0.1347,0.4866 -Small,12x12,ldr-rgb-02.png,19.2912,0.1907,0.1677,0.3907 -Small,12x12,ldr-rgb-03.png,36.1206,0.0576,0.0350,1.8725 -Small,12x12,ldr-rgb-04.png,25.0074,0.1572,0.1344,0.4876 -Small,12x12,ldr-rgb-05.png,21.7140,0.1876,0.1645,0.3985 -Small,12x12,ldr-rgb-06.png,19.2810,0.1856,0.1624,0.4036 -Small,12x12,ldr-rgb-07.png,27.0419,0.1702,0.1466,0.4470 -Small,12x12,ldr-rgb-08.png,32.3840,0.0790,0.0561,1.1686 -Small,12x12,ldr-rgb-09.png,24.3053,0.1488,0.1257,0.5213 -Small,12x12,ldr-rgb-10.png,28.1356,0.0548,0.0348,0.4676 -Small,12x12,ldr-rgba-00.png,22.7010,0.2002,0.1765,0.3712 -Small,12x12,ldr-rgba-01.png,24.7078,0.1492,0.1256,0.5219 -Small,12x12,ldr-rgba-02.png,20.1958,0.1957,0.1723,0.3804 -Small,12x12,ldr-xy-00.png,30.5742,0.1175,0.0923,0.7104 -Small,12x12,ldr-xy-01.png,32.1255,0.0886,0.0639,1.0256 -Small,12x12,ldr-xy-02.png,40.3053,0.0645,0.0397,1.6525 -Small,12x12,ldrs-rgba-00.png,22.7006,0.1999,0.1760,0.3723 -Small,12x12,ldrs-rgba-01.png,24.7093,0.1483,0.1249,0.5247 -Small,12x12,ldrs-rgba-02.png,20.1960,0.1979,0.1736,0.3776 -Small,3x3x3,ldr-l-00-3.dds,52.4159,0.0563,0.0484,5.4142 -Small,3x3x3,ldr-l-01-3.dds,55.3973,0.0242,0.0191,3.6079 -Small,6x6x6,ldr-l-00-3.dds,33.2725,0.1434,0.1174,2.2327 -Small,6x6x6,ldr-l-01-3.dds,41.5751,0.0479,0.0245,2.8120 diff --git a/Test/Images/Small/astc_reference-4.3-avx2_fast_results.csv b/Test/Images/Small/astc_reference-4.3-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f9bc6e820bb8759c7a0228f37f4008ad94cb9360 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-avx2_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7131,0.0965,0.0119,5.4851 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0028,0.0004,0.6039 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0028,0.0005,0.5639 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0004,0.5845 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0028,0.0004,0.5871 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0028,0.0004,0.5900 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0029,0.0004,0.5779 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0029,0.0004,0.5791 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0028,0.0004,0.5845 +Small,4x4,ldr-rgb-00.png,38.2268,0.0132,0.0079,8.2884 +Small,4x4,ldr-rgb-01.png,39.9056,0.0119,0.0068,9.6054 +Small,4x4,ldr-rgb-02.png,35.1296,0.0156,0.0106,6.2119 +Small,4x4,ldr-rgb-03.png,46.0570,0.0072,0.0024,27.0922 +Small,4x4,ldr-rgb-04.png,41.9409,0.0096,0.0046,14.1216 +Small,4x4,ldr-rgb-05.png,37.3207,0.0155,0.0105,6.2565 +Small,4x4,ldr-rgb-06.png,35.3350,0.0147,0.0096,6.8444 +Small,4x4,ldr-rgb-07.png,38.1282,0.0159,0.0109,6.0352 +Small,4x4,ldr-rgb-08.png,43.8182,0.0085,0.0038,17.1788 +Small,4x4,ldr-rgb-09.png,41.8937,0.0097,0.0048,13.5541 +Small,4x4,ldr-rgb-10.png,44.4076,0.0042,0.0012,13.1424 +Small,4x4,ldr-rgba-00.png,35.5904,0.0158,0.0104,6.2966 +Small,4x4,ldr-rgba-01.png,38.8444,0.0114,0.0061,10.6927 +Small,4x4,ldr-rgba-02.png,34.8609,0.0141,0.0087,7.5198 +Small,4x4,ldr-xy-00.png,37.5753,0.0115,0.0042,15.5668 +Small,4x4,ldr-xy-01.png,44.1942,0.0125,0.0052,12.6125 +Small,4x4,ldr-xy-02.png,48.2321,0.0104,0.0033,19.9259 +Small,4x4,ldrs-rgba-00.png,35.5961,0.0158,0.0106,6.2060 +Small,4x4,ldrs-rgba-01.png,38.8644,0.0115,0.0063,10.4676 +Small,4x4,ldrs-rgba-02.png,34.8622,0.0141,0.0088,7.4430 +Small,5x5,hdr-rgb-00.hdr,29.4941,0.0968,0.0120,5.4532 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.6022 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5955 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5754 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.6125 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.6053 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5926 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5913 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5884 +Small,5x5,ldr-rgb-00.png,34.4207,0.0133,0.0075,8.7080 +Small,5x5,ldr-rgb-01.png,36.2361,0.0107,0.0050,13.1282 +Small,5x5,ldr-rgb-02.png,31.0781,0.0138,0.0080,8.1535 +Small,5x5,ldr-rgb-03.png,42.7340,0.0075,0.0022,30.2696 +Small,5x5,ldr-rgb-04.png,37.2632,0.0099,0.0043,15.2194 +Small,5x5,ldr-rgb-05.png,33.2658,0.0158,0.0102,6.4504 +Small,5x5,ldr-rgb-06.png,31.1162,0.0135,0.0078,8.3753 +Small,5x5,ldr-rgb-07.png,35.0545,0.0140,0.0083,7.8798 +Small,5x5,ldr-rgb-08.png,40.1761,0.0087,0.0032,20.7064 +Small,5x5,ldr-rgb-09.png,37.2884,0.0100,0.0043,15.3409 +Small,5x5,ldr-rgb-10.png,40.1912,0.0048,0.0011,14.4241 +Small,5x5,ldr-rgba-00.png,32.1049,0.0165,0.0107,6.1420 +Small,5x5,ldr-rgba-01.png,35.1901,0.0117,0.0058,11.3207 +Small,5x5,ldr-rgba-02.png,31.1173,0.0141,0.0081,8.0889 +Small,5x5,ldr-xy-00.png,36.7217,0.0118,0.0035,18.5540 +Small,5x5,ldr-xy-01.png,39.7502,0.0123,0.0042,15.4634 +Small,5x5,ldr-xy-02.png,43.9350,0.0113,0.0031,20.9192 +Small,5x5,ldrs-rgba-00.png,32.1059,0.0166,0.0106,6.1880 +Small,5x5,ldrs-rgba-01.png,35.1983,0.0116,0.0057,11.4916 +Small,5x5,ldrs-rgba-02.png,31.1181,0.0142,0.0082,7.9571 +Small,6x6,hdr-rgb-00.hdr,27.0493,0.0970,0.0118,5.5643 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5334 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5820 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5926 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5995 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5845 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5874 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5896 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5887 +Small,6x6,ldr-rgb-00.png,31.7043,0.0146,0.0089,7.3735 +Small,6x6,ldr-rgb-01.png,32.9205,0.0115,0.0060,10.9740 +Small,6x6,ldr-rgb-02.png,27.4737,0.0141,0.0085,7.7402 +Small,6x6,ldr-rgb-03.png,40.5514,0.0073,0.0020,32.3805 +Small,6x6,ldr-rgb-04.png,33.9239,0.0104,0.0049,13.4929 +Small,6x6,ldr-rgb-05.png,29.9695,0.0170,0.0115,5.7191 +Small,6x6,ldr-rgb-06.png,27.5383,0.0140,0.0084,7.8011 +Small,6x6,ldr-rgb-07.png,32.9325,0.0135,0.0079,8.2499 +Small,6x6,ldr-rgb-08.png,37.7991,0.0084,0.0031,21.0328 +Small,6x6,ldr-rgb-09.png,33.4925,0.0107,0.0051,12.8809 +Small,6x6,ldr-rgb-10.png,36.6382,0.0048,0.0013,12.8404 +Small,6x6,ldr-rgba-00.png,29.6020,0.0179,0.0120,5.4505 +Small,6x6,ldr-rgba-01.png,32.0799,0.0122,0.0064,10.2269 +Small,6x6,ldr-rgba-02.png,27.8399,0.0150,0.0090,7.2931 +Small,6x6,ldr-xy-00.png,35.8063,0.0115,0.0035,18.6446 +Small,6x6,ldr-xy-01.png,37.1041,0.0130,0.0050,13.0577 +Small,6x6,ldr-xy-02.png,41.9418,0.0108,0.0029,22.3369 +Small,6x6,ldrs-rgba-00.png,29.5967,0.0179,0.0121,5.4359 +Small,6x6,ldrs-rgba-01.png,32.0856,0.0123,0.0065,10.1401 +Small,6x6,ldrs-rgba-02.png,27.8376,0.0148,0.0091,7.2264 +Small,8x8,hdr-rgb-00.hdr,23.7764,0.0997,0.0142,4.6165 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0036,0.0004,0.5884 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0036,0.0004,0.5727 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0004,0.5845 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5832 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5900 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0004,0.5807 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0004,0.5884 +Small,8x8,ldr-rgb-00.png,28.0488,0.0157,0.0096,6.8110 +Small,8x8,ldr-rgb-01.png,28.7761,0.0132,0.0075,8.7452 +Small,8x8,ldr-rgb-02.png,23.1000,0.0171,0.0113,5.7940 +Small,8x8,ldr-rgb-03.png,37.3080,0.0077,0.0022,29.7358 +Small,8x8,ldr-rgb-04.png,29.3451,0.0127,0.0070,9.3988 +Small,8x8,ldr-rgb-05.png,25.8017,0.0190,0.0132,4.9588 +Small,8x8,ldr-rgb-06.png,23.1661,0.0176,0.0117,5.6231 +Small,8x8,ldr-rgb-07.png,29.8439,0.0134,0.0076,8.6266 +Small,8x8,ldr-rgb-08.png,34.4683,0.0091,0.0034,19.3209 +Small,8x8,ldr-rgb-09.png,28.6358,0.0121,0.0064,10.2689 +Small,8x8,ldr-rgb-10.png,31.9939,0.0053,0.0015,10.6602 +Small,8x8,ldr-rgba-00.png,25.6784,0.0192,0.0131,4.9849 +Small,8x8,ldr-rgba-01.png,28.2720,0.0148,0.0088,7.4693 +Small,8x8,ldr-rgba-02.png,23.9333,0.0187,0.0126,5.1902 +Small,8x8,ldr-xy-00.png,33.3023,0.0130,0.0045,14.6805 +Small,8x8,ldr-xy-01.png,34.4386,0.0138,0.0053,12.2609 +Small,8x8,ldr-xy-02.png,39.9000,0.0104,0.0020,32.4915 +Small,8x8,ldrs-rgba-00.png,25.6786,0.0192,0.0133,4.9401 +Small,8x8,ldrs-rgba-01.png,28.2748,0.0151,0.0089,7.3405 +Small,8x8,ldrs-rgba-02.png,23.9335,0.0188,0.0126,5.2034 +Small,12x12,hdr-rgb-00.hdr,20.5354,0.1082,0.0207,3.1687 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0055,0.0005,0.4716 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0056,0.0005,0.5639 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0056,0.0005,0.5578 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0056,0.0004,0.5804 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0056,0.0005,0.5613 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0055,0.0004,0.5896 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0004,0.5942 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0054,0.0004,0.5896 +Small,12x12,ldr-rgb-00.png,23.7994,0.0164,0.0084,7.7592 +Small,12x12,ldr-rgb-01.png,24.7706,0.0138,0.0061,10.8058 +Small,12x12,ldr-rgb-02.png,19.2291,0.0212,0.0135,4.8466 +Small,12x12,ldr-rgb-03.png,33.2407,0.0090,0.0016,41.1864 +Small,12x12,ldr-rgb-04.png,24.5750,0.0134,0.0057,11.5480 +Small,12x12,ldr-rgb-05.png,21.4889,0.0198,0.0119,5.4999 +Small,12x12,ldr-rgb-06.png,19.2240,0.0218,0.0140,4.6839 +Small,12x12,ldr-rgb-07.png,25.3851,0.0133,0.0057,11.5953 +Small,12x12,ldr-rgb-08.png,30.2920,0.0101,0.0027,24.1206 +Small,12x12,ldr-rgb-09.png,23.7357,0.0150,0.0074,8.9116 +Small,12x12,ldr-rgb-10.png,27.3235,0.0075,0.0019,8.4973 +Small,12x12,ldr-rgba-00.png,21.6066,0.0213,0.0134,4.8751 +Small,12x12,ldr-rgba-01.png,24.5233,0.0152,0.0072,9.0545 +Small,12x12,ldr-rgba-02.png,20.1709,0.0240,0.0159,4.1185 +Small,12x12,ldr-xy-00.png,29.2241,0.0159,0.0047,14.0488 +Small,12x12,ldr-xy-01.png,30.5471,0.0152,0.0041,15.9646 +Small,12x12,ldr-xy-02.png,37.9951,0.0120,0.0010,63.1468 +Small,12x12,ldrs-rgba-00.png,21.6105,0.0215,0.0136,4.8170 +Small,12x12,ldrs-rgba-01.png,24.5251,0.0154,0.0073,8.9738 +Small,12x12,ldrs-rgba-02.png,20.1707,0.0239,0.0158,4.1407 +Small,3x3x3,ldr-l-00-3.dds,50.8346,0.0152,0.0074,35.2577 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0073,0.0032,21.6520 +Small,6x6x6,ldr-l-00-3.dds,32.5376,0.0456,0.0346,7.5767 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0210,0.0133,5.1847 diff --git a/Test/Images/Small/astc_reference-4.3-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-4.3-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..9544232830d7cf24d35905b88797163771032d6c --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-avx2_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3308,0.0916,0.0073,8.9689 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0022,0.0004,0.5955 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0022,0.0004,0.5896 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.5871 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0022,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0023,0.0004,0.5995 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0022,0.0004,0.5858 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.6094 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0022,0.0004,0.5900 +Small,4x4,ldr-rgb-00.png,37.2237,0.0093,0.0046,14.1821 +Small,4x4,ldr-rgb-01.png,39.5245,0.0084,0.0040,16.2659 +Small,4x4,ldr-rgb-02.png,34.7577,0.0103,0.0059,11.1589 +Small,4x4,ldr-rgb-03.png,45.4692,0.0060,0.0018,36.2063 +Small,4x4,ldr-rgb-04.png,41.6640,0.0075,0.0030,21.5591 +Small,4x4,ldr-rgb-05.png,36.8562,0.0106,0.0061,10.6948 +Small,4x4,ldr-rgb-06.png,34.9322,0.0099,0.0055,11.9898 +Small,4x4,ldr-rgb-07.png,37.3406,0.0102,0.0058,11.2664 +Small,4x4,ldr-rgb-08.png,42.9161,0.0067,0.0025,26.0153 +Small,4x4,ldr-rgb-09.png,41.7016,0.0075,0.0031,21.0651 +Small,4x4,ldr-rgb-10.png,43.9130,0.0035,0.0010,15.6167 +Small,4x4,ldr-rgba-00.png,34.7268,0.0105,0.0058,11.3328 +Small,4x4,ldr-rgba-01.png,38.6479,0.0091,0.0044,14.7530 +Small,4x4,ldr-rgba-02.png,34.5493,0.0109,0.0062,10.6373 +Small,4x4,ldr-xy-00.png,37.5056,0.0096,0.0031,21.0925 +Small,4x4,ldr-xy-01.png,43.8548,0.0103,0.0038,17.3688 +Small,4x4,ldr-xy-02.png,48.2399,0.0092,0.0026,25.5796 +Small,4x4,ldrs-rgba-00.png,34.7310,0.0105,0.0058,11.2738 +Small,4x4,ldrs-rgba-01.png,38.6664,0.0091,0.0044,15.0618 +Small,4x4,ldrs-rgba-02.png,34.5527,0.0110,0.0062,10.6373 +Small,5x5,hdr-rgb-00.hdr,28.8495,0.0918,0.0074,8.9032 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5791 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5820 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5939 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5939 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5982 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5900 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5926 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5900 +Small,5x5,ldr-rgb-00.png,33.7101,0.0093,0.0043,15.1248 +Small,5x5,ldr-rgb-01.png,36.0660,0.0084,0.0036,18.4197 +Small,5x5,ldr-rgb-02.png,30.9741,0.0105,0.0057,11.4532 +Small,5x5,ldr-rgb-03.png,42.3108,0.0062,0.0017,39.2627 +Small,5x5,ldr-rgb-04.png,37.0268,0.0081,0.0032,20.4416 +Small,5x5,ldr-rgb-05.png,32.9511,0.0112,0.0064,10.2429 +Small,5x5,ldr-rgb-06.png,31.0218,0.0105,0.0056,11.7339 +Small,5x5,ldr-rgb-07.png,34.4024,0.0101,0.0054,12.1654 +Small,5x5,ldr-rgb-08.png,39.5680,0.0068,0.0022,29.2175 +Small,5x5,ldr-rgb-09.png,37.0647,0.0079,0.0031,20.8509 +Small,5x5,ldr-rgb-10.png,39.8999,0.0038,0.0010,16.4891 +Small,5x5,ldr-rgba-00.png,31.0999,0.0110,0.0059,11.0775 +Small,5x5,ldr-rgba-01.png,35.0302,0.0093,0.0042,15.6190 +Small,5x5,ldr-rgba-02.png,31.0219,0.0114,0.0062,10.5857 +Small,5x5,ldr-xy-00.png,36.6320,0.0099,0.0027,24.3535 +Small,5x5,ldr-xy-01.png,39.1493,0.0104,0.0031,21.3199 +Small,5x5,ldr-xy-02.png,43.8491,0.0097,0.0024,27.1056 +Small,5x5,ldrs-rgba-00.png,31.1012,0.0111,0.0059,11.0557 +Small,5x5,ldrs-rgba-01.png,35.0367,0.0092,0.0043,15.4019 +Small,5x5,ldrs-rgba-02.png,31.0226,0.0114,0.0062,10.5313 +Small,6x6,hdr-rgb-00.hdr,26.7317,0.0912,0.0067,9.7554 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5804 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5926 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5952 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.6125 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.6009 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5926 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5969 +Small,6x6,ldr-rgb-00.png,31.3212,0.0098,0.0049,13.3884 +Small,6x6,ldr-rgb-01.png,32.8336,0.0088,0.0041,16.0823 +Small,6x6,ldr-rgb-02.png,27.3837,0.0107,0.0060,10.9317 +Small,6x6,ldr-rgb-03.png,40.3163,0.0061,0.0016,42.1204 +Small,6x6,ldr-rgb-04.png,33.7482,0.0083,0.0036,18.2911 +Small,6x6,ldr-rgb-05.png,29.7352,0.0118,0.0070,9.3998 +Small,6x6,ldr-rgb-06.png,27.4658,0.0109,0.0060,10.8506 +Small,6x6,ldr-rgb-07.png,32.3326,0.0097,0.0050,13.1313 +Small,6x6,ldr-rgb-08.png,37.4336,0.0067,0.0021,30.6407 +Small,6x6,ldr-rgb-09.png,33.3061,0.0083,0.0036,18.3840 +Small,6x6,ldr-rgb-10.png,36.5144,0.0039,0.0011,15.2363 +Small,6x6,ldr-rgba-00.png,28.8377,0.0110,0.0060,10.8759 +Small,6x6,ldr-rgba-01.png,31.9912,0.0096,0.0046,14.2564 +Small,6x6,ldr-rgba-02.png,27.7796,0.0113,0.0062,10.6233 +Small,6x6,ldr-xy-00.png,35.6056,0.0098,0.0027,24.4445 +Small,6x6,ldr-xy-01.png,36.4953,0.0104,0.0034,19.1566 +Small,6x6,ldr-xy-02.png,41.7981,0.0093,0.0023,28.6690 +Small,6x6,ldrs-rgba-00.png,28.8345,0.0113,0.0062,10.5329 +Small,6x6,ldrs-rgba-01.png,31.9977,0.0097,0.0046,14.1821 +Small,6x6,ldrs-rgba-02.png,27.7778,0.0113,0.0062,10.5669 +Small,8x8,hdr-rgb-00.hdr,23.6038,0.0957,0.0098,6.6975 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5982 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.6185 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5820 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.6053 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5871 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5995 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.6039 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5751 +Small,8x8,ldr-rgb-00.png,27.7031,0.0125,0.0068,9.6350 +Small,8x8,ldr-rgb-01.png,28.6850,0.0113,0.0057,11.4671 +Small,8x8,ldr-rgb-02.png,23.0240,0.0141,0.0084,7.8308 +Small,8x8,ldr-rgb-03.png,37.0258,0.0070,0.0018,36.1634 +Small,8x8,ldr-rgb-04.png,29.1260,0.0108,0.0052,12.6789 +Small,8x8,ldr-rgb-05.png,25.6018,0.0154,0.0097,6.7900 +Small,8x8,ldr-rgb-06.png,23.0810,0.0144,0.0087,7.5458 +Small,8x8,ldr-rgb-07.png,29.4659,0.0111,0.0056,11.7489 +Small,8x8,ldr-rgb-08.png,33.9551,0.0080,0.0026,25.5915 +Small,8x8,ldr-rgb-09.png,28.4493,0.0106,0.0050,13.1414 +Small,8x8,ldr-rgb-10.png,31.9058,0.0049,0.0012,13.0368 +Small,8x8,ldr-rgba-00.png,25.3128,0.0148,0.0089,7.3273 +Small,8x8,ldr-rgba-01.png,28.1781,0.0123,0.0065,10.1435 +Small,8x8,ldr-rgba-02.png,23.8711,0.0148,0.0089,7.3977 +Small,8x8,ldr-xy-00.png,33.2750,0.0119,0.0036,18.3828 +Small,8x8,ldr-xy-01.png,34.1754,0.0124,0.0040,16.2987 +Small,8x8,ldr-xy-02.png,39.7771,0.0099,0.0017,39.4090 +Small,8x8,ldrs-rgba-00.png,25.3134,0.0148,0.0089,7.3520 +Small,8x8,ldrs-rgba-01.png,28.1794,0.0122,0.0064,10.1875 +Small,8x8,ldrs-rgba-02.png,23.8706,0.0147,0.0088,7.4864 +Small,12x12,hdr-rgb-00.hdr,20.4510,0.1015,0.0144,4.5666 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0049,0.0004,0.6111 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0048,0.0004,0.5939 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0049,0.0004,0.6171 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5939 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0004,0.6066 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5730 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5965 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0004,0.6167 +Small,12x12,ldr-rgb-00.png,23.7098,0.0134,0.0061,10.8288 +Small,12x12,ldr-rgb-01.png,24.7256,0.0115,0.0043,15.1107 +Small,12x12,ldr-rgb-02.png,19.1930,0.0167,0.0095,6.8994 +Small,12x12,ldr-rgb-03.png,33.1431,0.0081,0.0013,48.8325 +Small,12x12,ldr-rgb-04.png,24.3870,0.0115,0.0043,15.0692 +Small,12x12,ldr-rgb-05.png,21.3834,0.0158,0.0086,7.6215 +Small,12x12,ldr-rgb-06.png,19.1690,0.0170,0.0098,6.6833 +Small,12x12,ldr-rgb-07.png,25.3142,0.0114,0.0042,15.6599 +Small,12x12,ldr-rgb-08.png,30.1204,0.0090,0.0021,31.6753 +Small,12x12,ldr-rgb-09.png,23.5983,0.0126,0.0055,11.9699 +Small,12x12,ldr-rgb-10.png,27.2834,0.0066,0.0014,11.3600 +Small,12x12,ldr-rgba-00.png,21.3613,0.0167,0.0092,7.1460 +Small,12x12,ldr-rgba-01.png,24.4808,0.0128,0.0053,12.3142 +Small,12x12,ldr-rgba-02.png,20.1381,0.0187,0.0113,5.8115 +Small,12x12,ldr-xy-00.png,28.8908,0.0141,0.0036,18.1390 +Small,12x12,ldr-xy-01.png,29.6770,0.0137,0.0032,20.6287 +Small,12x12,ldr-xy-02.png,37.9716,0.0114,0.0010,64.6315 +Small,12x12,ldrs-rgba-00.png,21.3627,0.0168,0.0094,6.9549 +Small,12x12,ldrs-rgba-01.png,24.4817,0.0128,0.0053,12.2609 +Small,12x12,ldrs-rgba-02.png,20.1379,0.0188,0.0114,5.7721 +Small,3x3x3,ldr-l-00-3.dds,50.6979,0.0141,0.0074,35.6267 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0065,0.0032,21.8781 +Small,6x6x6,ldr-l-00-3.dds,32.5210,0.0455,0.0346,7.5725 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0211,0.0134,5.1472 diff --git a/Test/Images/Small/astc_reference-4.3-avx2_medium_results.csv b/Test/Images/Small/astc_reference-4.3-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..1ef9470ba57ec6bb5a03c963f3d5240acf502e62 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-avx2_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1238,0.1034,0.0181,3.6288 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0037,0.0005,0.4785 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5651 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0005,0.5321 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5423 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5791 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5742 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5714 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5804 +Small,4x4,ldr-rgb-00.png,38.8091,0.0258,0.0198,3.3111 +Small,4x4,ldr-rgb-01.png,40.2008,0.0225,0.0168,3.9082 +Small,4x4,ldr-rgb-02.png,35.2658,0.0231,0.0173,3.7849 +Small,4x4,ldr-rgb-03.png,47.2399,0.0151,0.0098,6.7174 +Small,4x4,ldr-rgb-04.png,42.1842,0.0190,0.0132,4.9751 +Small,4x4,ldr-rgb-05.png,37.7989,0.0249,0.0191,3.4312 +Small,4x4,ldr-rgb-06.png,35.4538,0.0209,0.0151,4.3315 +Small,4x4,ldr-rgb-07.png,39.2651,0.0303,0.0246,2.6676 +Small,4x4,ldr-rgb-08.png,45.1580,0.0176,0.0121,5.4073 +Small,4x4,ldr-rgb-09.png,42.1202,0.0192,0.0135,4.8581 +Small,4x4,ldr-rgb-10.png,44.8973,0.0060,0.0023,7.0648 +Small,4x4,ldr-rgba-00.png,36.2355,0.0279,0.0220,2.9849 +Small,4x4,ldr-rgba-01.png,38.9520,0.0187,0.0126,5.2062 +Small,4x4,ldr-rgba-02.png,34.9310,0.0200,0.0139,4.7176 +Small,4x4,ldr-xy-00.png,37.7517,0.0188,0.0115,5.7063 +Small,4x4,ldr-xy-01.png,45.1812,0.0251,0.0178,3.6886 +Small,4x4,ldr-xy-02.png,50.9688,0.0293,0.0220,2.9851 +Small,4x4,ldrs-rgba-00.png,36.2429,0.0281,0.0221,2.9613 +Small,4x4,ldrs-rgba-01.png,38.9706,0.0187,0.0126,5.1861 +Small,4x4,ldrs-rgba-02.png,34.9330,0.0201,0.0140,4.6708 +Small,5x5,hdr-rgb-00.hdr,29.8792,0.1060,0.0197,3.3260 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0046,0.0005,0.4724 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0004,0.5791 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0005,0.5628 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0004,0.5764 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0046,0.0004,0.5926 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0046,0.0004,0.5913 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0004,0.5955 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5589 +Small,5x5,ldr-rgb-00.png,35.1353,0.0272,0.0202,3.2421 +Small,5x5,ldr-rgb-01.png,36.4365,0.0210,0.0143,4.5880 +Small,5x5,ldr-rgb-02.png,31.1195,0.0215,0.0146,4.4759 +Small,5x5,ldr-rgb-03.png,43.9924,0.0124,0.0060,10.9925 +Small,5x5,ldr-rgb-04.png,37.6527,0.0198,0.0130,5.0257 +Small,5x5,ldr-rgb-05.png,33.5357,0.0280,0.0212,3.0899 +Small,5x5,ldr-rgb-06.png,31.1617,0.0209,0.0140,4.6946 +Small,5x5,ldr-rgb-07.png,36.1275,0.0311,0.0243,2.6947 +Small,5x5,ldr-rgb-08.png,41.6131,0.0166,0.0102,6.4491 +Small,5x5,ldr-rgb-09.png,37.5769,0.0191,0.0122,5.3749 +Small,5x5,ldr-rgb-10.png,40.5644,0.0071,0.0024,6.8505 +Small,5x5,ldr-rgba-00.png,32.7897,0.0314,0.0245,2.6803 +Small,5x5,ldr-rgba-01.png,35.3090,0.0202,0.0131,4.9910 +Small,5x5,ldr-rgba-02.png,31.1309,0.0217,0.0145,4.5083 +Small,5x5,ldr-xy-00.png,37.0786,0.0191,0.0106,6.1985 +Small,5x5,ldr-xy-01.png,40.5669,0.0241,0.0157,4.1613 +Small,5x5,ldr-xy-02.png,49.0821,0.0200,0.0115,5.6973 +Small,5x5,ldrs-rgba-00.png,32.7935,0.0317,0.0247,2.6484 +Small,5x5,ldrs-rgba-01.png,35.3182,0.0203,0.0133,4.9338 +Small,5x5,ldrs-rgba-02.png,31.1320,0.0219,0.0148,4.4380 +Small,6x6,hdr-rgb-00.hdr,27.4934,0.1065,0.0203,3.2333 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0005,0.5495 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0044,0.0004,0.5727 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0005,0.5437 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0044,0.0005,0.5321 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0043,0.0004,0.5858 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0043,0.0004,0.5845 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0004,0.5913 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0043,0.0004,0.5995 +Small,6x6,ldr-rgb-00.png,32.3857,0.0275,0.0208,3.1581 +Small,6x6,ldr-rgb-01.png,33.0813,0.0205,0.0140,4.6972 +Small,6x6,ldr-rgb-02.png,27.5038,0.0212,0.0147,4.4619 +Small,6x6,ldr-rgb-03.png,41.7098,0.0110,0.0047,14.0934 +Small,6x6,ldr-rgb-04.png,34.1976,0.0186,0.0120,5.4451 +Small,6x6,ldr-rgb-05.png,30.1358,0.0280,0.0213,3.0747 +Small,6x6,ldr-rgb-06.png,27.5712,0.0209,0.0143,4.5711 +Small,6x6,ldr-rgb-07.png,33.8773,0.0294,0.0229,2.8611 +Small,6x6,ldr-rgb-08.png,39.1910,0.0140,0.0077,8.5557 +Small,6x6,ldr-rgb-09.png,33.6644,0.0181,0.0114,5.7302 +Small,6x6,ldr-rgb-10.png,36.9239,0.0071,0.0025,6.4021 +Small,6x6,ldr-rgba-00.png,30.2372,0.0334,0.0267,2.4567 +Small,6x6,ldr-rgba-01.png,32.1918,0.0204,0.0136,4.8217 +Small,6x6,ldr-rgba-02.png,27.8514,0.0227,0.0157,4.1871 +Small,6x6,ldr-xy-00.png,36.2476,0.0173,0.0091,7.2399 +Small,6x6,ldr-xy-01.png,37.9375,0.0196,0.0115,5.6741 +Small,6x6,ldr-xy-02.png,46.0669,0.0164,0.0084,7.8431 +Small,6x6,ldrs-rgba-00.png,30.2354,0.0333,0.0266,2.4656 +Small,6x6,ldrs-rgba-01.png,32.1978,0.0204,0.0136,4.8163 +Small,6x6,ldrs-rgba-02.png,27.8496,0.0227,0.0158,4.1468 +Small,8x8,hdr-rgb-00.hdr,24.1284,0.1122,0.0252,2.5996 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0050,0.0006,0.4523 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0050,0.0005,0.5578 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0050,0.0004,0.5767 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0050,0.0004,0.5742 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0050,0.0005,0.5481 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5702 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0050,0.0004,0.5754 +Small,8x8,ldr-rgb-00.png,28.7284,0.0347,0.0274,2.3920 +Small,8x8,ldr-rgb-01.png,28.9370,0.0246,0.0175,3.7529 +Small,8x8,ldr-rgb-02.png,23.1614,0.0261,0.0190,3.4573 +Small,8x8,ldr-rgb-03.png,38.5560,0.0123,0.0054,12.0497 +Small,8x8,ldr-rgb-04.png,29.6453,0.0244,0.0171,3.8260 +Small,8x8,ldr-rgb-05.png,25.9412,0.0330,0.0257,2.5457 +Small,8x8,ldr-rgb-06.png,23.2047,0.0266,0.0192,3.4046 +Small,8x8,ldr-rgb-07.png,30.7489,0.0342,0.0271,2.4222 +Small,8x8,ldr-rgb-08.png,35.9057,0.0164,0.0093,7.0545 +Small,8x8,ldr-rgb-09.png,28.9902,0.0226,0.0155,4.2240 +Small,8x8,ldr-rgb-10.png,32.1710,0.0085,0.0033,4.9201 +Small,8x8,ldr-rgba-00.png,26.4438,0.0400,0.0325,2.0151 +Small,8x8,ldr-rgba-01.png,28.3668,0.0249,0.0174,3.7660 +Small,8x8,ldr-rgba-02.png,23.9414,0.0284,0.0208,3.1467 +Small,8x8,ldr-xy-00.png,33.9206,0.0225,0.0123,5.3126 +Small,8x8,ldr-xy-01.png,34.9386,0.0225,0.0124,5.2771 +Small,8x8,ldr-xy-02.png,41.6877,0.0182,0.0083,7.9360 +Small,8x8,ldrs-rgba-00.png,26.4457,0.0403,0.0328,1.9977 +Small,8x8,ldrs-rgba-01.png,28.3703,0.0248,0.0174,3.7668 +Small,8x8,ldrs-rgba-02.png,23.9416,0.0283,0.0208,3.1461 +Small,12x12,hdr-rgb-00.hdr,20.7755,0.1269,0.0367,1.7853 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0078,0.0005,0.5678 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0078,0.0004,0.5767 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0078,0.0004,0.5817 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0078,0.0004,0.5845 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0080,0.0005,0.5060 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0078,0.0005,0.5437 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0078,0.0004,0.5730 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0078,0.0004,0.5751 +Small,12x12,ldr-rgb-00.png,24.6915,0.0432,0.0329,1.9905 +Small,12x12,ldr-rgb-01.png,25.0393,0.0326,0.0226,2.9057 +Small,12x12,ldr-rgb-02.png,19.2743,0.0377,0.0275,2.3852 +Small,12x12,ldr-rgb-03.png,34.9505,0.0157,0.0058,11.2351 +Small,12x12,ldr-rgb-04.png,24.9006,0.0319,0.0218,3.0125 +Small,12x12,ldr-rgb-05.png,21.6514,0.0432,0.0331,1.9775 +Small,12x12,ldr-rgb-06.png,19.2513,0.0383,0.0281,2.3290 +Small,12x12,ldr-rgb-07.png,26.7396,0.0397,0.0296,2.2117 +Small,12x12,ldr-rgb-08.png,31.6566,0.0201,0.0102,6.4472 +Small,12x12,ldr-rgb-09.png,24.1576,0.0306,0.0206,3.1861 +Small,12x12,ldr-rgb-10.png,28.0433,0.0145,0.0065,2.4941 +Small,12x12,ldr-rgba-00.png,22.2473,0.0479,0.0376,1.7419 +Small,12x12,ldr-rgba-01.png,24.6500,0.0321,0.0217,3.0135 +Small,12x12,ldr-rgba-02.png,20.1848,0.0410,0.0305,2.1494 +Small,12x12,ldr-xy-00.png,30.2110,0.0285,0.0147,4.4471 +Small,12x12,ldr-xy-01.png,31.8412,0.0294,0.0153,4.2857 +Small,12x12,ldr-xy-02.png,38.5222,0.0174,0.0036,18.0996 +Small,12x12,ldrs-rgba-00.png,22.2476,0.0478,0.0372,1.7638 +Small,12x12,ldrs-rgba-01.png,24.6522,0.0322,0.0218,3.0100 +Small,12x12,ldrs-rgba-02.png,20.1848,0.0412,0.0305,2.1503 +Small,3x3x3,ldr-l-00-3.dds,51.8769,0.0193,0.0108,24.3110 +Small,3x3x3,ldr-l-01-3.dds,54.6166,0.0084,0.0034,20.4989 +Small,6x6x6,ldr-l-00-3.dds,32.9597,0.0560,0.0424,6.1774 +Small,6x6x6,ldr-l-01-3.dds,41.0140,0.0235,0.0135,5.1128 diff --git a/Test/Images/Small/astc_reference-4.3-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-4.3-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7b7cfbb5ea0db8fbc007ddab77f632f34f0999bd --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-avx2_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.3988,0.1207,0.0354,1.8527 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.4876 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5702 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5459 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5751 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0004,0.5702 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.6012 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0037,0.0005,0.5008 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0037,0.0005,0.5310 +Small,4x4,ldr-rgb-00.png,39.1396,0.0465,0.0407,1.6107 +Small,4x4,ldr-rgb-01.png,40.3879,0.0444,0.0386,1.6983 +Small,4x4,ldr-rgb-02.png,35.4469,0.0419,0.0360,1.8198 +Small,4x4,ldr-rgb-03.png,47.7050,0.0410,0.0356,1.8396 +Small,4x4,ldr-rgb-04.png,42.3343,0.0376,0.0318,2.0585 +Small,4x4,ldr-rgb-05.png,37.9716,0.0455,0.0396,1.6547 +Small,4x4,ldr-rgb-06.png,35.6101,0.0375,0.0315,2.0797 +Small,4x4,ldr-rgb-07.png,39.8550,0.0547,0.0490,1.3378 +Small,4x4,ldr-rgb-08.png,45.8141,0.0403,0.0348,1.8837 +Small,4x4,ldr-rgb-09.png,42.2663,0.0403,0.0345,1.9012 +Small,4x4,ldr-rgb-10.png,45.1134,0.0083,0.0046,3.5501 +Small,4x4,ldr-rgba-00.png,36.7024,0.0484,0.0423,1.5479 +Small,4x4,ldr-rgba-01.png,39.0829,0.0353,0.0293,2.2351 +Small,4x4,ldr-rgba-02.png,35.0183,0.0351,0.0290,2.2620 +Small,4x4,ldr-xy-00.png,37.7753,0.0459,0.0385,1.7007 +Small,4x4,ldr-xy-01.png,45.2569,0.0510,0.0439,1.4938 +Small,4x4,ldr-xy-02.png,50.9912,0.0625,0.0551,1.1890 +Small,4x4,ldrs-rgba-00.png,36.7104,0.0490,0.0429,1.5275 +Small,4x4,ldrs-rgba-01.png,39.1044,0.0357,0.0295,2.2189 +Small,4x4,ldrs-rgba-02.png,35.0233,0.0352,0.0291,2.2516 +Small,5x5,hdr-rgb-00.hdr,30.2809,0.1245,0.0381,1.7200 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0046,0.0005,0.4980 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0047,0.0005,0.5269 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0046,0.0005,0.5266 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0046,0.0004,0.5995 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5807 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0004,0.5817 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0046,0.0004,0.5699 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5613 +Small,5x5,ldr-rgb-00.png,35.3622,0.0520,0.0449,1.4595 +Small,5x5,ldr-rgb-01.png,36.5321,0.0458,0.0390,1.6795 +Small,5x5,ldr-rgb-02.png,31.1870,0.0403,0.0334,1.9607 +Small,5x5,ldr-rgb-03.png,44.5348,0.0447,0.0382,1.7153 +Small,5x5,ldr-rgb-04.png,37.8081,0.0413,0.0345,1.8992 +Small,5x5,ldr-rgb-05.png,33.6835,0.0521,0.0452,1.4495 +Small,5x5,ldr-rgb-06.png,31.2225,0.0377,0.0309,2.1219 +Small,5x5,ldr-rgb-07.png,36.7108,0.0618,0.0550,1.1906 +Small,5x5,ldr-rgb-08.png,42.3675,0.0442,0.0376,1.7435 +Small,5x5,ldr-rgb-09.png,37.6987,0.0452,0.0385,1.7017 +Small,5x5,ldr-rgb-10.png,40.7256,0.0101,0.0053,3.0626 +Small,5x5,ldr-rgba-00.png,33.0991,0.0562,0.0492,1.3317 +Small,5x5,ldr-rgba-01.png,35.4017,0.0394,0.0323,2.0285 +Small,5x5,ldr-rgba-02.png,31.1706,0.0382,0.0310,2.1111 +Small,5x5,ldr-xy-00.png,37.2351,0.0498,0.0415,1.5798 +Small,5x5,ldr-xy-01.png,41.4156,0.0592,0.0507,1.2932 +Small,5x5,ldr-xy-02.png,49.2617,0.0677,0.0590,1.1110 +Small,5x5,ldrs-rgba-00.png,33.1063,0.0564,0.0494,1.3263 +Small,5x5,ldrs-rgba-01.png,35.4095,0.0398,0.0327,2.0036 +Small,5x5,ldrs-rgba-02.png,31.1713,0.0385,0.0313,2.0912 +Small,6x6,hdr-rgb-00.hdr,27.6987,0.1260,0.0399,1.6413 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0004,0.5739 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0045,0.0004,0.5779 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0005,0.5687 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0005,0.5401 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0044,0.0005,0.5412 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5518 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0005,0.5192 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0005,0.5437 +Small,6x6,ldr-rgb-00.png,32.6236,0.0549,0.0480,1.3646 +Small,6x6,ldr-rgb-01.png,33.1855,0.0475,0.0409,1.6029 +Small,6x6,ldr-rgb-02.png,27.5522,0.0412,0.0346,1.8952 +Small,6x6,ldr-rgb-03.png,42.5760,0.0374,0.0311,2.1043 +Small,6x6,ldr-rgb-04.png,34.3279,0.0414,0.0349,1.8800 +Small,6x6,ldr-rgb-05.png,30.2792,0.0527,0.0460,1.4258 +Small,6x6,ldr-rgb-06.png,27.6242,0.0397,0.0330,1.9847 +Small,6x6,ldr-rgb-07.png,34.4221,0.0642,0.0576,1.1382 +Small,6x6,ldr-rgb-08.png,40.0080,0.0383,0.0318,2.0634 +Small,6x6,ldr-rgb-09.png,33.8156,0.0439,0.0373,1.7591 +Small,6x6,ldr-rgb-10.png,37.1747,0.0108,0.0062,2.6257 +Small,6x6,ldr-rgba-00.png,30.4928,0.0606,0.0536,1.2236 +Small,6x6,ldr-rgba-01.png,32.2722,0.0426,0.0357,1.8337 +Small,6x6,ldr-rgba-02.png,27.8884,0.0403,0.0332,1.9743 +Small,6x6,ldr-xy-00.png,36.3580,0.0402,0.0321,2.0441 +Small,6x6,ldr-xy-01.png,38.1144,0.0555,0.0473,1.3861 +Small,6x6,ldr-xy-02.png,47.4637,0.0678,0.0596,1.1002 +Small,6x6,ldrs-rgba-00.png,30.4894,0.0609,0.0541,1.2115 +Small,6x6,ldrs-rgba-01.png,32.2774,0.0432,0.0361,1.8163 +Small,6x6,ldrs-rgba-02.png,27.8865,0.0406,0.0336,1.9486 +Small,8x8,hdr-rgb-00.hdr,24.3310,0.1399,0.0516,1.2711 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0063,0.0005,0.5532 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0063,0.0004,0.5727 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0004,0.5730 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0004,0.5714 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0063,0.0004,0.5884 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0063,0.0004,0.5845 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0063,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0063,0.0004,0.5804 +Small,8x8,ldr-rgb-00.png,28.9743,0.0712,0.0619,1.0593 +Small,8x8,ldr-rgb-01.png,29.0250,0.0575,0.0490,1.3385 +Small,8x8,ldr-rgb-02.png,23.2010,0.0542,0.0454,1.4432 +Small,8x8,ldr-rgb-03.png,39.4059,0.0278,0.0194,3.3698 +Small,8x8,ldr-rgb-04.png,29.7753,0.0518,0.0431,1.5190 +Small,8x8,ldr-rgb-05.png,26.0443,0.0628,0.0541,1.2121 +Small,8x8,ldr-rgb-06.png,23.2548,0.0525,0.0437,1.5003 +Small,8x8,ldr-rgb-07.png,31.1954,0.0759,0.0672,0.9746 +Small,8x8,ldr-rgb-08.png,36.5527,0.0393,0.0309,2.1193 +Small,8x8,ldr-rgb-09.png,29.1512,0.0452,0.0367,1.7844 +Small,8x8,ldr-rgb-10.png,32.3269,0.0143,0.0076,2.1342 +Small,8x8,ldr-rgba-00.png,26.7456,0.0758,0.0670,0.9786 +Small,8x8,ldr-rgba-01.png,28.4290,0.0557,0.0468,1.3996 +Small,8x8,ldr-rgba-02.png,23.9672,0.0523,0.0432,1.5172 +Small,8x8,ldr-xy-00.png,34.1954,0.0465,0.0363,1.8065 +Small,8x8,ldr-xy-01.png,35.2284,0.0486,0.0384,1.7057 +Small,8x8,ldr-xy-02.png,44.4736,0.0613,0.0512,1.2804 +Small,8x8,ldrs-rgba-00.png,26.7460,0.0765,0.0677,0.9683 +Small,8x8,ldrs-rgba-01.png,28.4323,0.0556,0.0467,1.4022 +Small,8x8,ldrs-rgba-02.png,23.9676,0.0523,0.0433,1.5140 +Small,12x12,hdr-rgb-00.hdr,21.0278,0.1697,0.0771,0.8496 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0103,0.0004,0.5791 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0103,0.0004,0.5955 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0103,0.0004,0.5751 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0104,0.0004,0.5845 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0103,0.0004,0.5767 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0103,0.0004,0.5939 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0103,0.0004,0.5871 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0103,0.0005,0.5628 +Small,12x12,ldr-rgb-00.png,25.0567,0.0941,0.0812,0.8070 +Small,12x12,ldr-rgb-01.png,25.1428,0.0772,0.0646,1.0150 +Small,12x12,ldr-rgb-02.png,19.2937,0.0849,0.0722,0.9076 +Small,12x12,ldr-rgb-03.png,36.1599,0.0330,0.0208,3.1518 +Small,12x12,ldr-rgb-04.png,24.9934,0.0697,0.0571,1.1484 +Small,12x12,ldr-rgb-05.png,21.7356,0.0851,0.0722,0.9076 +Small,12x12,ldr-rgb-06.png,19.2955,0.0824,0.0693,0.9454 +Small,12x12,ldr-rgb-07.png,27.0999,0.0949,0.0823,0.7963 +Small,12x12,ldr-rgb-08.png,32.4850,0.0415,0.0290,2.2585 +Small,12x12,ldr-rgb-09.png,24.3014,0.0652,0.0526,1.2468 +Small,12x12,ldr-rgb-10.png,28.1869,0.0241,0.0135,1.2049 +Small,12x12,ldr-rgba-00.png,22.7181,0.0991,0.0860,0.7617 +Small,12x12,ldr-rgba-01.png,24.7277,0.0791,0.0658,0.9964 +Small,12x12,ldr-rgba-02.png,20.2040,0.0815,0.0685,0.9567 +Small,12x12,ldr-xy-00.png,30.5815,0.0621,0.0476,1.3755 +Small,12x12,ldr-xy-01.png,32.1781,0.0503,0.0359,1.8231 +Small,12x12,ldr-xy-02.png,40.2787,0.0376,0.0233,2.8185 +Small,12x12,ldrs-rgba-00.png,22.7169,0.0992,0.0862,0.7604 +Small,12x12,ldrs-rgba-01.png,24.7295,0.0791,0.0662,0.9903 +Small,12x12,ldrs-rgba-02.png,20.2043,0.0820,0.0690,0.9494 +Small,3x3x3,ldr-l-00-3.dds,52.3138,0.0328,0.0241,10.8638 +Small,3x3x3,ldr-l-01-3.dds,55.2511,0.0145,0.0095,7.2503 +Small,6x6x6,ldr-l-00-3.dds,33.2738,0.0775,0.0616,4.2523 +Small,6x6x6,ldr-l-01-3.dds,41.7409,0.0266,0.0138,4.9792 diff --git a/Test/Images/Small/astc_reference-4.3-sse2_fast_results.csv b/Test/Images/Small/astc_reference-4.3-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..00a16c8a42893b4fd511386ac8579d25a6dc5075 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse2_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7131,0.1025,0.0151,4.3422 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0028,0.0005,0.5345 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0029,0.0004,0.5829 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0004,0.5699 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0028,0.0004,0.5887 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0028,0.0004,0.5858 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0028,0.0004,0.5776 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0028,0.0004,0.5779 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0028,0.0004,0.5751 +Small,4x4,ldr-rgb-00.png,38.2268,0.0156,0.0101,6.4900 +Small,4x4,ldr-rgb-01.png,39.9056,0.0136,0.0085,7.7027 +Small,4x4,ldr-rgb-02.png,35.1296,0.0188,0.0136,4.8351 +Small,4x4,ldr-rgb-03.png,46.0570,0.0080,0.0031,21.2015 +Small,4x4,ldr-rgb-04.png,41.9409,0.0111,0.0059,11.0313 +Small,4x4,ldr-rgb-05.png,37.3207,0.0186,0.0134,4.8977 +Small,4x4,ldr-rgb-06.png,35.3350,0.0176,0.0123,5.3246 +Small,4x4,ldr-rgb-07.png,38.1282,0.0191,0.0140,4.6888 +Small,4x4,ldr-rgb-08.png,43.8182,0.0098,0.0049,13.4237 +Small,4x4,ldr-rgb-09.png,41.8937,0.0114,0.0061,10.6774 +Small,4x4,ldr-rgb-10.png,44.4076,0.0045,0.0015,10.8588 +Small,4x4,ldr-rgba-00.png,35.5904,0.0189,0.0135,4.8718 +Small,4x4,ldr-rgba-01.png,38.8444,0.0133,0.0080,8.2415 +Small,4x4,ldr-rgba-02.png,34.8609,0.0168,0.0112,5.8264 +Small,4x4,ldr-xy-00.png,37.5753,0.0128,0.0055,11.9393 +Small,4x4,ldr-xy-01.png,44.1942,0.0140,0.0067,9.7219 +Small,4x4,ldr-xy-02.png,48.2321,0.0118,0.0044,14.9382 +Small,4x4,ldrs-rgba-00.png,35.5961,0.0188,0.0134,4.8744 +Small,4x4,ldrs-rgba-01.png,38.8644,0.0134,0.0079,8.2486 +Small,4x4,ldrs-rgba-02.png,34.8622,0.0169,0.0113,5.8033 +Small,5x5,hdr-rgb-00.hdr,29.4941,0.1056,0.0163,4.0327 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5470 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5754 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5714 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5884 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5926 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5764 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5776 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5566 +Small,5x5,ldr-rgb-00.png,34.4207,0.0163,0.0103,6.3820 +Small,5x5,ldr-rgb-01.png,36.2361,0.0126,0.0068,9.6533 +Small,5x5,ldr-rgb-02.png,31.0781,0.0169,0.0110,5.9833 +Small,5x5,ldr-rgb-03.png,42.7340,0.0080,0.0026,25.3531 +Small,5x5,ldr-rgb-04.png,37.2632,0.0118,0.0060,10.9592 +Small,5x5,ldr-rgb-05.png,33.2658,0.0199,0.0139,4.7134 +Small,5x5,ldr-rgb-06.png,31.1162,0.0166,0.0107,6.1479 +Small,5x5,ldr-rgb-07.png,35.0545,0.0172,0.0114,5.7649 +Small,5x5,ldr-rgb-08.png,40.1761,0.0098,0.0042,15.6367 +Small,5x5,ldr-rgb-09.png,37.2884,0.0117,0.0058,11.2044 +Small,5x5,ldr-rgb-10.png,40.1912,0.0050,0.0013,12.1603 +Small,5x5,ldr-rgba-00.png,32.1049,0.0204,0.0143,4.5855 +Small,5x5,ldr-rgba-01.png,35.1901,0.0139,0.0078,8.4171 +Small,5x5,ldr-rgba-02.png,31.1173,0.0173,0.0111,5.9260 +Small,5x5,ldr-xy-00.png,36.7217,0.0128,0.0044,14.8039 +Small,5x5,ldr-xy-01.png,39.7502,0.0140,0.0058,11.3798 +Small,5x5,ldr-xy-02.png,43.9350,0.0125,0.0041,15.8112 +Small,5x5,ldrs-rgba-00.png,32.1059,0.0204,0.0144,4.5606 +Small,5x5,ldrs-rgba-01.png,35.1983,0.0139,0.0079,8.3413 +Small,5x5,ldrs-rgba-02.png,31.1181,0.0174,0.0111,5.8819 +Small,6x6,hdr-rgb-00.hdr,27.0493,0.1054,0.0166,3.9599 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5302 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0034,0.0005,0.5518 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0005,0.5566 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0033,0.0005,0.5470 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0005,0.5388 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0005,0.5578 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5832 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5804 +Small,6x6,ldr-rgb-00.png,31.7043,0.0187,0.0127,5.1753 +Small,6x6,ldr-rgb-01.png,32.9205,0.0142,0.0085,7.6984 +Small,6x6,ldr-rgb-02.png,27.4737,0.0181,0.0123,5.3277 +Small,6x6,ldr-rgb-03.png,40.5514,0.0081,0.0026,24.8354 +Small,6x6,ldr-rgb-04.png,33.9239,0.0129,0.0071,9.2290 +Small,6x6,ldr-rgb-05.png,29.9695,0.0226,0.0168,3.8952 +Small,6x6,ldr-rgb-06.png,27.5383,0.0182,0.0123,5.3433 +Small,6x6,ldr-rgb-07.png,32.9325,0.0172,0.0114,5.7423 +Small,6x6,ldr-rgb-08.png,37.7991,0.0098,0.0043,15.3195 +Small,6x6,ldr-rgb-09.png,33.4925,0.0131,0.0073,8.9298 +Small,6x6,ldr-rgb-10.png,36.6382,0.0052,0.0016,10.1720 +Small,6x6,ldr-rgba-00.png,29.6020,0.0229,0.0171,3.8424 +Small,6x6,ldr-rgba-01.png,32.0799,0.0151,0.0091,7.1995 +Small,6x6,ldr-rgba-02.png,27.8399,0.0190,0.0130,5.0603 +Small,6x6,ldr-xy-00.png,35.8063,0.0131,0.0048,13.5461 +Small,6x6,ldr-xy-01.png,37.1041,0.0151,0.0071,9.2839 +Small,6x6,ldr-xy-02.png,41.9418,0.0119,0.0038,17.0987 +Small,6x6,ldrs-rgba-00.png,29.5967,0.0231,0.0172,3.8207 +Small,6x6,ldrs-rgba-01.png,32.0856,0.0152,0.0091,7.1702 +Small,6x6,ldrs-rgba-02.png,27.8376,0.0191,0.0130,5.0258 +Small,8x8,hdr-rgb-00.hdr,23.7764,0.1095,0.0209,3.1306 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0037,0.0005,0.5518 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0037,0.0005,0.5279 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0005,0.5589 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5589 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5779 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5845 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0004,0.5779 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0004,0.5764 +Small,8x8,ldr-rgb-00.png,28.0488,0.0204,0.0142,4.6201 +Small,8x8,ldr-rgb-01.png,28.7761,0.0173,0.0112,5.8646 +Small,8x8,ldr-rgb-02.png,23.1000,0.0230,0.0170,3.8505 +Small,8x8,ldr-rgb-03.png,37.3080,0.0088,0.0030,21.9481 +Small,8x8,ldr-rgb-04.png,29.3451,0.0165,0.0106,6.1879 +Small,8x8,ldr-rgb-05.png,25.8017,0.0263,0.0203,3.2252 +Small,8x8,ldr-rgb-06.png,23.1661,0.0238,0.0177,3.7051 +Small,8x8,ldr-rgb-07.png,29.8439,0.0175,0.0116,5.6574 +Small,8x8,ldr-rgb-08.png,34.4683,0.0105,0.0048,13.7418 +Small,8x8,ldr-rgb-09.png,28.6358,0.0155,0.0096,6.8041 +Small,8x8,ldr-rgb-10.png,31.9939,0.0058,0.0020,8.2776 +Small,8x8,ldr-rgba-00.png,25.6784,0.0256,0.0195,3.3639 +Small,8x8,ldr-rgba-01.png,28.2720,0.0193,0.0131,5.0047 +Small,8x8,ldr-rgba-02.png,23.9333,0.0254,0.0190,3.4480 +Small,8x8,ldr-xy-00.png,33.3023,0.0153,0.0064,10.1954 +Small,8x8,ldr-xy-01.png,34.4386,0.0166,0.0080,8.2269 +Small,8x8,ldr-xy-02.png,39.9000,0.0111,0.0024,27.4329 +Small,8x8,ldrs-rgba-00.png,25.6786,0.0256,0.0195,3.3669 +Small,8x8,ldrs-rgba-01.png,28.2748,0.0194,0.0132,4.9585 +Small,8x8,ldrs-rgba-02.png,23.9335,0.0253,0.0190,3.4531 +Small,12x12,hdr-rgb-00.hdr,20.5354,0.1217,0.0302,2.1727 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0053,0.0004,0.6111 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0054,0.0004,0.6125 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0054,0.0005,0.5589 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0054,0.0004,0.5714 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0054,0.0004,0.5845 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0054,0.0004,0.5791 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0004,0.5791 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0054,0.0004,0.5779 +Small,12x12,ldr-rgb-00.png,23.7994,0.0203,0.0123,5.3412 +Small,12x12,ldr-rgb-01.png,24.7706,0.0168,0.0088,7.4329 +Small,12x12,ldr-rgb-02.png,19.2291,0.0276,0.0196,3.3397 +Small,12x12,ldr-rgb-03.png,33.2407,0.0096,0.0020,32.0932 +Small,12x12,ldr-rgb-04.png,24.5750,0.0168,0.0085,7.6893 +Small,12x12,ldr-rgb-05.png,21.4889,0.0251,0.0171,3.8276 +Small,12x12,ldr-rgb-06.png,19.2240,0.0286,0.0204,3.2088 +Small,12x12,ldr-rgb-07.png,25.3851,0.0163,0.0083,7.8561 +Small,12x12,ldr-rgb-08.png,30.2920,0.0115,0.0036,18.1031 +Small,12x12,ldr-rgb-09.png,23.7357,0.0188,0.0109,6.0147 +Small,12x12,ldr-rgb-10.png,27.3235,0.0085,0.0027,5.9543 +Small,12x12,ldr-rgba-00.png,21.6066,0.0276,0.0194,3.3769 +Small,12x12,ldr-rgba-01.png,24.5233,0.0187,0.0106,6.2007 +Small,12x12,ldr-rgba-02.png,20.1709,0.0314,0.0232,2.8240 +Small,12x12,ldr-xy-00.png,29.2241,0.0179,0.0065,10.0236 +Small,12x12,ldr-xy-01.png,30.5471,0.0172,0.0059,11.2026 +Small,12x12,ldr-xy-02.png,37.9951,0.0125,0.0012,54.8878 +Small,12x12,ldrs-rgba-00.png,21.6105,0.0277,0.0195,3.3532 +Small,12x12,ldrs-rgba-01.png,24.5251,0.0188,0.0106,6.1542 +Small,12x12,ldrs-rgba-02.png,20.1707,0.0317,0.0233,2.8106 +Small,3x3x3,ldr-l-00-3.dds,50.8346,0.0199,0.0117,22.3555 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0090,0.0048,14.3826 +Small,6x6x6,ldr-l-00-3.dds,32.5376,0.0678,0.0559,4.6895 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0294,0.0213,3.2292 diff --git a/Test/Images/Small/astc_reference-4.3-sse2_fastest_results.csv b/Test/Images/Small/astc_reference-4.3-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..49aa04d3845bcc5f0020863167f3436e8c930272 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse2_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3308,0.0962,0.0092,7.1382 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0022,0.0004,0.5982 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0022,0.0004,0.6080 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.5939 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0022,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0022,0.0004,0.5727 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0022,0.0004,0.5829 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5845 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0022,0.0004,0.5900 +Small,4x4,ldr-rgb-00.png,37.2237,0.0105,0.0058,11.3030 +Small,4x4,ldr-rgb-01.png,39.5245,0.0099,0.0052,12.5018 +Small,4x4,ldr-rgb-02.png,34.7577,0.0121,0.0074,8.8252 +Small,4x4,ldr-rgb-03.png,45.4692,0.0067,0.0023,28.1637 +Small,4x4,ldr-rgb-04.png,41.6640,0.0086,0.0040,16.2419 +Small,4x4,ldr-rgb-05.png,36.8562,0.0126,0.0079,8.2737 +Small,4x4,ldr-rgb-06.png,34.9322,0.0117,0.0069,9.4799 +Small,4x4,ldr-rgb-07.png,37.3406,0.0120,0.0074,8.8934 +Small,4x4,ldr-rgb-08.png,42.9161,0.0076,0.0032,20.4553 +Small,4x4,ldr-rgb-09.png,41.7016,0.0086,0.0040,16.3268 +Small,4x4,ldr-rgb-10.png,43.9130,0.0035,0.0011,14.9556 +Small,4x4,ldr-rgba-00.png,34.7268,0.0124,0.0076,8.6781 +Small,4x4,ldr-rgba-01.png,38.6479,0.0104,0.0055,11.9155 +Small,4x4,ldr-rgba-02.png,34.5493,0.0126,0.0078,8.4463 +Small,4x4,ldr-xy-00.png,37.5056,0.0106,0.0040,16.5201 +Small,4x4,ldr-xy-01.png,43.8548,0.0113,0.0046,14.3524 +Small,4x4,ldr-xy-02.png,48.2399,0.0100,0.0033,19.8654 +Small,4x4,ldrs-rgba-00.png,34.7310,0.0124,0.0076,8.6015 +Small,4x4,ldrs-rgba-01.png,38.6664,0.0104,0.0056,11.6365 +Small,4x4,ldrs-rgba-02.png,34.5527,0.0129,0.0079,8.2467 +Small,5x5,hdr-rgb-00.hdr,28.8495,0.0972,0.0099,6.6392 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5779 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5874 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5887 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5817 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5791 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5820 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.6309 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5871 +Small,5x5,ldr-rgb-00.png,33.7101,0.0112,0.0060,10.9066 +Small,5x5,ldr-rgb-01.png,36.0660,0.0099,0.0050,13.1678 +Small,5x5,ldr-rgb-02.png,30.9741,0.0130,0.0079,8.3413 +Small,5x5,ldr-rgb-03.png,42.3108,0.0067,0.0021,31.8146 +Small,5x5,ldr-rgb-04.png,37.0268,0.0095,0.0045,14.4036 +Small,5x5,ldr-rgb-05.png,32.9511,0.0139,0.0088,7.4396 +Small,5x5,ldr-rgb-06.png,31.0218,0.0128,0.0077,8.5123 +Small,5x5,ldr-rgb-07.png,34.4024,0.0123,0.0074,8.8874 +Small,5x5,ldr-rgb-08.png,39.5680,0.0077,0.0029,22.6778 +Small,5x5,ldr-rgb-09.png,37.0647,0.0092,0.0043,15.0725 +Small,5x5,ldr-rgb-10.png,39.8999,0.0039,0.0011,14.6724 +Small,5x5,ldr-rgba-00.png,31.0999,0.0133,0.0080,8.1513 +Small,5x5,ldr-rgba-01.png,35.0302,0.0109,0.0057,11.5383 +Small,5x5,ldr-rgba-02.png,31.0219,0.0137,0.0084,7.7973 +Small,5x5,ldr-xy-00.png,36.6320,0.0110,0.0035,18.7145 +Small,5x5,ldr-xy-01.png,39.1493,0.0115,0.0042,15.5959 +Small,5x5,ldr-xy-02.png,43.8491,0.0107,0.0033,19.5922 +Small,5x5,ldrs-rgba-00.png,31.1012,0.0134,0.0081,8.0442 +Small,5x5,ldrs-rgba-01.png,35.0367,0.0110,0.0058,11.3012 +Small,5x5,ldrs-rgba-02.png,31.0226,0.0137,0.0084,7.7759 +Small,6x6,hdr-rgb-00.hdr,26.7317,0.0983,0.0096,6.8288 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5887 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.6257 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5942 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.6199 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5900 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5926 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.6039 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5887 +Small,6x6,ldr-rgb-00.png,31.3212,0.0121,0.0070,9.3423 +Small,6x6,ldr-rgb-01.png,32.8336,0.0109,0.0059,11.0945 +Small,6x6,ldr-rgb-02.png,27.3837,0.0138,0.0089,7.4019 +Small,6x6,ldr-rgb-03.png,40.3163,0.0068,0.0021,31.1018 +Small,6x6,ldr-rgb-04.png,33.7482,0.0102,0.0052,12.5739 +Small,6x6,ldr-rgb-05.png,29.7352,0.0150,0.0101,6.5159 +Small,6x6,ldr-rgb-06.png,27.4658,0.0138,0.0087,7.4931 +Small,6x6,ldr-rgb-07.png,32.3326,0.0122,0.0073,9.0346 +Small,6x6,ldr-rgb-08.png,37.4336,0.0077,0.0029,22.5125 +Small,6x6,ldr-rgb-09.png,33.3061,0.0102,0.0052,12.6270 +Small,6x6,ldr-rgb-10.png,36.5144,0.0041,0.0013,12.7301 +Small,6x6,ldr-rgba-00.png,28.8377,0.0140,0.0087,7.5354 +Small,6x6,ldr-rgba-01.png,31.9912,0.0118,0.0066,9.9102 +Small,6x6,ldr-rgba-02.png,27.7796,0.0141,0.0089,7.3993 +Small,6x6,ldr-xy-00.png,35.6056,0.0110,0.0038,17.4625 +Small,6x6,ldr-xy-01.png,36.4953,0.0120,0.0047,13.8032 +Small,6x6,ldr-xy-02.png,41.7981,0.0102,0.0030,21.6798 +Small,6x6,ldrs-rgba-00.png,28.8345,0.0141,0.0088,7.4338 +Small,6x6,ldrs-rgba-01.png,31.9977,0.0117,0.0065,10.0255 +Small,6x6,ldrs-rgba-02.png,27.7778,0.0141,0.0089,7.3926 +Small,8x8,hdr-rgb-00.hdr,23.6038,0.1040,0.0143,4.5714 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5884 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5845 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5739 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5779 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5909 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5779 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5939 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5616 +Small,8x8,ldr-rgb-00.png,27.7031,0.0159,0.0099,6.6392 +Small,8x8,ldr-rgb-01.png,28.6850,0.0142,0.0083,7.8721 +Small,8x8,ldr-rgb-02.png,23.0240,0.0183,0.0124,5.2822 +Small,8x8,ldr-rgb-03.png,37.0258,0.0080,0.0024,27.5153 +Small,8x8,ldr-rgb-04.png,29.1260,0.0137,0.0079,8.2842 +Small,8x8,ldr-rgb-05.png,25.6018,0.0203,0.0144,4.5647 +Small,8x8,ldr-rgb-06.png,23.0810,0.0188,0.0129,5.0886 +Small,8x8,ldr-rgb-07.png,29.4659,0.0140,0.0082,7.9739 +Small,8x8,ldr-rgb-08.png,33.9551,0.0092,0.0035,18.4767 +Small,8x8,ldr-rgb-09.png,28.4493,0.0131,0.0073,8.9409 +Small,8x8,ldr-rgb-10.png,31.9058,0.0052,0.0016,10.2561 +Small,8x8,ldr-rgba-00.png,25.3128,0.0190,0.0130,5.0564 +Small,8x8,ldr-rgba-01.png,28.1781,0.0154,0.0094,6.9741 +Small,8x8,ldr-rgba-02.png,23.8711,0.0190,0.0129,5.0997 +Small,8x8,ldr-xy-00.png,33.2750,0.0136,0.0050,13.1546 +Small,8x8,ldr-xy-01.png,34.1754,0.0144,0.0060,10.9846 +Small,8x8,ldr-xy-02.png,39.7771,0.0106,0.0021,30.7229 +Small,8x8,ldrs-rgba-00.png,25.3134,0.0191,0.0130,5.0227 +Small,8x8,ldrs-rgba-01.png,28.1794,0.0156,0.0095,6.9021 +Small,8x8,ldrs-rgba-02.png,23.8706,0.0191,0.0128,5.1009 +Small,12x12,hdr-rgb-00.hdr,20.4510,0.1112,0.0208,3.1456 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0048,0.0004,0.5939 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0048,0.0004,0.5982 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0048,0.0004,0.5832 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0048,0.0004,0.5900 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0048,0.0004,0.5913 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5909 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5871 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0004,0.5858 +Small,12x12,ldr-rgb-00.png,23.7098,0.0163,0.0087,7.5105 +Small,12x12,ldr-rgb-01.png,24.7256,0.0137,0.0064,10.3206 +Small,12x12,ldr-rgb-02.png,19.1930,0.0212,0.0138,4.7489 +Small,12x12,ldr-rgb-03.png,33.1431,0.0088,0.0017,38.1245 +Small,12x12,ldr-rgb-04.png,24.3870,0.0137,0.0062,10.5536 +Small,12x12,ldr-rgb-05.png,21.3834,0.0200,0.0125,5.2425 +Small,12x12,ldr-rgb-06.png,19.1690,0.0218,0.0145,4.5247 +Small,12x12,ldr-rgb-07.png,25.3142,0.0134,0.0061,10.7576 +Small,12x12,ldr-rgb-08.png,30.1204,0.0100,0.0028,23.1652 +Small,12x12,ldr-rgb-09.png,23.5983,0.0155,0.0081,8.0472 +Small,12x12,ldr-rgb-10.png,27.2834,0.0072,0.0020,8.0347 +Small,12x12,ldr-rgba-00.png,21.3613,0.0210,0.0134,4.9047 +Small,12x12,ldr-rgba-01.png,24.4808,0.0153,0.0077,8.5477 +Small,12x12,ldr-rgba-02.png,20.1381,0.0241,0.0164,3.9998 +Small,12x12,ldr-xy-00.png,28.8908,0.0158,0.0050,13.1893 +Small,12x12,ldr-xy-01.png,29.6770,0.0152,0.0045,14.5608 +Small,12x12,ldr-xy-02.png,37.9716,0.0119,0.0011,60.6794 +Small,12x12,ldrs-rgba-00.png,21.3627,0.0211,0.0134,4.8748 +Small,12x12,ldrs-rgba-01.png,24.4817,0.0153,0.0077,8.5057 +Small,12x12,ldrs-rgba-02.png,20.1379,0.0241,0.0164,3.9964 +Small,3x3x3,ldr-l-00-3.dds,50.6979,0.0188,0.0114,22.9189 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0082,0.0048,14.3940 +Small,6x6x6,ldr-l-00-3.dds,32.5210,0.0676,0.0558,4.6978 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0294,0.0213,3.2303 diff --git a/Test/Images/Small/astc_reference-4.3-sse2_medium_results.csv b/Test/Images/Small/astc_reference-4.3-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f42d33ffbc3b6c98bcd8b352062ad7997dc60fe8 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse2_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1238,0.1129,0.0234,2.8015 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5377 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5518 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5401 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5845 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5727 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0005,0.5310 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5929 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0005,0.5020 +Small,4x4,ldr-rgb-00.png,38.8091,0.0325,0.0264,2.4827 +Small,4x4,ldr-rgb-01.png,40.2008,0.0279,0.0220,2.9812 +Small,4x4,ldr-rgb-02.png,35.2658,0.0285,0.0225,2.9074 +Small,4x4,ldr-rgb-03.png,47.2399,0.0189,0.0133,4.9398 +Small,4x4,ldr-rgb-04.png,42.1842,0.0232,0.0173,3.7865 +Small,4x4,ldr-rgb-05.png,37.7989,0.0309,0.0250,2.6188 +Small,4x4,ldr-rgb-06.png,35.4538,0.0255,0.0196,3.3456 +Small,4x4,ldr-rgb-07.png,39.2651,0.0383,0.0324,2.0209 +Small,4x4,ldr-rgb-08.png,45.1580,0.0221,0.0164,3.9983 +Small,4x4,ldr-rgb-09.png,42.1202,0.0238,0.0179,3.6639 +Small,4x4,ldr-rgb-10.png,44.8973,0.0064,0.0028,5.7543 +Small,4x4,ldr-rgba-00.png,36.2355,0.0359,0.0295,2.2209 +Small,4x4,ldr-rgba-01.png,38.9520,0.0225,0.0164,3.9932 +Small,4x4,ldr-rgba-02.png,34.9310,0.0246,0.0185,3.5436 +Small,4x4,ldr-xy-00.png,37.7517,0.0225,0.0151,4.3338 +Small,4x4,ldr-xy-01.png,45.1812,0.0308,0.0233,2.8071 +Small,4x4,ldr-xy-02.png,50.9688,0.0364,0.0289,2.2703 +Small,4x4,ldrs-rgba-00.png,36.2429,0.0356,0.0295,2.2222 +Small,4x4,ldrs-rgba-01.png,38.9706,0.0228,0.0166,3.9475 +Small,4x4,ldrs-rgba-02.png,34.9330,0.0247,0.0186,3.5293 +Small,5x5,hdr-rgb-00.hdr,29.8792,0.1168,0.0275,2.3873 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0045,0.0005,0.5575 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0005,0.5269 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0005,0.5390 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0005,0.5401 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5779 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0005,0.5628 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0004,0.5714 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0004,0.5887 +Small,5x5,ldr-rgb-00.png,35.1353,0.0366,0.0291,2.2544 +Small,5x5,ldr-rgb-01.png,36.4365,0.0277,0.0206,3.1743 +Small,5x5,ldr-rgb-02.png,31.1195,0.0280,0.0208,3.1513 +Small,5x5,ldr-rgb-03.png,43.9924,0.0153,0.0086,7.6374 +Small,5x5,ldr-rgb-04.png,37.6527,0.0257,0.0187,3.5138 +Small,5x5,ldr-rgb-05.png,33.5357,0.0373,0.0302,2.1712 +Small,5x5,ldr-rgb-06.png,31.1617,0.0268,0.0197,3.3254 +Small,5x5,ldr-rgb-07.png,36.1275,0.0422,0.0353,1.8560 +Small,5x5,ldr-rgb-08.png,41.6131,0.0213,0.0146,4.4875 +Small,5x5,ldr-rgb-09.png,37.5769,0.0246,0.0176,3.7272 +Small,5x5,ldr-rgb-10.png,40.5644,0.0084,0.0033,4.8831 +Small,5x5,ldr-rgba-00.png,32.7897,0.0430,0.0358,1.8322 +Small,5x5,ldr-rgba-01.png,35.3090,0.0261,0.0187,3.4954 +Small,5x5,ldr-rgba-02.png,31.1309,0.0283,0.0210,3.1138 +Small,5x5,ldr-xy-00.png,37.0786,0.0239,0.0154,4.2490 +Small,5x5,ldr-xy-01.png,40.5669,0.0310,0.0225,2.9188 +Small,5x5,ldr-xy-02.png,49.0821,0.0253,0.0165,3.9611 +Small,5x5,ldrs-rgba-00.png,32.7935,0.0429,0.0356,1.8389 +Small,5x5,ldrs-rgba-01.png,35.3182,0.0260,0.0188,3.4826 +Small,5x5,ldrs-rgba-02.png,31.1320,0.0286,0.0214,3.0587 +Small,6x6,hdr-rgb-00.hdr,27.4934,0.1194,0.0290,2.2571 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0043,0.0005,0.5182 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0005,0.5334 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0043,0.0005,0.5543 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0043,0.0005,0.5495 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0043,0.0005,0.5566 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0043,0.0005,0.5379 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0005,0.5412 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0005,0.5448 +Small,6x6,ldr-rgb-00.png,32.3857,0.0373,0.0305,2.1498 +Small,6x6,ldr-rgb-01.png,33.0813,0.0276,0.0209,3.1414 +Small,6x6,ldr-rgb-02.png,27.5038,0.0286,0.0218,3.0109 +Small,6x6,ldr-rgb-03.png,41.7098,0.0130,0.0066,9.9539 +Small,6x6,ldr-rgb-04.png,34.1976,0.0246,0.0179,3.6565 +Small,6x6,ldr-rgb-05.png,30.1358,0.0388,0.0319,2.0513 +Small,6x6,ldr-rgb-06.png,27.5712,0.0282,0.0214,3.0653 +Small,6x6,ldr-rgb-07.png,33.8773,0.0416,0.0349,1.8802 +Small,6x6,ldr-rgb-08.png,39.1910,0.0177,0.0112,5.8472 +Small,6x6,ldr-rgb-09.png,33.6644,0.0242,0.0174,3.7582 +Small,6x6,ldr-rgb-10.png,36.9239,0.0079,0.0033,4.8936 +Small,6x6,ldr-rgba-00.png,30.2372,0.0468,0.0397,1.6502 +Small,6x6,ldr-rgba-01.png,32.1918,0.0270,0.0202,3.2513 +Small,6x6,ldr-rgba-02.png,27.8514,0.0306,0.0236,2.7824 +Small,6x6,ldr-xy-00.png,36.2476,0.0217,0.0132,4.9532 +Small,6x6,ldr-xy-01.png,37.9375,0.0249,0.0166,3.9368 +Small,6x6,ldr-xy-02.png,46.0669,0.0205,0.0122,5.3741 +Small,6x6,ldrs-rgba-00.png,30.2354,0.0468,0.0398,1.6485 +Small,6x6,ldrs-rgba-01.png,32.1978,0.0272,0.0203,3.2291 +Small,6x6,ldrs-rgba-02.png,27.8496,0.0306,0.0236,2.7821 +Small,8x8,hdr-rgb-00.hdr,24.1284,0.1287,0.0378,1.7356 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0049,0.0005,0.5235 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0049,0.0005,0.5484 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0049,0.0005,0.5687 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5817 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0048,0.0005,0.5504 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0050,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0050,0.0005,0.5675 +Small,8x8,ldr-rgb-00.png,28.7284,0.0488,0.0411,1.5935 +Small,8x8,ldr-rgb-01.png,28.9370,0.0340,0.0265,2.4699 +Small,8x8,ldr-rgb-02.png,23.1614,0.0364,0.0288,2.2741 +Small,8x8,ldr-rgb-03.png,38.5560,0.0152,0.0081,8.1402 +Small,8x8,ldr-rgb-04.png,29.6453,0.0342,0.0269,2.4349 +Small,8x8,ldr-rgb-05.png,25.9412,0.0473,0.0399,1.6418 +Small,8x8,ldr-rgb-06.png,23.2047,0.0374,0.0296,2.2135 +Small,8x8,ldr-rgb-07.png,30.7489,0.0500,0.0426,1.5380 +Small,8x8,ldr-rgb-08.png,35.9057,0.0215,0.0143,4.5775 +Small,8x8,ldr-rgb-09.png,28.9902,0.0310,0.0236,2.7714 +Small,8x8,ldr-rgb-10.png,32.1710,0.0096,0.0046,3.5711 +Small,8x8,ldr-rgba-00.png,26.4438,0.0580,0.0503,1.3023 +Small,8x8,ldr-rgba-01.png,28.3668,0.0343,0.0267,2.4535 +Small,8x8,ldr-rgba-02.png,23.9414,0.0391,0.0314,2.0871 +Small,8x8,ldr-xy-00.png,33.9206,0.0293,0.0189,3.4748 +Small,8x8,ldr-xy-01.png,34.9386,0.0294,0.0191,3.4267 +Small,8x8,ldr-xy-02.png,41.6877,0.0228,0.0126,5.1992 +Small,8x8,ldrs-rgba-00.png,26.4457,0.0573,0.0496,1.3216 +Small,8x8,ldrs-rgba-01.png,28.3703,0.0345,0.0269,2.4378 +Small,8x8,ldrs-rgba-02.png,23.9416,0.0394,0.0316,2.0744 +Small,12x12,hdr-rgb-00.hdr,20.7755,0.1478,0.0535,1.2257 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0077,0.0004,0.5742 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0077,0.0004,0.5751 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0079,0.0005,0.5663 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0078,0.0005,0.5552 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0078,0.0005,0.5334 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0079,0.0005,0.5543 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0079,0.0004,0.5739 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0079,0.0005,0.5235 +Small,12x12,ldr-rgb-00.png,24.6915,0.0593,0.0488,1.3426 +Small,12x12,ldr-rgb-01.png,25.0393,0.0437,0.0333,1.9658 +Small,12x12,ldr-rgb-02.png,19.2743,0.0515,0.0410,1.5983 +Small,12x12,ldr-rgb-03.png,34.9505,0.0187,0.0085,7.7411 +Small,12x12,ldr-rgb-04.png,24.9006,0.0426,0.0323,2.0293 +Small,12x12,ldr-rgb-05.png,21.6514,0.0598,0.0494,1.3264 +Small,12x12,ldr-rgb-06.png,19.2513,0.0523,0.0419,1.5646 +Small,12x12,ldr-rgb-07.png,26.7396,0.0544,0.0441,1.4863 +Small,12x12,ldr-rgb-08.png,31.6566,0.0247,0.0147,4.4646 +Small,12x12,ldr-rgb-09.png,24.1576,0.0408,0.0305,2.1522 +Small,12x12,ldr-rgb-10.png,28.0433,0.0174,0.0092,1.7745 +Small,12x12,ldr-rgba-00.png,22.2473,0.0650,0.0545,1.2021 +Small,12x12,ldr-rgba-01.png,24.6500,0.0423,0.0318,2.0627 +Small,12x12,ldr-rgba-02.png,20.1848,0.0555,0.0448,1.4613 +Small,12x12,ldr-xy-00.png,30.2110,0.0356,0.0213,3.0787 +Small,12x12,ldr-xy-01.png,31.8412,0.0370,0.0228,2.8693 +Small,12x12,ldr-xy-02.png,38.5222,0.0189,0.0047,13.8143 +Small,12x12,ldrs-rgba-00.png,22.2476,0.0656,0.0549,1.1939 +Small,12x12,ldrs-rgba-01.png,24.6522,0.0431,0.0323,2.0290 +Small,12x12,ldrs-rgba-02.png,20.1848,0.0561,0.0454,1.4443 +Small,3x3x3,ldr-l-00-3.dds,51.8769,0.0255,0.0165,15.8472 +Small,3x3x3,ldr-l-01-3.dds,54.6166,0.0103,0.0052,13.3825 +Small,6x6x6,ldr-l-00-3.dds,32.9597,0.0807,0.0667,3.9329 +Small,6x6x6,ldr-l-01-3.dds,41.0140,0.0315,0.0213,3.2399 diff --git a/Test/Images/Small/astc_reference-4.3-sse2_thorough_results.csv b/Test/Images/Small/astc_reference-4.3-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..1dc360cb8439a3f8d18ad2f4f3bd32e5dc697a0e --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse2_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.3988,0.1364,0.0466,1.4072 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.4673 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5334 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5613 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0005,0.5302 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0005,0.5412 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0005,0.5613 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0005,0.5663 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5754 +Small,4x4,ldr-rgb-00.png,39.1396,0.0600,0.0539,1.2164 +Small,4x4,ldr-rgb-01.png,40.3879,0.0574,0.0515,1.2715 +Small,4x4,ldr-rgb-02.png,35.4469,0.0538,0.0478,1.3716 +Small,4x4,ldr-rgb-03.png,47.7050,0.0534,0.0478,1.3718 +Small,4x4,ldr-rgb-04.png,42.3343,0.0485,0.0426,1.5378 +Small,4x4,ldr-rgb-05.png,37.9716,0.0587,0.0526,1.2452 +Small,4x4,ldr-rgb-06.png,35.6101,0.0477,0.0416,1.5738 +Small,4x4,ldr-rgb-07.png,39.8550,0.0720,0.0659,0.9951 +Small,4x4,ldr-rgb-08.png,45.8141,0.0535,0.0478,1.3715 +Small,4x4,ldr-rgb-09.png,42.2663,0.0521,0.0462,1.4193 +Small,4x4,ldr-rgb-10.png,45.1134,0.0097,0.0059,2.7343 +Small,4x4,ldr-rgba-00.png,36.7024,0.0626,0.0565,1.1593 +Small,4x4,ldr-rgba-01.png,39.0829,0.0450,0.0389,1.6867 +Small,4x4,ldr-rgba-02.png,35.0183,0.0454,0.0391,1.6782 +Small,4x4,ldr-xy-00.png,37.7753,0.0580,0.0504,1.2996 +Small,4x4,ldr-xy-01.png,45.2569,0.0643,0.0571,1.1487 +Small,4x4,ldr-xy-02.png,50.9912,0.0801,0.0725,0.9034 +Small,4x4,ldrs-rgba-00.png,36.7104,0.0632,0.0571,1.1478 +Small,4x4,ldrs-rgba-01.png,39.1044,0.0454,0.0392,1.6699 +Small,4x4,ldrs-rgba-02.png,35.0233,0.0456,0.0394,1.6636 +Small,5x5,hdr-rgb-00.hdr,30.2809,0.1451,0.0531,1.2349 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0045,0.0004,0.5702 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0004,0.5714 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0046,0.0005,0.5445 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0005,0.5651 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5764 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0005,0.5601 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0005,0.5345 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5529 +Small,5x5,ldr-rgb-00.png,35.3622,0.0721,0.0647,1.0130 +Small,5x5,ldr-rgb-01.png,36.5321,0.0631,0.0561,1.1692 +Small,5x5,ldr-rgb-02.png,31.1870,0.0541,0.0471,1.3917 +Small,5x5,ldr-rgb-03.png,44.5348,0.0615,0.0547,1.1974 +Small,5x5,ldr-rgb-04.png,37.8081,0.0563,0.0493,1.3285 +Small,5x5,ldr-rgb-05.png,33.6835,0.0716,0.0646,1.0146 +Small,5x5,ldr-rgb-06.png,31.2225,0.0515,0.0444,1.4767 +Small,5x5,ldr-rgb-07.png,36.7108,0.0875,0.0806,0.8127 +Small,5x5,ldr-rgb-08.png,42.3675,0.0609,0.0542,1.2083 +Small,5x5,ldr-rgb-09.png,37.6987,0.0619,0.0549,1.1931 +Small,5x5,ldr-rgb-10.png,40.7256,0.0123,0.0074,2.2105 +Small,5x5,ldr-rgba-00.png,33.0991,0.0786,0.0713,0.9193 +Small,5x5,ldr-rgba-01.png,35.4017,0.0541,0.0468,1.4012 +Small,5x5,ldr-rgba-02.png,31.1706,0.0517,0.0443,1.4793 +Small,5x5,ldr-xy-00.png,37.2351,0.0675,0.0588,1.1136 +Small,5x5,ldr-xy-01.png,41.4156,0.0800,0.0714,0.9173 +Small,5x5,ldr-xy-02.png,49.2617,0.0910,0.0824,0.7949 +Small,5x5,ldrs-rgba-00.png,33.1063,0.0785,0.0713,0.9188 +Small,5x5,ldrs-rgba-01.png,35.4095,0.0534,0.0462,1.4191 +Small,5x5,ldrs-rgba-02.png,31.1713,0.0517,0.0444,1.4757 +Small,6x6,hdr-rgb-00.hdr,27.6987,0.1474,0.0572,1.1459 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0045,0.0005,0.5473 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0048,0.0005,0.5098 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0005,0.5437 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0044,0.0005,0.5601 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0044,0.0005,0.5651 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5687 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0004,0.5727 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0005,0.5663 +Small,6x6,ldr-rgb-00.png,32.6236,0.0791,0.0721,0.9086 +Small,6x6,ldr-rgb-01.png,33.1855,0.0675,0.0608,1.0776 +Small,6x6,ldr-rgb-02.png,27.5522,0.0584,0.0515,1.2721 +Small,6x6,ldr-rgb-03.png,42.5760,0.0532,0.0466,1.4077 +Small,6x6,ldr-rgb-04.png,34.3279,0.0599,0.0529,1.2387 +Small,6x6,ldr-rgb-05.png,30.2792,0.0753,0.0684,0.9575 +Small,6x6,ldr-rgb-06.png,27.6242,0.0557,0.0489,1.3399 +Small,6x6,ldr-rgb-07.png,34.4221,0.0934,0.0865,0.7575 +Small,6x6,ldr-rgb-08.png,40.0080,0.0545,0.0478,1.3714 +Small,6x6,ldr-rgb-09.png,33.8156,0.0635,0.0566,1.1575 +Small,6x6,ldr-rgb-10.png,37.1747,0.0135,0.0088,1.8401 +Small,6x6,ldr-rgba-00.png,30.4928,0.0872,0.0802,0.8176 +Small,6x6,ldr-rgba-01.png,32.2722,0.0607,0.0537,1.2198 +Small,6x6,ldr-rgba-02.png,27.8884,0.0568,0.0497,1.3190 +Small,6x6,ldr-xy-00.png,36.3580,0.0557,0.0473,1.3858 +Small,6x6,ldr-xy-01.png,38.1144,0.0779,0.0693,0.9455 +Small,6x6,ldr-xy-02.png,47.4637,0.0957,0.0870,0.7533 +Small,6x6,ldrs-rgba-00.png,30.4894,0.0863,0.0791,0.8286 +Small,6x6,ldrs-rgba-01.png,32.2774,0.0609,0.0538,1.2174 +Small,6x6,ldrs-rgba-02.png,27.8865,0.0566,0.0496,1.3207 +Small,8x8,hdr-rgb-00.hdr,24.3310,0.1707,0.0768,0.8530 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0063,0.0005,0.5379 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0065,0.0005,0.5120 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0005,0.5678 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0004,0.5727 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0062,0.0004,0.5955 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0063,0.0005,0.5300 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0063,0.0005,0.5628 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0063,0.0005,0.5663 +Small,8x8,ldr-rgb-00.png,28.9743,0.1013,0.0924,0.7095 +Small,8x8,ldr-rgb-01.png,29.0250,0.0841,0.0754,0.8688 +Small,8x8,ldr-rgb-02.png,23.2010,0.0776,0.0686,0.9551 +Small,8x8,ldr-rgb-03.png,39.4059,0.0389,0.0305,2.1521 +Small,8x8,ldr-rgb-04.png,29.7753,0.0764,0.0676,0.9699 +Small,8x8,ldr-rgb-05.png,26.0443,0.0929,0.0841,0.7793 +Small,8x8,ldr-rgb-06.png,23.2548,0.0756,0.0666,0.9836 +Small,8x8,ldr-rgb-07.png,31.1954,0.1139,0.1052,0.6229 +Small,8x8,ldr-rgb-08.png,36.5527,0.0571,0.0485,1.3499 +Small,8x8,ldr-rgb-09.png,29.1512,0.0658,0.0571,1.1486 +Small,8x8,ldr-rgb-10.png,32.3269,0.0178,0.0113,1.4327 +Small,8x8,ldr-rgba-00.png,26.7456,0.1115,0.1023,0.6405 +Small,8x8,ldr-rgba-01.png,28.4290,0.0814,0.0722,0.9075 +Small,8x8,ldr-rgba-02.png,23.9672,0.0744,0.0652,1.0059 +Small,8x8,ldr-xy-00.png,34.1954,0.0671,0.0566,1.1585 +Small,8x8,ldr-xy-01.png,35.2284,0.0691,0.0587,1.1161 +Small,8x8,ldr-xy-02.png,44.4736,0.0880,0.0777,0.8438 +Small,8x8,ldrs-rgba-00.png,26.7460,0.1115,0.1025,0.6394 +Small,8x8,ldrs-rgba-01.png,28.4323,0.0814,0.0722,0.9076 +Small,8x8,ldrs-rgba-02.png,23.9676,0.0746,0.0654,1.0024 +Small,12x12,hdr-rgb-00.hdr,21.0278,0.2101,0.1129,0.5804 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0102,0.0005,0.5589 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0102,0.0004,0.5754 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0102,0.0004,0.5829 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0102,0.0004,0.5982 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0103,0.0004,0.5817 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0102,0.0005,0.5601 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0104,0.0004,0.5754 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0102,0.0004,0.5791 +Small,12x12,ldr-rgb-00.png,25.0567,0.1320,0.1189,0.5511 +Small,12x12,ldr-rgb-01.png,25.1428,0.1077,0.0946,0.6931 +Small,12x12,ldr-rgb-02.png,19.2937,0.1181,0.1052,0.6228 +Small,12x12,ldr-rgb-03.png,36.1599,0.0432,0.0306,2.1446 +Small,12x12,ldr-rgb-04.png,24.9934,0.0975,0.0847,0.7737 +Small,12x12,ldr-rgb-05.png,21.7356,0.1195,0.1066,0.6145 +Small,12x12,ldr-rgb-06.png,19.2955,0.1159,0.1030,0.6366 +Small,12x12,ldr-rgb-07.png,27.0999,0.1367,0.1237,0.5297 +Small,12x12,ldr-rgb-08.png,32.4850,0.0554,0.0428,1.5298 +Small,12x12,ldr-rgb-09.png,24.3014,0.0906,0.0778,0.8424 +Small,12x12,ldr-rgb-10.png,28.1869,0.0302,0.0195,0.8325 +Small,12x12,ldr-rgba-00.png,22.7181,0.1396,0.1266,0.5178 +Small,12x12,ldr-rgba-01.png,24.7277,0.1109,0.0976,0.6715 +Small,12x12,ldr-rgba-02.png,20.2040,0.1144,0.1013,0.6467 +Small,12x12,ldr-xy-00.png,30.5815,0.0856,0.0711,0.9215 +Small,12x12,ldr-xy-01.png,32.1781,0.0686,0.0542,1.2099 +Small,12x12,ldr-xy-02.png,40.2787,0.0491,0.0347,1.8873 +Small,12x12,ldrs-rgba-00.png,22.7169,0.1401,0.1269,0.5163 +Small,12x12,ldrs-rgba-01.png,24.7295,0.1099,0.0967,0.6774 +Small,12x12,ldrs-rgba-02.png,20.2043,0.1148,0.1013,0.6470 +Small,3x3x3,ldr-l-00-3.dds,52.3138,0.0439,0.0349,7.5137 +Small,3x3x3,ldr-l-01-3.dds,55.2511,0.0189,0.0136,5.0662 +Small,6x6x6,ldr-l-00-3.dds,33.2738,0.1112,0.0944,2.7760 +Small,6x6x6,ldr-l-01-3.dds,41.7409,0.0351,0.0221,3.1159 diff --git a/Test/Images/Small/astc_reference-4.3-sse4.1_fast_results.csv b/Test/Images/Small/astc_reference-4.3-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..6c857a516d64dc4518e9fcc9886c378a77d62fe8 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse4.1_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7131,0.0971,0.0130,5.0393 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0028,0.0004,0.5955 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0028,0.0004,0.5858 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0005,0.5578 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0027,0.0004,0.5884 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0027,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0027,0.0004,0.5955 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0027,0.0004,0.5965 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0027,0.0004,0.5858 +Small,4x4,ldr-rgb-00.png,38.2268,0.0139,0.0087,7.5303 +Small,4x4,ldr-rgb-01.png,39.9056,0.0122,0.0073,9.0109 +Small,4x4,ldr-rgb-02.png,35.1296,0.0166,0.0115,5.6874 +Small,4x4,ldr-rgb-03.png,46.0570,0.0075,0.0027,24.2354 +Small,4x4,ldr-rgb-04.png,41.9409,0.0100,0.0051,12.9160 +Small,4x4,ldr-rgb-05.png,37.3207,0.0165,0.0114,5.7538 +Small,4x4,ldr-rgb-06.png,35.3350,0.0157,0.0105,6.2427 +Small,4x4,ldr-rgb-07.png,38.1282,0.0170,0.0119,5.5174 +Small,4x4,ldr-rgb-08.png,43.8182,0.0090,0.0042,15.5439 +Small,4x4,ldr-rgb-09.png,41.8937,0.0102,0.0053,12.4644 +Small,4x4,ldr-rgb-10.png,44.4076,0.0043,0.0014,11.9976 +Small,4x4,ldr-rgba-00.png,35.5904,0.0166,0.0115,5.7182 +Small,4x4,ldr-rgba-01.png,38.8444,0.0120,0.0068,9.6730 +Small,4x4,ldr-rgba-02.png,34.8609,0.0149,0.0096,6.7990 +Small,4x4,ldr-xy-00.png,37.5753,0.0118,0.0047,14.0094 +Small,4x4,ldr-xy-01.png,44.1942,0.0129,0.0058,11.3736 +Small,4x4,ldr-xy-02.png,48.2321,0.0109,0.0037,17.7949 +Small,4x4,ldrs-rgba-00.png,35.5961,0.0167,0.0115,5.6859 +Small,4x4,ldrs-rgba-01.png,38.8644,0.0121,0.0068,9.6306 +Small,4x4,ldrs-rgba-02.png,34.8622,0.0151,0.0098,6.7127 +Small,5x5,hdr-rgb-00.hdr,29.4941,0.0984,0.0135,4.8495 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.5345 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0034,0.0005,0.5663 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5702 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5714 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5896 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5779 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5995 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5874 +Small,5x5,ldr-rgb-00.png,34.4207,0.0145,0.0087,7.5416 +Small,5x5,ldr-rgb-01.png,36.2361,0.0114,0.0058,11.3760 +Small,5x5,ldr-rgb-02.png,31.0781,0.0148,0.0091,7.2255 +Small,5x5,ldr-rgb-03.png,42.7340,0.0076,0.0023,28.1637 +Small,5x5,ldr-rgb-04.png,37.2632,0.0106,0.0049,13.4428 +Small,5x5,ldr-rgb-05.png,33.2658,0.0173,0.0115,5.6757 +Small,5x5,ldr-rgb-06.png,31.1162,0.0145,0.0088,7.4313 +Small,5x5,ldr-rgb-07.png,35.0545,0.0151,0.0095,6.9284 +Small,5x5,ldr-rgb-08.png,40.1761,0.0091,0.0036,17.9953 +Small,5x5,ldr-rgb-09.png,37.2884,0.0106,0.0050,13.2001 +Small,5x5,ldr-rgb-10.png,40.1912,0.0049,0.0012,13.5256 +Small,5x5,ldr-rgba-00.png,32.1049,0.0180,0.0120,5.4650 +Small,5x5,ldr-rgba-01.png,35.1901,0.0124,0.0066,9.9059 +Small,5x5,ldr-rgba-02.png,31.1173,0.0154,0.0093,7.0334 +Small,5x5,ldr-xy-00.png,36.7217,0.0121,0.0039,16.9291 +Small,5x5,ldr-xy-01.png,39.7502,0.0130,0.0049,13.4790 +Small,5x5,ldr-xy-02.png,43.9350,0.0116,0.0036,18.1533 +Small,5x5,ldrs-rgba-00.png,32.1059,0.0181,0.0122,5.3926 +Small,5x5,ldrs-rgba-01.png,35.1983,0.0125,0.0065,10.0423 +Small,5x5,ldrs-rgba-02.png,31.1181,0.0154,0.0094,6.9593 +Small,6x6,hdr-rgb-00.hdr,27.0493,0.0986,0.0139,4.7087 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0034,0.0005,0.5412 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0033,0.0004,0.5767 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0033,0.0005,0.5639 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0033,0.0004,0.5952 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5779 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0033,0.0004,0.5702 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0033,0.0004,0.5858 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0033,0.0004,0.5779 +Small,6x6,ldr-rgb-00.png,31.7043,0.0162,0.0104,6.2732 +Small,6x6,ldr-rgb-01.png,32.9205,0.0126,0.0070,9.3585 +Small,6x6,ldr-rgb-02.png,27.4737,0.0159,0.0103,6.3857 +Small,6x6,ldr-rgb-03.png,40.5514,0.0077,0.0023,28.1753 +Small,6x6,ldr-rgb-04.png,33.9239,0.0115,0.0059,11.0273 +Small,6x6,ldr-rgb-05.png,29.9695,0.0195,0.0138,4.7549 +Small,6x6,ldr-rgb-06.png,27.5383,0.0159,0.0102,6.4076 +Small,6x6,ldr-rgb-07.png,32.9325,0.0152,0.0096,6.8617 +Small,6x6,ldr-rgb-08.png,37.7991,0.0090,0.0036,18.0000 +Small,6x6,ldr-rgb-09.png,33.4925,0.0115,0.0061,10.8037 +Small,6x6,ldr-rgb-10.png,36.6382,0.0051,0.0016,10.3010 +Small,6x6,ldr-rgba-00.png,29.6020,0.0201,0.0143,4.5727 +Small,6x6,ldr-rgba-01.png,32.0799,0.0134,0.0076,8.5835 +Small,6x6,ldr-rgba-02.png,27.8399,0.0167,0.0108,6.0614 +Small,6x6,ldr-xy-00.png,35.8063,0.0122,0.0041,16.0550 +Small,6x6,ldr-xy-01.png,37.1041,0.0138,0.0059,11.0309 +Small,6x6,ldr-xy-02.png,41.9418,0.0112,0.0034,19.5517 +Small,6x6,ldrs-rgba-00.png,29.5967,0.0202,0.0145,4.5069 +Small,6x6,ldrs-rgba-01.png,32.0856,0.0135,0.0076,8.6142 +Small,6x6,ldrs-rgba-02.png,27.8376,0.0167,0.0108,6.0418 +Small,8x8,hdr-rgb-00.hdr,23.7764,0.1024,0.0177,3.7076 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5589 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5995 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5913 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5926 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5858 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5804 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5779 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,8x8,ldr-rgb-00.png,28.0488,0.0181,0.0119,5.4879 +Small,8x8,ldr-rgb-01.png,28.7761,0.0154,0.0095,6.8799 +Small,8x8,ldr-rgb-02.png,23.1000,0.0200,0.0142,4.6182 +Small,8x8,ldr-rgb-03.png,37.3080,0.0081,0.0026,25.0048 +Small,8x8,ldr-rgb-04.png,29.3451,0.0147,0.0089,7.3743 +Small,8x8,ldr-rgb-05.png,25.8017,0.0228,0.0169,3.8735 +Small,8x8,ldr-rgb-06.png,23.1661,0.0206,0.0147,4.4558 +Small,8x8,ldr-rgb-07.png,29.8439,0.0155,0.0097,6.7654 +Small,8x8,ldr-rgb-08.png,34.4683,0.0098,0.0041,15.8422 +Small,8x8,ldr-rgb-09.png,28.6358,0.0138,0.0080,8.1736 +Small,8x8,ldr-rgb-10.png,31.9939,0.0054,0.0017,9.6933 +Small,8x8,ldr-rgba-00.png,25.6784,0.0223,0.0163,4.0303 +Small,8x8,ldr-rgba-01.png,28.2720,0.0170,0.0110,5.9606 +Small,8x8,ldr-rgba-02.png,23.9333,0.0219,0.0157,4.1642 +Small,8x8,ldr-xy-00.png,33.3023,0.0139,0.0055,12.0029 +Small,8x8,ldr-xy-01.png,34.4386,0.0151,0.0067,9.7814 +Small,8x8,ldr-xy-02.png,39.9000,0.0105,0.0022,29.5854 +Small,8x8,ldrs-rgba-00.png,25.6786,0.0224,0.0164,3.9988 +Small,8x8,ldrs-rgba-01.png,28.2748,0.0170,0.0110,5.9503 +Small,8x8,ldrs-rgba-02.png,23.9335,0.0220,0.0158,4.1392 +Small,12x12,hdr-rgb-00.hdr,20.5354,0.1130,0.0265,2.4712 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0054,0.0005,0.5651 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0054,0.0005,0.5675 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0054,0.0004,0.5714 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0054,0.0005,0.5613 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0054,0.0004,0.5955 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0054,0.0004,0.5832 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0004,0.5795 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0054,0.0004,0.5767 +Small,12x12,ldr-rgb-00.png,23.7994,0.0185,0.0106,6.1553 +Small,12x12,ldr-rgb-01.png,24.7706,0.0156,0.0078,8.3550 +Small,12x12,ldr-rgb-02.png,19.2291,0.0250,0.0173,3.7893 +Small,12x12,ldr-rgb-03.png,33.2407,0.0093,0.0018,35.8521 +Small,12x12,ldr-rgb-04.png,24.5750,0.0152,0.0074,8.8779 +Small,12x12,ldr-rgb-05.png,21.4889,0.0229,0.0152,4.3036 +Small,12x12,ldr-rgb-06.png,19.2240,0.0259,0.0181,3.6304 +Small,12x12,ldr-rgb-07.png,25.3851,0.0150,0.0074,8.8610 +Small,12x12,ldr-rgb-08.png,30.2920,0.0108,0.0033,19.7470 +Small,12x12,ldr-rgb-09.png,23.7357,0.0172,0.0097,6.7843 +Small,12x12,ldr-rgb-10.png,27.3235,0.0080,0.0025,6.5839 +Small,12x12,ldr-rgba-00.png,21.6066,0.0248,0.0169,3.8834 +Small,12x12,ldr-rgba-01.png,24.5233,0.0172,0.0093,7.0559 +Small,12x12,ldr-rgba-02.png,20.1709,0.0284,0.0203,3.2220 +Small,12x12,ldr-xy-00.png,29.2241,0.0169,0.0058,11.2914 +Small,12x12,ldr-xy-01.png,30.5471,0.0163,0.0052,12.6882 +Small,12x12,ldr-xy-02.png,37.9951,0.0121,0.0011,58.2615 +Small,12x12,ldrs-rgba-00.png,21.6105,0.0252,0.0171,3.8283 +Small,12x12,ldrs-rgba-01.png,24.5251,0.0174,0.0094,6.9816 +Small,12x12,ldrs-rgba-02.png,20.1707,0.0285,0.0203,3.2223 +Small,3x3x3,ldr-l-00-3.dds,50.8346,0.0167,0.0088,29.8059 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0080,0.0038,18.2129 +Small,6x6x6,ldr-l-00-3.dds,32.5376,0.0616,0.0502,5.2213 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0269,0.0191,3.6143 diff --git a/Test/Images/Small/astc_reference-4.3-sse4.1_fastest_results.csv b/Test/Images/Small/astc_reference-4.3-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f1c79ed0d34fcd55c3542bebef8b2ff738a3c9ef --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse4.1_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3308,0.0914,0.0080,8.2124 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0023,0.0004,0.5690 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0023,0.0004,0.5779 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.6022 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0022,0.0004,0.5995 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0022,0.0004,0.5939 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0022,0.0004,0.5926 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5939 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0022,0.0004,0.5926 +Small,4x4,ldr-rgb-00.png,37.2237,0.0096,0.0049,13.3832 +Small,4x4,ldr-rgb-01.png,39.5245,0.0089,0.0045,14.5407 +Small,4x4,ldr-rgb-02.png,34.7577,0.0109,0.0064,10.2083 +Small,4x4,ldr-rgb-03.png,45.4692,0.0061,0.0020,32.4761 +Small,4x4,ldr-rgb-04.png,41.6640,0.0078,0.0034,19.3781 +Small,4x4,ldr-rgb-05.png,36.8562,0.0111,0.0066,9.8565 +Small,4x4,ldr-rgb-06.png,34.9322,0.0104,0.0059,11.0874 +Small,4x4,ldr-rgb-07.png,37.3406,0.0108,0.0063,10.3599 +Small,4x4,ldr-rgb-08.png,42.9161,0.0070,0.0028,23.6515 +Small,4x4,ldr-rgb-09.png,41.7016,0.0078,0.0034,19.3263 +Small,4x4,ldr-rgb-10.png,43.9130,0.0035,0.0011,15.3946 +Small,4x4,ldr-rgba-00.png,34.7268,0.0111,0.0064,10.2398 +Small,4x4,ldr-rgba-01.png,38.6479,0.0095,0.0048,13.5796 +Small,4x4,ldr-rgba-02.png,34.5493,0.0115,0.0068,9.6533 +Small,4x4,ldr-xy-00.png,37.5056,0.0100,0.0035,18.7464 +Small,4x4,ldr-xy-01.png,43.8548,0.0105,0.0040,16.1902 +Small,4x4,ldr-xy-02.png,48.2399,0.0095,0.0028,23.0351 +Small,4x4,ldrs-rgba-00.png,34.7310,0.0113,0.0066,9.9705 +Small,4x4,ldrs-rgba-01.png,38.6664,0.0096,0.0049,13.4625 +Small,4x4,ldrs-rgba-02.png,34.5527,0.0117,0.0068,9.6222 +Small,5x5,hdr-rgb-00.hdr,28.8495,0.0922,0.0084,7.8402 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5913 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5939 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.6084 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5965 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5896 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5871 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5900 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5896 +Small,5x5,ldr-rgb-00.png,33.7101,0.0099,0.0050,12.9904 +Small,5x5,ldr-rgb-01.png,36.0660,0.0090,0.0042,15.7010 +Small,5x5,ldr-rgb-02.png,30.9741,0.0113,0.0065,10.1308 +Small,5x5,ldr-rgb-03.png,42.3108,0.0064,0.0018,35.8334 +Small,5x5,ldr-rgb-04.png,37.0268,0.0087,0.0038,17.3195 +Small,5x5,ldr-rgb-05.png,32.9511,0.0122,0.0073,9.0219 +Small,5x5,ldr-rgb-06.png,31.0218,0.0114,0.0065,10.1308 +Small,5x5,ldr-rgb-07.png,34.4024,0.0109,0.0061,10.7986 +Small,5x5,ldr-rgb-08.png,39.5680,0.0072,0.0026,25.2158 +Small,5x5,ldr-rgb-09.png,37.0647,0.0085,0.0037,17.6975 +Small,5x5,ldr-rgb-10.png,39.8999,0.0039,0.0010,15.8601 +Small,5x5,ldr-rgba-00.png,31.0999,0.0117,0.0067,9.8195 +Small,5x5,ldr-rgba-01.png,35.0302,0.0099,0.0048,13.5735 +Small,5x5,ldr-rgba-02.png,31.0219,0.0121,0.0070,9.3703 +Small,5x5,ldr-xy-00.png,36.6320,0.0103,0.0030,21.8088 +Small,5x5,ldr-xy-01.png,39.1493,0.0107,0.0035,18.8157 +Small,5x5,ldr-xy-02.png,43.8491,0.0100,0.0028,23.5240 +Small,5x5,ldrs-rgba-00.png,31.1012,0.0120,0.0069,9.4554 +Small,5x5,ldrs-rgba-01.png,35.0367,0.0099,0.0049,13.4048 +Small,5x5,ldrs-rgba-02.png,31.0226,0.0122,0.0071,9.2930 +Small,6x6,hdr-rgb-00.hdr,26.7317,0.0918,0.0080,8.1443 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0026,0.0005,0.5470 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5926 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5871 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5965 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5858 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5955 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5829 +Small,6x6,ldr-rgb-00.png,31.3212,0.0110,0.0059,11.0553 +Small,6x6,ldr-rgb-01.png,32.8336,0.0097,0.0049,13.5042 +Small,6x6,ldr-rgb-02.png,27.3837,0.0122,0.0074,8.8972 +Small,6x6,ldr-rgb-03.png,40.3163,0.0063,0.0018,36.6748 +Small,6x6,ldr-rgb-04.png,33.7482,0.0092,0.0043,15.1181 +Small,6x6,ldr-rgb-05.png,29.7352,0.0131,0.0084,7.8262 +Small,6x6,ldr-rgb-06.png,27.4658,0.0122,0.0073,8.9566 +Small,6x6,ldr-rgb-07.png,32.3326,0.0108,0.0061,10.7757 +Small,6x6,ldr-rgb-08.png,37.4336,0.0071,0.0025,26.3192 +Small,6x6,ldr-rgb-09.png,33.3061,0.0091,0.0043,15.1215 +Small,6x6,ldr-rgb-10.png,36.5144,0.0039,0.0011,14.2463 +Small,6x6,ldr-rgba-00.png,28.8377,0.0123,0.0072,9.0492 +Small,6x6,ldr-rgba-01.png,31.9912,0.0106,0.0056,11.7978 +Small,6x6,ldr-rgba-02.png,27.7796,0.0126,0.0074,8.8240 +Small,6x6,ldr-xy-00.png,35.6056,0.0102,0.0032,20.7080 +Small,6x6,ldr-xy-01.png,36.4953,0.0111,0.0039,16.6795 +Small,6x6,ldr-xy-02.png,41.7981,0.0096,0.0026,25.5700 +Small,6x6,ldrs-rgba-00.png,28.8345,0.0124,0.0074,8.8502 +Small,6x6,ldrs-rgba-01.png,31.9977,0.0106,0.0055,11.9549 +Small,6x6,ldrs-rgba-02.png,27.7778,0.0126,0.0074,8.8051 +Small,8x8,hdr-rgb-00.hdr,23.6038,0.0967,0.0119,5.4892 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.6009 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0033,0.0004,0.6111 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5858 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5952 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5727 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5896 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5699 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0005,0.5678 +Small,8x8,ldr-rgb-00.png,27.7031,0.0140,0.0082,8.0198 +Small,8x8,ldr-rgb-01.png,28.6850,0.0126,0.0070,9.3825 +Small,8x8,ldr-rgb-02.png,23.0240,0.0160,0.0104,6.3216 +Small,8x8,ldr-rgb-03.png,37.0258,0.0075,0.0021,30.7986 +Small,8x8,ldr-rgb-04.png,29.1260,0.0123,0.0066,9.9234 +Small,8x8,ldr-rgb-05.png,25.6018,0.0176,0.0120,5.4773 +Small,8x8,ldr-rgb-06.png,23.0810,0.0164,0.0107,6.1495 +Small,8x8,ldr-rgb-07.png,29.4659,0.0125,0.0069,9.5325 +Small,8x8,ldr-rgb-08.png,33.9551,0.0084,0.0030,21.5709 +Small,8x8,ldr-rgb-09.png,28.4493,0.0119,0.0062,10.4939 +Small,8x8,ldr-rgb-10.png,31.9058,0.0049,0.0014,11.9619 +Small,8x8,ldr-rgba-00.png,25.3128,0.0168,0.0109,6.0229 +Small,8x8,ldr-rgba-01.png,28.1781,0.0137,0.0078,8.3666 +Small,8x8,ldr-rgba-02.png,23.8711,0.0166,0.0107,6.1260 +Small,8x8,ldr-xy-00.png,33.2750,0.0127,0.0042,15.5333 +Small,8x8,ldr-xy-01.png,34.1754,0.0133,0.0050,12.9929 +Small,8x8,ldr-xy-02.png,39.7771,0.0102,0.0020,33.4890 +Small,8x8,ldrs-rgba-00.png,25.3134,0.0169,0.0109,6.0052 +Small,8x8,ldrs-rgba-01.png,28.1794,0.0137,0.0079,8.3433 +Small,8x8,ldrs-rgba-02.png,23.8706,0.0167,0.0108,6.0963 +Small,12x12,hdr-rgb-00.hdr,20.4510,0.1047,0.0184,3.5540 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0048,0.0004,0.5887 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0048,0.0004,0.5939 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0048,0.0004,0.5884 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0048,0.0004,0.5896 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0048,0.0004,0.5909 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0048,0.0004,0.6246 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0048,0.0004,0.5742 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0048,0.0004,0.5887 +Small,12x12,ldr-rgb-00.png,23.7098,0.0151,0.0077,8.5300 +Small,12x12,ldr-rgb-01.png,24.7256,0.0128,0.0057,11.5909 +Small,12x12,ldr-rgb-02.png,19.1930,0.0193,0.0121,5.4067 +Small,12x12,ldr-rgb-03.png,33.1431,0.0085,0.0016,41.4285 +Small,12x12,ldr-rgb-04.png,24.3870,0.0127,0.0055,11.8640 +Small,12x12,ldr-rgb-05.png,21.3834,0.0181,0.0109,6.0087 +Small,12x12,ldr-rgb-06.png,19.1690,0.0199,0.0126,5.1881 +Small,12x12,ldr-rgb-07.png,25.3142,0.0125,0.0053,12.3607 +Small,12x12,ldr-rgb-08.png,30.1204,0.0095,0.0026,25.5297 +Small,12x12,ldr-rgb-09.png,23.5983,0.0145,0.0072,9.1034 +Small,12x12,ldr-rgb-10.png,27.2834,0.0069,0.0018,9.1324 +Small,12x12,ldr-rgba-00.png,21.3613,0.0190,0.0116,5.6657 +Small,12x12,ldr-rgba-01.png,24.4808,0.0143,0.0068,9.6503 +Small,12x12,ldr-rgba-02.png,20.1381,0.0217,0.0142,4.6217 +Small,12x12,ldr-xy-00.png,28.8908,0.0151,0.0044,14.8334 +Small,12x12,ldr-xy-01.png,29.6770,0.0144,0.0040,16.4460 +Small,12x12,ldr-xy-02.png,37.9716,0.0114,0.0010,63.3213 +Small,12x12,ldrs-rgba-00.png,21.3627,0.0192,0.0118,5.5492 +Small,12x12,ldrs-rgba-01.png,24.4817,0.0141,0.0069,9.5576 +Small,12x12,ldrs-rgba-02.png,20.1379,0.0218,0.0144,4.5416 +Small,3x3x3,ldr-l-00-3.dds,50.6979,0.0157,0.0086,30.3825 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0071,0.0037,18.4583 +Small,6x6x6,ldr-l-00-3.dds,32.5210,0.0613,0.0498,5.2645 +Small,6x6x6,ldr-l-01-3.dds,40.9072,0.0269,0.0190,3.6206 diff --git a/Test/Images/Small/astc_reference-4.3-sse4.1_medium_results.csv b/Test/Images/Small/astc_reference-4.3-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..efb763594c83e5a0929d0b868d11a207f4158feb --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse4.1_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1238,0.1047,0.0202,3.2389 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0037,0.0005,0.5008 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5751 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5555 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0005,0.5578 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0005,0.5666 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0005,0.5601 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5884 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5939 +Small,4x4,ldr-rgb-00.png,38.8091,0.0280,0.0221,2.9612 +Small,4x4,ldr-rgb-01.png,40.2008,0.0247,0.0188,3.4950 +Small,4x4,ldr-rgb-02.png,35.2658,0.0248,0.0191,3.4370 +Small,4x4,ldr-rgb-03.png,47.2399,0.0168,0.0112,5.8498 +Small,4x4,ldr-rgb-04.png,42.1842,0.0204,0.0146,4.4823 +Small,4x4,ldr-rgb-05.png,37.7989,0.0269,0.0212,3.0881 +Small,4x4,ldr-rgb-06.png,35.4538,0.0227,0.0168,3.8908 +Small,4x4,ldr-rgb-07.png,39.2651,0.0332,0.0275,2.3838 +Small,4x4,ldr-rgb-08.png,45.1580,0.0194,0.0138,4.7566 +Small,4x4,ldr-rgb-09.png,42.1202,0.0210,0.0151,4.3327 +Small,4x4,ldr-rgb-10.png,44.8973,0.0061,0.0025,6.5788 +Small,4x4,ldr-rgba-00.png,36.2355,0.0308,0.0249,2.6363 +Small,4x4,ldr-rgba-01.png,38.9520,0.0201,0.0141,4.6332 +Small,4x4,ldr-rgba-02.png,34.9310,0.0219,0.0159,4.1207 +Small,4x4,ldr-xy-00.png,37.7517,0.0202,0.0129,5.0623 +Small,4x4,ldr-xy-01.png,45.1812,0.0272,0.0200,3.2784 +Small,4x4,ldr-xy-02.png,50.9688,0.0320,0.0247,2.6539 +Small,4x4,ldrs-rgba-00.png,36.2429,0.0308,0.0249,2.6335 +Small,4x4,ldrs-rgba-01.png,38.9706,0.0203,0.0144,4.5657 +Small,4x4,ldrs-rgba-02.png,34.9330,0.0220,0.0159,4.1135 +Small,5x5,hdr-rgb-00.hdr,29.8792,0.1075,0.0228,2.8742 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0044,0.0004,0.5871 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0045,0.0004,0.5804 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0004,0.5871 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0004,0.5900 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5639 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0047,0.0005,0.5334 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0005,0.5495 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0046,0.0005,0.5651 +Small,5x5,ldr-rgb-00.png,35.1353,0.0319,0.0243,2.6939 +Small,5x5,ldr-rgb-01.png,36.4365,0.0235,0.0167,3.9288 +Small,5x5,ldr-rgb-02.png,31.1195,0.0237,0.0169,3.8809 +Small,5x5,ldr-rgb-03.png,43.9924,0.0134,0.0070,9.3540 +Small,5x5,ldr-rgb-04.png,37.6527,0.0219,0.0151,4.3304 +Small,5x5,ldr-rgb-05.png,33.5357,0.0318,0.0249,2.6362 +Small,5x5,ldr-rgb-06.png,31.1617,0.0231,0.0160,4.0862 +Small,5x5,ldr-rgb-07.png,36.1275,0.0356,0.0289,2.2710 +Small,5x5,ldr-rgb-08.png,41.6131,0.0185,0.0119,5.4984 +Small,5x5,ldr-rgb-09.png,37.5769,0.0211,0.0143,4.5848 +Small,5x5,ldr-rgb-10.png,40.5644,0.0073,0.0026,6.1598 +Small,5x5,ldr-rgba-00.png,32.7897,0.0359,0.0290,2.2631 +Small,5x5,ldr-rgba-01.png,35.3090,0.0225,0.0155,4.2186 +Small,5x5,ldr-rgba-02.png,31.1309,0.0245,0.0174,3.7619 +Small,5x5,ldr-xy-00.png,37.0786,0.0209,0.0125,5.2434 +Small,5x5,ldr-xy-01.png,40.5669,0.0268,0.0184,3.5699 +Small,5x5,ldr-xy-02.png,49.0821,0.0220,0.0136,4.8238 +Small,5x5,ldrs-rgba-00.png,32.7935,0.0364,0.0294,2.2318 +Small,5x5,ldrs-rgba-01.png,35.3182,0.0225,0.0155,4.2197 +Small,5x5,ldrs-rgba-02.png,31.1320,0.0245,0.0175,3.7552 +Small,6x6,hdr-rgb-00.hdr,27.4934,0.1098,0.0241,2.7137 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0043,0.0005,0.5470 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0005,0.5616 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0042,0.0004,0.5779 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0042,0.0004,0.5832 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0042,0.0004,0.5702 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0043,0.0004,0.5742 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0004,0.5926 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0042,0.0004,0.5779 +Small,6x6,ldr-rgb-00.png,32.3857,0.0321,0.0253,2.5868 +Small,6x6,ldr-rgb-01.png,33.0813,0.0246,0.0179,3.6684 +Small,6x6,ldr-rgb-02.png,27.5038,0.0253,0.0183,3.5881 +Small,6x6,ldr-rgb-03.png,41.7098,0.0117,0.0055,11.9222 +Small,6x6,ldr-rgb-04.png,34.1976,0.0212,0.0146,4.4805 +Small,6x6,ldr-rgb-05.png,30.1358,0.0327,0.0261,2.5114 +Small,6x6,ldr-rgb-06.png,27.5712,0.0243,0.0177,3.7116 +Small,6x6,ldr-rgb-07.png,33.8773,0.0348,0.0283,2.3144 +Small,6x6,ldr-rgb-08.png,39.1910,0.0158,0.0093,7.0666 +Small,6x6,ldr-rgb-09.png,33.6644,0.0205,0.0140,4.6795 +Small,6x6,ldr-rgb-10.png,36.9239,0.0073,0.0028,5.7626 +Small,6x6,ldr-rgba-00.png,30.2372,0.0394,0.0326,2.0083 +Small,6x6,ldr-rgba-01.png,32.1918,0.0233,0.0166,3.9411 +Small,6x6,ldr-rgba-02.png,27.8514,0.0263,0.0195,3.3648 +Small,6x6,ldr-xy-00.png,36.2476,0.0192,0.0109,5.9922 +Small,6x6,ldr-xy-01.png,37.9375,0.0218,0.0136,4.8057 +Small,6x6,ldr-xy-02.png,46.0669,0.0183,0.0100,6.5760 +Small,6x6,ldrs-rgba-00.png,30.2354,0.0392,0.0325,2.0174 +Small,6x6,ldrs-rgba-01.png,32.1978,0.0234,0.0165,3.9632 +Small,6x6,ldrs-rgba-02.png,27.8496,0.0263,0.0195,3.3596 +Small,8x8,hdr-rgb-00.hdr,24.1284,0.1182,0.0319,2.0570 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0050,0.0006,0.4612 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0049,0.0005,0.5258 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0049,0.0005,0.5563 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5926 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0004,0.5795 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0048,0.0004,0.5952 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0050,0.0005,0.5555 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0005,0.5555 +Small,8x8,ldr-rgb-00.png,28.7284,0.0420,0.0346,1.8933 +Small,8x8,ldr-rgb-01.png,28.9370,0.0294,0.0220,2.9726 +Small,8x8,ldr-rgb-02.png,23.1614,0.0316,0.0243,2.7021 +Small,8x8,ldr-rgb-03.png,38.5560,0.0137,0.0069,9.5272 +Small,8x8,ldr-rgb-04.png,29.6453,0.0292,0.0220,2.9769 +Small,8x8,ldr-rgb-05.png,25.9412,0.0406,0.0332,1.9714 +Small,8x8,ldr-rgb-06.png,23.2047,0.0320,0.0246,2.6594 +Small,8x8,ldr-rgb-07.png,30.7489,0.0422,0.0349,1.8753 +Small,8x8,ldr-rgb-08.png,35.9057,0.0188,0.0119,5.5039 +Small,8x8,ldr-rgb-09.png,28.9902,0.0266,0.0194,3.3748 +Small,8x8,ldr-rgb-10.png,32.1710,0.0090,0.0039,4.2059 +Small,8x8,ldr-rgba-00.png,26.4438,0.0491,0.0418,1.5694 +Small,8x8,ldr-rgba-01.png,28.3668,0.0297,0.0222,2.9539 +Small,8x8,ldr-rgba-02.png,23.9414,0.0335,0.0261,2.5108 +Small,8x8,ldr-xy-00.png,33.9206,0.0258,0.0156,4.1900 +Small,8x8,ldr-xy-01.png,34.9386,0.0260,0.0159,4.1233 +Small,8x8,ldr-xy-02.png,41.6877,0.0204,0.0104,6.2858 +Small,8x8,ldrs-rgba-00.png,26.4457,0.0493,0.0418,1.5688 +Small,8x8,ldrs-rgba-01.png,28.3703,0.0300,0.0224,2.9295 +Small,8x8,ldrs-rgba-02.png,23.9416,0.0338,0.0263,2.4965 +Small,12x12,hdr-rgb-00.hdr,20.7755,0.1368,0.0473,1.3863 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0077,0.0006,0.4361 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0077,0.0005,0.5613 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0077,0.0004,0.5804 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0079,0.0005,0.5331 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0078,0.0005,0.5675 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0077,0.0004,0.5727 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0078,0.0005,0.5388 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0079,0.0005,0.5484 +Small,12x12,ldr-rgb-00.png,24.6915,0.0529,0.0426,1.5398 +Small,12x12,ldr-rgb-01.png,25.0393,0.0395,0.0293,2.2345 +Small,12x12,ldr-rgb-02.png,19.2743,0.0464,0.0361,1.8129 +Small,12x12,ldr-rgb-03.png,34.9505,0.0175,0.0074,8.8051 +Small,12x12,ldr-rgb-04.png,24.9006,0.0383,0.0280,2.3400 +Small,12x12,ldr-rgb-05.png,21.6514,0.0535,0.0433,1.5127 +Small,12x12,ldr-rgb-06.png,19.2513,0.0472,0.0369,1.7754 +Small,12x12,ldr-rgb-07.png,26.7396,0.0488,0.0387,1.6925 +Small,12x12,ldr-rgb-08.png,31.6566,0.0230,0.0130,5.0474 +Small,12x12,ldr-rgb-09.png,24.1576,0.0367,0.0268,2.4478 +Small,12x12,ldr-rgb-10.png,28.0433,0.0160,0.0081,2.0022 +Small,12x12,ldr-rgba-00.png,22.2473,0.0585,0.0481,1.3637 +Small,12x12,ldr-rgba-01.png,24.6500,0.0388,0.0283,2.3154 +Small,12x12,ldr-rgba-02.png,20.1848,0.0499,0.0394,1.6616 +Small,12x12,ldr-xy-00.png,30.2110,0.0329,0.0188,3.4852 +Small,12x12,ldr-xy-01.png,31.8412,0.0340,0.0202,3.2405 +Small,12x12,ldr-xy-02.png,38.5222,0.0180,0.0042,15.7154 +Small,12x12,ldrs-rgba-00.png,22.2476,0.0587,0.0484,1.3546 +Small,12x12,ldrs-rgba-01.png,24.6522,0.0393,0.0287,2.2832 +Small,12x12,ldrs-rgba-02.png,20.1848,0.0502,0.0395,1.6576 +Small,3x3x3,ldr-l-00-3.dds,51.8769,0.0216,0.0126,20.7408 +Small,3x3x3,ldr-l-01-3.dds,54.6166,0.0090,0.0039,17.4520 +Small,6x6x6,ldr-l-00-3.dds,32.9597,0.0735,0.0597,4.3940 +Small,6x6x6,ldr-l-01-3.dds,41.0140,0.0290,0.0191,3.5999 diff --git a/Test/Images/Small/astc_reference-4.3-sse4.1_thorough_results.csv b/Test/Images/Small/astc_reference-4.3-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..04aff3e31158e4efa0aa2a02a9635d0595176717 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.3-sse4.1_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.3988,0.1243,0.0398,1.6456 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5829 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5079 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0037,0.0005,0.5481 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0005,0.5470 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0005,0.5555 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5791 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5437 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0005,0.5172 +Small,4x4,ldr-rgb-00.png,39.1396,0.0516,0.0457,1.4328 +Small,4x4,ldr-rgb-01.png,40.3879,0.0491,0.0433,1.5141 +Small,4x4,ldr-rgb-02.png,35.4469,0.0465,0.0406,1.6143 +Small,4x4,ldr-rgb-03.png,47.7050,0.0457,0.0402,1.6286 +Small,4x4,ldr-rgb-04.png,42.3343,0.0418,0.0360,1.8190 +Small,4x4,ldr-rgb-05.png,37.9716,0.0503,0.0444,1.4748 +Small,4x4,ldr-rgb-06.png,35.6101,0.0415,0.0357,1.8363 +Small,4x4,ldr-rgb-07.png,39.8550,0.0612,0.0553,1.1841 +Small,4x4,ldr-rgb-08.png,45.8141,0.0452,0.0397,1.6505 +Small,4x4,ldr-rgb-09.png,42.2663,0.0449,0.0392,1.6738 +Small,4x4,ldr-rgb-10.png,45.1134,0.0088,0.0051,3.1843 +Small,4x4,ldr-rgba-00.png,36.7024,0.0541,0.0482,1.3601 +Small,4x4,ldr-rgba-01.png,39.0829,0.0394,0.0334,1.9629 +Small,4x4,ldr-rgba-02.png,35.0183,0.0393,0.0333,1.9664 +Small,4x4,ldr-xy-00.png,37.7753,0.0508,0.0435,1.5078 +Small,4x4,ldr-xy-01.png,45.2569,0.0574,0.0502,1.3062 +Small,4x4,ldr-xy-02.png,50.9912,0.0716,0.0639,1.0263 +Small,4x4,ldrs-rgba-00.png,36.7104,0.0543,0.0483,1.3566 +Small,4x4,ldrs-rgba-01.png,39.1044,0.0400,0.0339,1.9307 +Small,4x4,ldrs-rgba-02.png,35.0233,0.0395,0.0335,1.9565 +Small,5x5,hdr-rgb-00.hdr,30.2809,0.1304,0.0444,1.4756 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0046,0.0005,0.5377 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0005,0.5266 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0004,0.5913 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0004,0.5845 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5804 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0004,0.5804 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0005,0.5437 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0004,0.5861 +Small,5x5,ldr-rgb-00.png,35.3622,0.0602,0.0532,1.2325 +Small,5x5,ldr-rgb-01.png,36.5321,0.0531,0.0463,1.4159 +Small,5x5,ldr-rgb-02.png,31.1870,0.0461,0.0392,1.6701 +Small,5x5,ldr-rgb-03.png,44.5348,0.0517,0.0450,1.4558 +Small,5x5,ldr-rgb-04.png,37.8081,0.0475,0.0407,1.6118 +Small,5x5,ldr-rgb-05.png,33.6835,0.0600,0.0531,1.2351 +Small,5x5,ldr-rgb-06.png,31.2225,0.0444,0.0368,1.7801 +Small,5x5,ldr-rgb-07.png,36.7108,0.0719,0.0652,1.0059 +Small,5x5,ldr-rgb-08.png,42.3675,0.0508,0.0441,1.4871 +Small,5x5,ldr-rgb-09.png,37.6987,0.0529,0.0459,1.4286 +Small,5x5,ldr-rgb-10.png,40.7256,0.0108,0.0061,2.6724 +Small,5x5,ldr-rgba-00.png,33.0991,0.0654,0.0581,1.1271 +Small,5x5,ldr-rgba-01.png,35.4017,0.0455,0.0385,1.7019 +Small,5x5,ldr-rgba-02.png,31.1706,0.0443,0.0371,1.7679 +Small,5x5,ldr-xy-00.png,37.2351,0.0569,0.0485,1.3526 +Small,5x5,ldr-xy-01.png,41.4156,0.0685,0.0601,1.0898 +Small,5x5,ldr-xy-02.png,49.2617,0.0777,0.0693,0.9457 +Small,5x5,ldrs-rgba-00.png,33.1063,0.0656,0.0585,1.1209 +Small,5x5,ldrs-rgba-01.png,35.4095,0.0460,0.0388,1.6888 +Small,5x5,ldrs-rgba-02.png,31.1713,0.0441,0.0369,1.7780 +Small,6x6,hdr-rgb-00.hdr,27.6987,0.1336,0.0480,1.3651 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0043,0.0005,0.5566 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0044,0.0005,0.5687 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0043,0.0005,0.5651 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0043,0.0005,0.5678 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0043,0.0005,0.5628 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5663 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0005,0.5604 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0043,0.0004,0.5817 +Small,6x6,ldr-rgb-00.png,32.6236,0.0657,0.0590,1.1107 +Small,6x6,ldr-rgb-01.png,33.1855,0.0563,0.0497,1.3179 +Small,6x6,ldr-rgb-02.png,27.5522,0.0493,0.0426,1.5394 +Small,6x6,ldr-rgb-03.png,42.5760,0.0446,0.0383,1.7131 +Small,6x6,ldr-rgb-04.png,34.3279,0.0495,0.0429,1.5289 +Small,6x6,ldr-rgb-05.png,30.2792,0.0633,0.0567,1.1561 +Small,6x6,ldr-rgb-06.png,27.6242,0.0473,0.0406,1.6122 +Small,6x6,ldr-rgb-07.png,34.4221,0.0774,0.0707,0.9270 +Small,6x6,ldr-rgb-08.png,40.0080,0.0453,0.0389,1.6841 +Small,6x6,ldr-rgb-09.png,33.8156,0.0526,0.0460,1.4249 +Small,6x6,ldr-rgb-10.png,37.1747,0.0120,0.0074,2.1850 +Small,6x6,ldr-rgba-00.png,30.4928,0.0726,0.0658,0.9964 +Small,6x6,ldr-rgba-01.png,32.2722,0.0509,0.0441,1.4875 +Small,6x6,ldr-rgba-02.png,27.8884,0.0482,0.0413,1.5884 +Small,6x6,ldr-xy-00.png,36.3580,0.0474,0.0392,1.6738 +Small,6x6,ldr-xy-01.png,38.1144,0.0656,0.0575,1.1396 +Small,6x6,ldr-xy-02.png,47.4637,0.0804,0.0722,0.9082 +Small,6x6,ldrs-rgba-00.png,30.4894,0.0726,0.0658,0.9965 +Small,6x6,ldrs-rgba-01.png,32.2774,0.0516,0.0448,1.4637 +Small,6x6,ldrs-rgba-02.png,27.8865,0.0483,0.0413,1.5852 +Small,8x8,hdr-rgb-00.hdr,24.3310,0.1553,0.0657,0.9975 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0063,0.0006,0.4444 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0064,0.0005,0.5070 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0064,0.0005,0.5225 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0004,0.5702 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0062,0.0005,0.5675 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0062,0.0004,0.5742 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0062,0.0004,0.5871 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0062,0.0005,0.5492 +Small,8x8,ldr-rgb-00.png,28.9743,0.0864,0.0776,0.8450 +Small,8x8,ldr-rgb-01.png,29.0250,0.0713,0.0627,1.0460 +Small,8x8,ldr-rgb-02.png,23.2010,0.0667,0.0580,1.1300 +Small,8x8,ldr-rgb-03.png,39.4059,0.0336,0.0253,2.5886 +Small,8x8,ldr-rgb-04.png,29.7753,0.0650,0.0563,1.1631 +Small,8x8,ldr-rgb-05.png,26.0443,0.0786,0.0700,0.9362 +Small,8x8,ldr-rgb-06.png,23.2548,0.0649,0.0559,1.1720 +Small,8x8,ldr-rgb-07.png,31.1954,0.0962,0.0877,0.7470 +Small,8x8,ldr-rgb-08.png,36.5527,0.0486,0.0401,1.6335 +Small,8x8,ldr-rgb-09.png,29.1512,0.0564,0.0477,1.3726 +Small,8x8,ldr-rgb-10.png,32.3269,0.0160,0.0096,1.7012 +Small,8x8,ldr-rgba-00.png,26.7456,0.0952,0.0864,0.7586 +Small,8x8,ldr-rgba-01.png,28.4290,0.0701,0.0611,1.0734 +Small,8x8,ldr-rgba-02.png,23.9672,0.0637,0.0549,1.1943 +Small,8x8,ldr-xy-00.png,34.1954,0.0570,0.0469,1.3988 +Small,8x8,ldr-xy-01.png,35.2284,0.0595,0.0495,1.3250 +Small,8x8,ldr-xy-02.png,44.4736,0.0755,0.0653,1.0033 +Small,8x8,ldrs-rgba-00.png,26.7460,0.0948,0.0861,0.7615 +Small,8x8,ldrs-rgba-01.png,28.4323,0.0694,0.0605,1.0833 +Small,8x8,ldrs-rgba-02.png,23.9676,0.0641,0.0551,1.1900 +Small,12x12,hdr-rgb-00.hdr,21.0278,0.1918,0.0995,0.6588 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0102,0.0004,0.5829 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0100,0.0004,0.5896 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0102,0.0005,0.5575 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0101,0.0004,0.6009 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0104,0.0004,0.5727 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0103,0.0005,0.5470 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0103,0.0005,0.5390 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0102,0.0005,0.5663 +Small,12x12,ldr-rgb-00.png,25.0567,0.1181,0.1053,0.6224 +Small,12x12,ldr-rgb-01.png,25.1428,0.0963,0.0834,0.7857 +Small,12x12,ldr-rgb-02.png,19.2937,0.1061,0.0935,0.7012 +Small,12x12,ldr-rgb-03.png,36.1599,0.0395,0.0271,2.4169 +Small,12x12,ldr-rgb-04.png,24.9934,0.0874,0.0746,0.8788 +Small,12x12,ldr-rgb-05.png,21.7356,0.1070,0.0942,0.6956 +Small,12x12,ldr-rgb-06.png,19.2955,0.1031,0.0904,0.7252 +Small,12x12,ldr-rgb-07.png,27.0999,0.1209,0.1083,0.6049 +Small,12x12,ldr-rgb-08.png,32.4850,0.0504,0.0380,1.7260 +Small,12x12,ldr-rgb-09.png,24.3014,0.0815,0.0690,0.9500 +Small,12x12,ldr-rgb-10.png,28.1869,0.0280,0.0174,0.9317 +Small,12x12,ldr-rgba-00.png,22.7181,0.1243,0.1113,0.5889 +Small,12x12,ldr-rgba-01.png,24.7277,0.0982,0.0854,0.7674 +Small,12x12,ldr-rgba-02.png,20.2040,0.1018,0.0888,0.7379 +Small,12x12,ldr-xy-00.png,30.5815,0.0771,0.0628,1.0431 +Small,12x12,ldr-xy-01.png,32.1781,0.0619,0.0478,1.3703 +Small,12x12,ldr-xy-02.png,40.2787,0.0448,0.0305,2.1488 +Small,12x12,ldrs-rgba-00.png,22.7169,0.1249,0.1120,0.5849 +Small,12x12,ldrs-rgba-01.png,24.7295,0.0993,0.0863,0.7596 +Small,12x12,ldrs-rgba-02.png,20.2043,0.1024,0.0895,0.7322 +Small,3x3x3,ldr-l-00-3.dds,52.3138,0.0370,0.0282,9.3088 +Small,3x3x3,ldr-l-01-3.dds,55.2511,0.0163,0.0111,6.1857 +Small,6x6x6,ldr-l-00-3.dds,33.2738,0.1017,0.0852,3.0754 +Small,6x6x6,ldr-l-01-3.dds,41.7409,0.0321,0.0197,3.5001 diff --git a/Test/Images/Small/astc_reference-4.4-avx2_fast_results.csv b/Test/Images/Small/astc_reference-4.4-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e5591f8aaef2ac9c0adcfeb0167b17469c63ea6f --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-avx2_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7281,0.0970,0.0120,5.4837 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0029,0.0005,0.5434 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0029,0.0005,0.5518 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0004,0.5939 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0028,0.0004,0.5982 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0029,0.0005,0.5492 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0028,0.0004,0.5779 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0029,0.0004,0.5858 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0028,0.0004,0.5900 +Small,4x4,ldr-rgb-00.png,38.2512,0.0131,0.0078,8.3550 +Small,4x4,ldr-rgb-01.png,39.9266,0.0115,0.0066,9.9796 +Small,4x4,ldr-rgb-02.png,35.1621,0.0157,0.0106,6.2055 +Small,4x4,ldr-rgb-03.png,46.0782,0.0071,0.0024,27.0709 +Small,4x4,ldr-rgb-04.png,41.9798,0.0095,0.0045,14.6648 +Small,4x4,ldr-rgb-05.png,37.3372,0.0154,0.0104,6.2918 +Small,4x4,ldr-rgb-06.png,35.3603,0.0146,0.0095,6.8892 +Small,4x4,ldr-rgb-07.png,38.1442,0.0157,0.0107,6.1134 +Small,4x4,ldr-rgb-08.png,43.8361,0.0086,0.0038,17.1381 +Small,4x4,ldr-rgb-09.png,41.9339,0.0098,0.0047,13.9143 +Small,4x4,ldr-rgb-10.png,44.4590,0.0043,0.0013,12.6993 +Small,4x4,ldr-rgba-00.png,35.6010,0.0160,0.0106,6.1629 +Small,4x4,ldr-rgba-01.png,38.8640,0.0114,0.0061,10.7123 +Small,4x4,ldr-rgba-02.png,34.8755,0.0141,0.0087,7.5111 +Small,4x4,ldr-xy-00.png,37.5551,0.0114,0.0042,15.5888 +Small,4x4,ldr-xy-01.png,44.3046,0.0123,0.0052,12.6689 +Small,4x4,ldr-xy-02.png,48.2608,0.0105,0.0031,20.9991 +Small,4x4,ldrs-rgba-00.png,35.6065,0.0159,0.0105,6.2243 +Small,4x4,ldrs-rgba-01.png,38.8848,0.0114,0.0062,10.5995 +Small,4x4,ldrs-rgba-02.png,34.8762,0.0143,0.0088,7.4559 +Small,5x5,hdr-rgb-00.hdr,29.5480,0.0978,0.0121,5.4086 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.5434 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5566 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0005,0.5390 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5845 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5804 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0004,0.5764 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5807 +Small,5x5,ldr-rgb-00.png,34.4321,0.0134,0.0075,8.7535 +Small,5x5,ldr-rgb-01.png,36.2469,0.0106,0.0049,13.3365 +Small,5x5,ldr-rgb-02.png,31.0931,0.0136,0.0079,8.2633 +Small,5x5,ldr-rgb-03.png,42.7531,0.0075,0.0020,32.8017 +Small,5x5,ldr-rgb-04.png,37.2747,0.0099,0.0043,15.4201 +Small,5x5,ldr-rgb-05.png,33.2744,0.0158,0.0101,6.5197 +Small,5x5,ldr-rgb-06.png,31.1326,0.0136,0.0077,8.4792 +Small,5x5,ldr-rgb-07.png,35.0664,0.0139,0.0083,7.9417 +Small,5x5,ldr-rgb-08.png,40.1866,0.0086,0.0032,20.7330 +Small,5x5,ldr-rgb-09.png,37.3026,0.0099,0.0043,15.3409 +Small,5x5,ldr-rgb-10.png,40.1964,0.0048,0.0012,14.0728 +Small,5x5,ldr-rgba-00.png,32.1470,0.0163,0.0105,6.2653 +Small,5x5,ldr-rgba-01.png,35.1987,0.0117,0.0058,11.3286 +Small,5x5,ldr-rgba-02.png,31.1340,0.0142,0.0081,8.1241 +Small,5x5,ldr-xy-00.png,36.7495,0.0116,0.0035,18.5866 +Small,5x5,ldr-xy-01.png,39.8321,0.0124,0.0043,15.1984 +Small,5x5,ldr-xy-02.png,43.9343,0.0112,0.0030,21.9850 +Small,5x5,ldrs-rgba-00.png,32.1514,0.0166,0.0107,6.1526 +Small,5x5,ldrs-rgba-01.png,35.2069,0.0117,0.0057,11.4959 +Small,5x5,ldrs-rgba-02.png,31.1349,0.0142,0.0081,8.0550 +Small,6x6,hdr-rgb-00.hdr,27.0790,0.0970,0.0118,5.5756 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5900 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5887 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5807 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5829 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5845 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5884 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0005,0.5543 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5754 +Small,6x6,ldr-rgb-00.png,31.7144,0.0146,0.0089,7.3902 +Small,6x6,ldr-rgb-01.png,32.9244,0.0115,0.0059,11.0704 +Small,6x6,ldr-rgb-02.png,27.4795,0.0140,0.0084,7.7862 +Small,6x6,ldr-rgb-03.png,40.5991,0.0073,0.0020,32.9629 +Small,6x6,ldr-rgb-04.png,33.9357,0.0104,0.0049,13.4513 +Small,6x6,ldr-rgb-05.png,29.9800,0.0170,0.0114,5.7700 +Small,6x6,ldr-rgb-06.png,27.5476,0.0140,0.0083,7.8514 +Small,6x6,ldr-rgb-07.png,32.9378,0.0133,0.0078,8.3751 +Small,6x6,ldr-rgb-08.png,37.8129,0.0085,0.0033,20.1273 +Small,6x6,ldr-rgb-09.png,33.4946,0.0106,0.0050,13.0083 +Small,6x6,ldr-rgb-10.png,36.6909,0.0049,0.0013,12.9723 +Small,6x6,ldr-rgba-00.png,29.6086,0.0177,0.0119,5.5063 +Small,6x6,ldr-rgba-01.png,32.0847,0.0122,0.0063,10.3466 +Small,6x6,ldr-rgba-02.png,27.8414,0.0149,0.0090,7.2883 +Small,6x6,ldr-xy-00.png,35.9075,0.0116,0.0035,18.5078 +Small,6x6,ldr-xy-01.png,37.1654,0.0128,0.0050,13.0212 +Small,6x6,ldr-xy-02.png,41.9299,0.0107,0.0029,22.5439 +Small,6x6,ldrs-rgba-00.png,29.6031,0.0180,0.0122,5.3935 +Small,6x6,ldrs-rgba-01.png,32.0904,0.0121,0.0064,10.1939 +Small,6x6,ldrs-rgba-02.png,27.8386,0.0149,0.0090,7.2560 +Small,8x8,hdr-rgb-00.hdr,23.7844,0.0999,0.0141,4.6645 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0037,0.0005,0.5601 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0036,0.0004,0.5739 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0037,0.0005,0.5518 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0037,0.0005,0.5437 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0037,0.0005,0.5470 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0004,0.5832 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0004,0.5791 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0004,0.5727 +Small,8x8,ldr-rgb-00.png,28.0659,0.0158,0.0097,6.7676 +Small,8x8,ldr-rgb-01.png,28.7734,0.0132,0.0074,8.8192 +Small,8x8,ldr-rgb-02.png,23.1042,0.0172,0.0114,5.7716 +Small,8x8,ldr-rgb-03.png,37.3496,0.0077,0.0022,29.4933 +Small,8x8,ldr-rgb-04.png,29.3469,0.0125,0.0068,9.6948 +Small,8x8,ldr-rgb-05.png,25.8034,0.0192,0.0133,4.9260 +Small,8x8,ldr-rgb-06.png,23.1655,0.0175,0.0116,5.6255 +Small,8x8,ldr-rgb-07.png,29.8427,0.0133,0.0076,8.5781 +Small,8x8,ldr-rgb-08.png,34.4844,0.0090,0.0035,18.9075 +Small,8x8,ldr-rgb-09.png,28.6410,0.0120,0.0063,10.3256 +Small,8x8,ldr-rgb-10.png,31.9947,0.0053,0.0016,10.0461 +Small,8x8,ldr-rgba-00.png,25.7010,0.0193,0.0132,4.9505 +Small,8x8,ldr-rgba-01.png,28.2814,0.0149,0.0088,7.4187 +Small,8x8,ldr-rgba-02.png,23.9350,0.0185,0.0124,5.2831 +Small,8x8,ldr-xy-00.png,33.3347,0.0130,0.0045,14.7175 +Small,8x8,ldr-xy-01.png,34.3877,0.0138,0.0053,12.2818 +Small,8x8,ldr-xy-02.png,39.8793,0.0104,0.0020,32.8683 +Small,8x8,ldrs-rgba-00.png,25.7001,0.0192,0.0131,4.9936 +Small,8x8,ldrs-rgba-01.png,28.2840,0.0149,0.0087,7.5114 +Small,8x8,ldrs-rgba-02.png,23.9352,0.0187,0.0125,5.2236 +Small,12x12,hdr-rgb-00.hdr,20.5374,0.1084,0.0205,3.1928 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0055,0.0005,0.5256 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0055,0.0005,0.5540 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0055,0.0005,0.5566 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0055,0.0005,0.5566 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0054,0.0004,0.5739 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0055,0.0004,0.5714 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0005,0.5666 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0055,0.0004,0.5714 +Small,12x12,ldr-rgb-00.png,23.7930,0.0162,0.0083,7.9168 +Small,12x12,ldr-rgb-01.png,24.7698,0.0138,0.0060,10.9044 +Small,12x12,ldr-rgb-02.png,19.2293,0.0211,0.0133,4.9124 +Small,12x12,ldr-rgb-03.png,33.2561,0.0090,0.0016,41.2173 +Small,12x12,ldr-rgb-04.png,24.5727,0.0135,0.0058,11.2701 +Small,12x12,ldr-rgb-05.png,21.4915,0.0196,0.0118,5.5324 +Small,12x12,ldr-rgb-06.png,19.2266,0.0220,0.0142,4.6136 +Small,12x12,ldr-rgb-07.png,25.3769,0.0134,0.0056,11.6139 +Small,12x12,ldr-rgb-08.png,30.2961,0.0102,0.0027,24.5646 +Small,12x12,ldr-rgb-09.png,23.7353,0.0151,0.0074,8.9041 +Small,12x12,ldr-rgb-10.png,27.3243,0.0076,0.0019,8.4794 +Small,12x12,ldr-rgba-00.png,21.6059,0.0215,0.0135,4.8538 +Small,12x12,ldr-rgba-01.png,24.5172,0.0152,0.0073,8.9324 +Small,12x12,ldr-rgba-02.png,20.1746,0.0240,0.0158,4.1434 +Small,12x12,ldr-xy-00.png,29.2247,0.0159,0.0047,13.9087 +Small,12x12,ldr-xy-01.png,30.5463,0.0152,0.0041,15.9720 +Small,12x12,ldr-xy-02.png,37.9988,0.0122,0.0011,59.2537 +Small,12x12,ldrs-rgba-00.png,21.6106,0.0216,0.0137,4.7854 +Small,12x12,ldrs-rgba-01.png,24.5187,0.0154,0.0074,8.8957 +Small,12x12,ldrs-rgba-02.png,20.1751,0.0239,0.0158,4.1494 +Small,3x3x3,ldr-l-00-3.dds,50.8347,0.0152,0.0075,34.9484 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0073,0.0032,21.6325 +Small,6x6x6,ldr-l-00-3.dds,32.5284,0.0457,0.0346,7.5692 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0208,0.0132,5.2323 diff --git a/Test/Images/Small/astc_reference-4.4-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-4.4-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..cee75d7adf556d3bede419adeb46143817ac3959 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-avx2_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3455,0.0916,0.0073,8.9371 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0022,0.0004,0.5982 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0023,0.0004,0.5845 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.5896 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0022,0.0004,0.5832 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0023,0.0004,0.5896 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0023,0.0004,0.5884 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5874 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0023,0.0004,0.6025 +Small,4x4,ldr-rgb-00.png,37.2470,0.0090,0.0044,14.9423 +Small,4x4,ldr-rgb-01.png,39.5439,0.0085,0.0040,16.3103 +Small,4x4,ldr-rgb-02.png,34.7920,0.0103,0.0058,11.2858 +Small,4x4,ldr-rgb-03.png,45.4866,0.0060,0.0019,34.3640 +Small,4x4,ldr-rgb-04.png,41.7158,0.0076,0.0031,20.9574 +Small,4x4,ldr-rgb-05.png,36.8705,0.0106,0.0061,10.6927 +Small,4x4,ldr-rgb-06.png,34.9665,0.0100,0.0055,11.9746 +Small,4x4,ldr-rgb-07.png,37.3645,0.0103,0.0058,11.3091 +Small,4x4,ldr-rgb-08.png,42.9454,0.0067,0.0025,26.2238 +Small,4x4,ldr-rgb-09.png,41.7396,0.0075,0.0031,21.3464 +Small,4x4,ldr-rgb-10.png,43.9436,0.0035,0.0010,15.5989 +Small,4x4,ldr-rgba-00.png,34.7343,0.0106,0.0059,11.1666 +Small,4x4,ldr-rgba-01.png,38.6694,0.0090,0.0044,14.9659 +Small,4x4,ldr-rgba-02.png,34.5634,0.0108,0.0060,10.8880 +Small,4x4,ldr-xy-00.png,37.5260,0.0096,0.0032,20.5639 +Small,4x4,ldr-xy-01.png,43.9781,0.0102,0.0036,18.2911 +Small,4x4,ldr-xy-02.png,48.2748,0.0091,0.0026,25.1581 +Small,4x4,ldrs-rgba-00.png,34.7385,0.0106,0.0060,10.9960 +Small,4x4,ldrs-rgba-01.png,38.6861,0.0093,0.0045,14.5631 +Small,4x4,ldrs-rgba-02.png,34.5669,0.0109,0.0061,10.6927 +Small,5x5,hdr-rgb-00.hdr,28.8745,0.0921,0.0074,8.8805 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5791 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5820 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0027,0.0004,0.5795 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5820 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0027,0.0004,0.6171 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5845 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0027,0.0004,0.5820 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5887 +Small,5x5,ldr-rgb-00.png,33.7228,0.0094,0.0044,14.8945 +Small,5x5,ldr-rgb-01.png,36.0754,0.0084,0.0036,18.1545 +Small,5x5,ldr-rgb-02.png,30.9932,0.0105,0.0056,11.7299 +Small,5x5,ldr-rgb-03.png,42.3634,0.0061,0.0016,39.9126 +Small,5x5,ldr-rgb-04.png,37.0411,0.0081,0.0032,20.3719 +Small,5x5,ldr-rgb-05.png,32.9651,0.0112,0.0064,10.3190 +Small,5x5,ldr-rgb-06.png,31.0371,0.0105,0.0056,11.7701 +Small,5x5,ldr-rgb-07.png,34.4079,0.0102,0.0054,12.1902 +Small,5x5,ldr-rgb-08.png,39.5746,0.0069,0.0022,29.3109 +Small,5x5,ldr-rgb-09.png,37.0834,0.0080,0.0031,20.8115 +Small,5x5,ldr-rgb-10.png,39.9180,0.0038,0.0010,16.0960 +Small,5x5,ldr-rgba-00.png,31.1153,0.0109,0.0059,11.0535 +Small,5x5,ldr-rgba-01.png,35.0411,0.0092,0.0042,15.7388 +Small,5x5,ldr-rgba-02.png,31.0383,0.0112,0.0061,10.8003 +Small,5x5,ldr-xy-00.png,36.5692,0.0099,0.0026,24.8623 +Small,5x5,ldr-xy-01.png,39.2568,0.0103,0.0031,20.8715 +Small,5x5,ldr-xy-02.png,43.8559,0.0096,0.0024,27.2049 +Small,5x5,ldrs-rgba-00.png,31.1160,0.0110,0.0060,10.8992 +Small,5x5,ldrs-rgba-01.png,35.0497,0.0093,0.0043,15.3161 +Small,5x5,ldrs-rgba-02.png,31.0387,0.0112,0.0061,10.7278 +Small,6x6,hdr-rgb-00.hdr,26.7600,0.0914,0.0067,9.7264 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0026,0.0005,0.5675 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5807 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5804 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5913 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5858 +Small,6x6,ldr-rgb-00.png,31.3436,0.0099,0.0049,13.4592 +Small,6x6,ldr-rgb-01.png,32.8352,0.0088,0.0040,16.4381 +Small,6x6,ldr-rgb-02.png,27.3910,0.0108,0.0060,10.8669 +Small,6x6,ldr-rgb-03.png,40.3557,0.0060,0.0016,42.1463 +Small,6x6,ldr-rgb-04.png,33.7632,0.0084,0.0036,18.2643 +Small,6x6,ldr-rgb-05.png,29.7440,0.0116,0.0068,9.6846 +Small,6x6,ldr-rgb-06.png,27.4701,0.0109,0.0060,10.8378 +Small,6x6,ldr-rgb-07.png,32.3394,0.0097,0.0050,13.1887 +Small,6x6,ldr-rgb-08.png,37.4420,0.0067,0.0022,30.2429 +Small,6x6,ldr-rgb-09.png,33.3139,0.0083,0.0035,18.8492 +Small,6x6,ldr-rgb-10.png,36.5787,0.0038,0.0011,15.2227 +Small,6x6,ldr-rgba-00.png,28.8478,0.0111,0.0061,10.6600 +Small,6x6,ldr-rgba-01.png,31.9937,0.0096,0.0046,14.1792 +Small,6x6,ldr-rgba-02.png,27.7812,0.0113,0.0062,10.6098 +Small,6x6,ldr-xy-00.png,35.6139,0.0097,0.0027,24.4271 +Small,6x6,ldr-xy-01.png,36.5248,0.0104,0.0034,19.5337 +Small,6x6,ldr-xy-02.png,41.7978,0.0093,0.0022,29.5187 +Small,6x6,ldrs-rgba-00.png,28.8438,0.0112,0.0062,10.5959 +Small,6x6,ldrs-rgba-01.png,31.9996,0.0096,0.0045,14.4384 +Small,6x6,ldrs-rgba-02.png,27.7798,0.0114,0.0062,10.5345 +Small,8x8,hdr-rgb-00.hdr,23.6156,0.0953,0.0098,6.6913 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5807 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5651 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5690 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0005,0.5675 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5807 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5939 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5832 +Small,8x8,ldr-rgb-00.png,27.7154,0.0125,0.0067,9.7888 +Small,8x8,ldr-rgb-01.png,28.6823,0.0113,0.0057,11.5870 +Small,8x8,ldr-rgb-02.png,23.0282,0.0141,0.0084,7.8093 +Small,8x8,ldr-rgb-03.png,37.0615,0.0071,0.0018,36.0259 +Small,8x8,ldr-rgb-04.png,29.1235,0.0110,0.0053,12.3491 +Small,8x8,ldr-rgb-05.png,25.6005,0.0152,0.0096,6.8259 +Small,8x8,ldr-rgb-06.png,23.0809,0.0143,0.0086,7.6266 +Small,8x8,ldr-rgb-07.png,29.4687,0.0111,0.0055,11.8743 +Small,8x8,ldr-rgb-08.png,33.9575,0.0079,0.0025,26.0375 +Small,8x8,ldr-rgb-09.png,28.4481,0.0105,0.0050,13.2369 +Small,8x8,ldr-rgb-10.png,31.9049,0.0049,0.0013,12.3340 +Small,8x8,ldr-rgba-00.png,25.3472,0.0149,0.0089,7.3536 +Small,8x8,ldr-rgba-01.png,28.1822,0.0126,0.0065,10.1121 +Small,8x8,ldr-rgba-02.png,23.8729,0.0146,0.0087,7.5659 +Small,8x8,ldr-xy-00.png,33.2129,0.0118,0.0035,18.6712 +Small,8x8,ldr-xy-01.png,34.1355,0.0123,0.0041,16.1266 +Small,8x8,ldr-xy-02.png,39.7699,0.0100,0.0016,39.7682 +Small,8x8,ldrs-rgba-00.png,25.3477,0.0148,0.0090,7.3176 +Small,8x8,ldrs-rgba-01.png,28.1833,0.0122,0.0064,10.2835 +Small,8x8,ldrs-rgba-02.png,23.8723,0.0153,0.0092,7.1389 +Small,12x12,hdr-rgb-00.hdr,20.4504,0.1015,0.0142,4.6080 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0049,0.0004,0.5845 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0049,0.0005,0.5601 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0050,0.0005,0.5470 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5754 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0004,0.5727 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5845 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5842 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0004,0.5829 +Small,12x12,ldr-rgb-00.png,23.7157,0.0133,0.0061,10.7669 +Small,12x12,ldr-rgb-01.png,24.7251,0.0115,0.0044,14.7530 +Small,12x12,ldr-rgb-02.png,19.1954,0.0166,0.0094,6.9800 +Small,12x12,ldr-rgb-03.png,33.1615,0.0082,0.0014,48.1145 +Small,12x12,ldr-rgb-04.png,24.3846,0.0115,0.0044,14.9691 +Small,12x12,ldr-rgb-05.png,21.3862,0.0157,0.0086,7.6366 +Small,12x12,ldr-rgb-06.png,19.1691,0.0173,0.0100,6.5852 +Small,12x12,ldr-rgb-07.png,25.3196,0.0113,0.0042,15.7541 +Small,12x12,ldr-rgb-08.png,30.1240,0.0090,0.0021,31.4290 +Small,12x12,ldr-rgb-09.png,23.5957,0.0126,0.0055,11.9616 +Small,12x12,ldr-rgb-10.png,27.2837,0.0065,0.0016,10.4542 +Small,12x12,ldr-rgba-00.png,21.3587,0.0168,0.0094,6.9586 +Small,12x12,ldr-rgba-01.png,24.4758,0.0127,0.0053,12.2845 +Small,12x12,ldr-rgba-02.png,20.1402,0.0187,0.0112,5.8265 +Small,12x12,ldr-xy-00.png,28.8913,0.0142,0.0035,18.7668 +Small,12x12,ldr-xy-01.png,29.6644,0.0137,0.0031,20.9239 +Small,12x12,ldr-xy-02.png,37.9766,0.0114,0.0010,66.7990 +Small,12x12,ldrs-rgba-00.png,21.3601,0.0169,0.0095,6.8940 +Small,12x12,ldrs-rgba-01.png,24.4766,0.0127,0.0053,12.3164 +Small,12x12,ldrs-rgba-02.png,20.1395,0.0188,0.0113,5.8049 +Small,3x3x3,ldr-l-00-3.dds,50.6895,0.0141,0.0073,35.9600 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0064,0.0031,22.1192 +Small,6x6x6,ldr-l-00-3.dds,32.5118,0.0457,0.0346,7.5701 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0210,0.0133,5.1665 diff --git a/Test/Images/Small/astc_reference-4.4-avx2_medium_results.csv b/Test/Images/Small/astc_reference-4.4-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..caa358d00ea81e12a91d96c95e7ce8299debad7a --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-avx2_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1462,0.1031,0.0180,3.6387 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0035,0.0004,0.5739 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5675 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5663 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5820 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5842 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5730 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5313 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5518 +Small,4x4,ldr-rgb-00.png,38.8432,0.0259,0.0199,3.3006 +Small,4x4,ldr-rgb-01.png,40.2258,0.0225,0.0167,3.9128 +Small,4x4,ldr-rgb-02.png,35.2933,0.0229,0.0172,3.8213 +Small,4x4,ldr-rgb-03.png,47.2820,0.0149,0.0095,6.8878 +Small,4x4,ldr-rgb-04.png,42.2203,0.0189,0.0131,5.0009 +Small,4x4,ldr-rgb-05.png,37.8177,0.0245,0.0188,3.4869 +Small,4x4,ldr-rgb-06.png,35.4758,0.0208,0.0150,4.3831 +Small,4x4,ldr-rgb-07.png,39.2847,0.0297,0.0239,2.7367 +Small,4x4,ldr-rgb-08.png,45.1880,0.0173,0.0118,5.5469 +Small,4x4,ldr-rgb-09.png,42.1624,0.0191,0.0135,4.8621 +Small,4x4,ldr-rgb-10.png,44.9412,0.0059,0.0022,7.3252 +Small,4x4,ldr-rgba-00.png,36.2597,0.0279,0.0218,3.0035 +Small,4x4,ldr-rgba-01.png,38.9707,0.0187,0.0126,5.1951 +Small,4x4,ldr-rgba-02.png,34.9421,0.0200,0.0139,4.7223 +Small,4x4,ldr-xy-00.png,37.7304,0.0182,0.0109,6.0313 +Small,4x4,ldr-xy-01.png,45.3643,0.0240,0.0168,3.9079 +Small,4x4,ldr-xy-02.png,51.1886,0.0269,0.0195,3.3613 +Small,4x4,ldrs-rgba-00.png,36.2659,0.0280,0.0220,2.9747 +Small,4x4,ldrs-rgba-01.png,38.9909,0.0187,0.0127,5.1632 +Small,4x4,ldrs-rgba-02.png,34.9450,0.0201,0.0140,4.6824 +Small,5x5,hdr-rgb-00.hdr,29.9063,0.1054,0.0196,3.3505 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0047,0.0006,0.4444 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0005,0.5212 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0047,0.0005,0.5639 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0047,0.0005,0.5225 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0047,0.0004,0.5884 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0046,0.0005,0.5589 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0047,0.0005,0.5245 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0046,0.0004,0.5702 +Small,5x5,ldr-rgb-00.png,35.1487,0.0268,0.0199,3.2964 +Small,5x5,ldr-rgb-01.png,36.4456,0.0207,0.0141,4.6645 +Small,5x5,ldr-rgb-02.png,31.1355,0.0212,0.0143,4.5942 +Small,5x5,ldr-rgb-03.png,44.0259,0.0125,0.0060,11.0110 +Small,5x5,ldr-rgb-04.png,37.6738,0.0196,0.0129,5.0713 +Small,5x5,ldr-rgb-05.png,33.5459,0.0278,0.0210,3.1254 +Small,5x5,ldr-rgb-06.png,31.1791,0.0207,0.0137,4.7878 +Small,5x5,ldr-rgb-07.png,36.1557,0.0315,0.0246,2.6590 +Small,5x5,ldr-rgb-08.png,41.6368,0.0167,0.0101,6.4862 +Small,5x5,ldr-rgb-09.png,37.5922,0.0190,0.0121,5.4103 +Small,5x5,ldr-rgb-10.png,40.5794,0.0071,0.0024,6.8885 +Small,5x5,ldr-rgba-00.png,32.8173,0.0312,0.0242,2.7093 +Small,5x5,ldr-rgba-01.png,35.3162,0.0202,0.0132,4.9834 +Small,5x5,ldr-rgba-02.png,31.1464,0.0219,0.0148,4.4359 +Small,5x5,ldr-xy-00.png,37.0404,0.0188,0.0104,6.2732 +Small,5x5,ldr-xy-01.png,40.7159,0.0233,0.0150,4.3772 +Small,5x5,ldr-xy-02.png,49.1543,0.0198,0.0112,5.8566 +Small,5x5,ldrs-rgba-00.png,32.8214,0.0316,0.0245,2.6714 +Small,5x5,ldrs-rgba-01.png,35.3251,0.0203,0.0132,4.9751 +Small,5x5,ldrs-rgba-02.png,31.1476,0.0219,0.0147,4.4567 +Small,6x6,hdr-rgb-00.hdr,27.5227,0.1062,0.0199,3.2890 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0045,0.0005,0.5041 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0044,0.0005,0.5331 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0005,0.5518 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0043,0.0004,0.5776 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0044,0.0005,0.5426 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0005,0.5010 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0005,0.5279 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0005,0.5162 +Small,6x6,ldr-rgb-00.png,32.4046,0.0275,0.0208,3.1544 +Small,6x6,ldr-rgb-01.png,33.0877,0.0203,0.0138,4.7535 +Small,6x6,ldr-rgb-02.png,27.5101,0.0211,0.0145,4.5076 +Small,6x6,ldr-rgb-03.png,41.7485,0.0109,0.0047,13.9823 +Small,6x6,ldr-rgb-04.png,34.2066,0.0182,0.0118,5.5454 +Small,6x6,ldr-rgb-05.png,30.1436,0.0277,0.0211,3.1051 +Small,6x6,ldr-rgb-06.png,27.5774,0.0207,0.0140,4.6684 +Small,6x6,ldr-rgb-07.png,33.8833,0.0293,0.0228,2.8750 +Small,6x6,ldr-rgb-08.png,39.2140,0.0139,0.0077,8.5220 +Small,6x6,ldr-rgb-09.png,33.6689,0.0181,0.0116,5.6316 +Small,6x6,ldr-rgb-10.png,36.9896,0.0069,0.0024,6.7401 +Small,6x6,ldr-rgba-00.png,30.2544,0.0333,0.0265,2.4739 +Small,6x6,ldr-rgba-01.png,32.2005,0.0202,0.0134,4.8751 +Small,6x6,ldr-rgba-02.png,27.8556,0.0226,0.0158,4.1602 +Small,6x6,ldr-xy-00.png,36.1662,0.0174,0.0092,7.1142 +Small,6x6,ldr-xy-01.png,38.0135,0.0192,0.0112,5.8415 +Small,6x6,ldr-xy-02.png,46.1312,0.0163,0.0082,7.9913 +Small,6x6,ldrs-rgba-00.png,30.2495,0.0333,0.0267,2.4572 +Small,6x6,ldrs-rgba-01.png,32.2065,0.0203,0.0135,4.8654 +Small,6x6,ldrs-rgba-02.png,27.8520,0.0226,0.0158,4.1410 +Small,8x8,hdr-rgb-00.hdr,24.1390,0.1120,0.0251,2.6143 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0051,0.0005,0.5412 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0051,0.0005,0.5256 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0051,0.0005,0.4664 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0051,0.0005,0.5379 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0052,0.0005,0.5039 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0050,0.0005,0.5401 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0050,0.0005,0.5279 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0050,0.0005,0.5625 +Small,8x8,ldr-rgb-00.png,28.7594,0.0343,0.0270,2.4291 +Small,8x8,ldr-rgb-01.png,28.9369,0.0246,0.0173,3.7797 +Small,8x8,ldr-rgb-02.png,23.1670,0.0259,0.0187,3.5016 +Small,8x8,ldr-rgb-03.png,38.5914,0.0125,0.0055,11.9590 +Small,8x8,ldr-rgb-04.png,29.6483,0.0240,0.0168,3.9002 +Small,8x8,ldr-rgb-05.png,25.9418,0.0329,0.0255,2.5703 +Small,8x8,ldr-rgb-06.png,23.2010,0.0264,0.0191,3.4314 +Small,8x8,ldr-rgb-07.png,30.7551,0.0339,0.0268,2.4483 +Small,8x8,ldr-rgb-08.png,35.9297,0.0163,0.0093,7.0325 +Small,8x8,ldr-rgb-09.png,28.9847,0.0224,0.0153,4.2840 +Small,8x8,ldr-rgb-10.png,32.1811,0.0083,0.0032,5.1054 +Small,8x8,ldr-rgba-00.png,26.4734,0.0399,0.0323,2.0270 +Small,8x8,ldr-rgba-01.png,28.3748,0.0246,0.0173,3.7957 +Small,8x8,ldr-rgba-02.png,23.9432,0.0281,0.0206,3.1777 +Small,8x8,ldr-xy-00.png,33.9578,0.0223,0.0122,5.3644 +Small,8x8,ldr-xy-01.png,34.9740,0.0224,0.0123,5.3295 +Small,8x8,ldr-xy-02.png,41.6833,0.0183,0.0082,7.9456 +Small,8x8,ldrs-rgba-00.png,26.4748,0.0402,0.0326,2.0088 +Small,8x8,ldrs-rgba-01.png,28.3782,0.0248,0.0172,3.8032 +Small,8x8,ldrs-rgba-02.png,23.9434,0.0281,0.0206,3.1882 +Small,12x12,hdr-rgb-00.hdr,20.7679,0.1268,0.0365,1.7935 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0080,0.0006,0.4377 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0079,0.0005,0.5369 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0078,0.0005,0.5434 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0079,0.0005,0.5437 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0080,0.0004,0.5739 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0078,0.0005,0.5423 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0078,0.0005,0.5589 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0079,0.0005,0.5601 +Small,12x12,ldr-rgb-00.png,24.6928,0.0433,0.0328,1.9981 +Small,12x12,ldr-rgb-01.png,25.0361,0.0328,0.0226,2.9011 +Small,12x12,ldr-rgb-02.png,19.2723,0.0378,0.0277,2.3695 +Small,12x12,ldr-rgb-03.png,34.9910,0.0159,0.0060,10.8613 +Small,12x12,ldr-rgb-04.png,24.8973,0.0315,0.0212,3.0893 +Small,12x12,ldr-rgb-05.png,21.6527,0.0434,0.0332,1.9765 +Small,12x12,ldr-rgb-06.png,19.2558,0.0384,0.0281,2.3288 +Small,12x12,ldr-rgb-07.png,26.7423,0.0396,0.0295,2.2207 +Small,12x12,ldr-rgb-08.png,31.6843,0.0198,0.0101,6.5049 +Small,12x12,ldr-rgb-09.png,24.1545,0.0304,0.0204,3.2148 +Small,12x12,ldr-rgb-10.png,28.0447,0.0146,0.0066,2.4758 +Small,12x12,ldr-rgba-00.png,22.2585,0.0477,0.0373,1.7560 +Small,12x12,ldr-rgba-01.png,24.6414,0.0319,0.0215,3.0459 +Small,12x12,ldr-rgba-02.png,20.1882,0.0406,0.0302,2.1730 +Small,12x12,ldr-xy-00.png,30.2558,0.0286,0.0148,4.4332 +Small,12x12,ldr-xy-01.png,31.8636,0.0293,0.0155,4.2170 +Small,12x12,ldr-xy-02.png,38.5089,0.0173,0.0034,19.2249 +Small,12x12,ldrs-rgba-00.png,22.2585,0.0488,0.0381,1.7202 +Small,12x12,ldrs-rgba-01.png,24.6434,0.0321,0.0216,3.0316 +Small,12x12,ldrs-rgba-02.png,20.1890,0.0414,0.0308,2.1267 +Small,3x3x3,ldr-l-00-3.dds,51.8899,0.0193,0.0108,24.2905 +Small,3x3x3,ldr-l-01-3.dds,54.6239,0.0085,0.0034,20.3003 +Small,6x6x6,ldr-l-00-3.dds,32.9631,0.0561,0.0424,6.1879 +Small,6x6x6,ldr-l-01-3.dds,41.0369,0.0234,0.0133,5.1801 diff --git a/Test/Images/Small/astc_reference-4.4-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-4.4-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..c2690c856674871feee4555ff485f11b8c5df5b2 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-avx2_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.4205,0.1192,0.0351,1.8669 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0038,0.0006,0.4288 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0037,0.0005,0.5079 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0037,0.0005,0.5355 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5289 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0037,0.0005,0.5578 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0037,0.0005,0.4971 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0037,0.0005,0.5321 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0038,0.0005,0.4905 +Small,4x4,ldr-rgb-00.png,39.1635,0.0457,0.0397,1.6495 +Small,4x4,ldr-rgb-01.png,40.4120,0.0437,0.0380,1.7265 +Small,4x4,ldr-rgb-02.png,35.4711,0.0412,0.0354,1.8527 +Small,4x4,ldr-rgb-03.png,47.7527,0.0408,0.0353,1.8591 +Small,4x4,ldr-rgb-04.png,42.3660,0.0373,0.0316,2.0750 +Small,4x4,ldr-rgb-05.png,37.9925,0.0450,0.0391,1.6774 +Small,4x4,ldr-rgb-06.png,35.6403,0.0369,0.0310,2.1138 +Small,4x4,ldr-rgb-07.png,39.8791,0.0544,0.0486,1.3495 +Small,4x4,ldr-rgb-08.png,45.8775,0.0400,0.0344,1.9025 +Small,4x4,ldr-rgb-09.png,42.2993,0.0401,0.0344,1.9052 +Small,4x4,ldr-rgb-10.png,45.1694,0.0083,0.0046,3.5455 +Small,4x4,ldr-rgba-00.png,36.7416,0.0482,0.0421,1.5556 +Small,4x4,ldr-rgba-01.png,39.1154,0.0352,0.0291,2.2555 +Small,4x4,ldr-rgba-02.png,35.0328,0.0348,0.0286,2.2920 +Small,4x4,ldr-xy-00.png,37.7724,0.0430,0.0356,1.8392 +Small,4x4,ldr-xy-01.png,45.4608,0.0474,0.0403,1.6263 +Small,4x4,ldr-xy-02.png,51.1938,0.0613,0.0539,1.2155 +Small,4x4,ldrs-rgba-00.png,36.7495,0.0483,0.0423,1.5497 +Small,4x4,ldrs-rgba-01.png,39.1372,0.0352,0.0292,2.2468 +Small,4x4,ldrs-rgba-02.png,35.0344,0.0349,0.0286,2.2893 +Small,5x5,hdr-rgb-00.hdr,30.3005,0.1237,0.0376,1.7453 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0046,0.0005,0.5434 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0005,0.5639 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0046,0.0005,0.5651 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0048,0.0005,0.5020 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0047,0.0005,0.5390 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0047,0.0004,0.5751 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0047,0.0005,0.5628 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0047,0.0005,0.5663 +Small,5x5,ldr-rgb-00.png,35.3880,0.0526,0.0453,1.4452 +Small,5x5,ldr-rgb-01.png,36.5413,0.0453,0.0383,1.7111 +Small,5x5,ldr-rgb-02.png,31.1967,0.0395,0.0327,2.0044 +Small,5x5,ldr-rgb-03.png,44.5932,0.0447,0.0381,1.7195 +Small,5x5,ldr-rgb-04.png,37.8267,0.0410,0.0342,1.9153 +Small,5x5,ldr-rgb-05.png,33.6963,0.0514,0.0445,1.4717 +Small,5x5,ldr-rgb-06.png,31.2331,0.0373,0.0304,2.1563 +Small,5x5,ldr-rgb-07.png,36.7232,0.0612,0.0544,1.2039 +Small,5x5,ldr-rgb-08.png,42.3949,0.0435,0.0370,1.7717 +Small,5x5,ldr-rgb-09.png,37.7126,0.0450,0.0382,1.7156 +Small,5x5,ldr-rgb-10.png,40.7580,0.0100,0.0052,3.0970 +Small,5x5,ldr-rgba-00.png,33.1240,0.0557,0.0485,1.3499 +Small,5x5,ldr-rgba-01.png,35.4134,0.0393,0.0321,2.0417 +Small,5x5,ldr-rgba-02.png,31.1844,0.0380,0.0308,2.1267 +Small,5x5,ldr-xy-00.png,37.1442,0.0471,0.0386,1.6976 +Small,5x5,ldr-xy-01.png,41.4542,0.0559,0.0475,1.3794 +Small,5x5,ldr-xy-02.png,49.3313,0.0676,0.0587,1.1164 +Small,5x5,ldrs-rgba-00.png,33.1272,0.0571,0.0499,1.3127 +Small,5x5,ldrs-rgba-01.png,35.4217,0.0397,0.0325,2.0142 +Small,5x5,ldrs-rgba-02.png,31.1853,0.0383,0.0310,2.1137 +Small,6x6,hdr-rgb-00.hdr,27.7238,0.1269,0.0396,1.6540 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0045,0.0004,0.5804 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0045,0.0005,0.5398 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0004,0.5779 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0044,0.0005,0.5578 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0044,0.0005,0.5687 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5504 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0005,0.5470 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0004,0.5804 +Small,6x6,ldr-rgb-00.png,32.6509,0.0542,0.0473,1.3846 +Small,6x6,ldr-rgb-01.png,33.1881,0.0468,0.0402,1.6320 +Small,6x6,ldr-rgb-02.png,27.5552,0.0404,0.0337,1.9425 +Small,6x6,ldr-rgb-03.png,42.5885,0.0374,0.0311,2.1069 +Small,6x6,ldr-rgb-04.png,34.3416,0.0409,0.0343,1.9111 +Small,6x6,ldr-rgb-05.png,30.2875,0.0522,0.0456,1.4375 +Small,6x6,ldr-rgb-06.png,27.6306,0.0392,0.0324,2.0205 +Small,6x6,ldr-rgb-07.png,34.4380,0.0636,0.0570,1.1491 +Small,6x6,ldr-rgb-08.png,40.0373,0.0378,0.0314,2.0891 +Small,6x6,ldr-rgb-09.png,33.8118,0.0447,0.0374,1.7511 +Small,6x6,ldr-rgb-10.png,37.1861,0.0108,0.0062,2.6262 +Small,6x6,ldr-rgba-00.png,30.5164,0.0598,0.0530,1.2366 +Small,6x6,ldr-rgba-01.png,32.2794,0.0424,0.0356,1.8417 +Small,6x6,ldr-rgba-02.png,27.8936,0.0399,0.0329,1.9905 +Small,6x6,ldr-xy-00.png,36.2540,0.0393,0.0311,2.1092 +Small,6x6,ldr-xy-01.png,38.0244,0.0543,0.0459,1.4266 +Small,6x6,ldr-xy-02.png,47.5902,0.0668,0.0585,1.1196 +Small,6x6,ldrs-rgba-00.png,30.5127,0.0600,0.0530,1.2366 +Small,6x6,ldrs-rgba-01.png,32.2857,0.0431,0.0363,1.8059 +Small,6x6,ldrs-rgba-02.png,27.8909,0.0402,0.0331,1.9784 +Small,8x8,hdr-rgb-00.hdr,24.3460,0.1394,0.0513,1.2773 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0067,0.0005,0.4681 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0065,0.0005,0.5276 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0064,0.0005,0.5401 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0064,0.0005,0.5345 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0065,0.0005,0.5048 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0064,0.0005,0.5160 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0064,0.0005,0.5289 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0064,0.0005,0.5543 +Small,8x8,ldr-rgb-00.png,28.9780,0.0694,0.0607,1.0803 +Small,8x8,ldr-rgb-01.png,29.0210,0.0578,0.0492,1.3330 +Small,8x8,ldr-rgb-02.png,23.2052,0.0531,0.0445,1.4726 +Small,8x8,ldr-rgb-03.png,39.4314,0.0274,0.0192,3.4157 +Small,8x8,ldr-rgb-04.png,29.7779,0.0514,0.0426,1.5389 +Small,8x8,ldr-rgb-05.png,26.0426,0.0629,0.0542,1.2101 +Small,8x8,ldr-rgb-06.png,23.2530,0.0525,0.0436,1.5030 +Small,8x8,ldr-rgb-07.png,31.2138,0.0751,0.0665,0.9851 +Small,8x8,ldr-rgb-08.png,36.5612,0.0393,0.0308,2.1250 +Small,8x8,ldr-rgb-09.png,29.1484,0.0452,0.0367,1.7861 +Small,8x8,ldr-rgb-10.png,32.3330,0.0142,0.0076,2.1440 +Small,8x8,ldr-rgba-00.png,26.7531,0.0758,0.0671,0.9773 +Small,8x8,ldr-rgba-01.png,28.4341,0.0549,0.0460,1.4237 +Small,8x8,ldr-rgba-02.png,23.9687,0.0516,0.0425,1.5421 +Small,8x8,ldr-xy-00.png,34.2380,0.0469,0.0366,1.7924 +Small,8x8,ldr-xy-01.png,35.3165,0.0482,0.0378,1.7317 +Small,8x8,ldr-xy-02.png,44.6234,0.0592,0.0489,1.3398 +Small,8x8,ldrs-rgba-00.png,26.7540,0.0766,0.0675,0.9706 +Small,8x8,ldrs-rgba-01.png,28.4376,0.0556,0.0467,1.4036 +Small,8x8,ldrs-rgba-02.png,23.9689,0.0516,0.0427,1.5345 +Small,12x12,hdr-rgb-00.hdr,21.0311,0.1696,0.0768,0.8539 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0103,0.0004,0.5727 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0103,0.0005,0.5651 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0103,0.0004,0.5727 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0103,0.0005,0.5552 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0103,0.0005,0.5543 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0104,0.0005,0.5555 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0103,0.0004,0.5779 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0104,0.0005,0.5279 +Small,12x12,ldr-rgb-00.png,25.0530,0.0938,0.0807,0.8121 +Small,12x12,ldr-rgb-01.png,25.1392,0.0763,0.0636,1.0300 +Small,12x12,ldr-rgb-02.png,19.2921,0.0845,0.0718,0.9134 +Small,12x12,ldr-rgb-03.png,36.1864,0.0330,0.0204,3.2061 +Small,12x12,ldr-rgb-04.png,24.9919,0.0693,0.0564,1.1613 +Small,12x12,ldr-rgb-05.png,21.7388,0.0847,0.0719,0.9116 +Small,12x12,ldr-rgb-06.png,19.2959,0.0821,0.0691,0.9478 +Small,12x12,ldr-rgb-07.png,27.1136,0.0949,0.0821,0.7985 +Small,12x12,ldr-rgb-08.png,32.5295,0.0415,0.0290,2.2608 +Small,12x12,ldr-rgb-09.png,24.3026,0.0650,0.0524,1.2513 +Small,12x12,ldr-rgb-10.png,28.1806,0.0239,0.0134,1.2165 +Small,12x12,ldr-rgba-00.png,22.7565,0.0985,0.0854,0.7670 +Small,12x12,ldr-rgba-01.png,24.7322,0.0790,0.0657,0.9968 +Small,12x12,ldr-rgba-02.png,20.2051,0.0818,0.0688,0.9528 +Small,12x12,ldr-xy-00.png,30.5347,0.0630,0.0486,1.3478 +Small,12x12,ldr-xy-01.png,32.2811,0.0507,0.0364,1.8018 +Small,12x12,ldr-xy-02.png,40.3051,0.0373,0.0229,2.8561 +Small,12x12,ldrs-rgba-00.png,22.7551,0.0996,0.0866,0.7571 +Small,12x12,ldrs-rgba-01.png,24.7337,0.0789,0.0659,0.9944 +Small,12x12,ldrs-rgba-02.png,20.2055,0.0819,0.0687,0.9543 +Small,3x3x3,ldr-l-00-3.dds,52.3291,0.0325,0.0240,10.9041 +Small,3x3x3,ldr-l-01-3.dds,55.2576,0.0146,0.0095,7.2634 +Small,6x6x6,ldr-l-00-3.dds,33.2763,0.0772,0.0611,4.2895 +Small,6x6x6,ldr-l-01-3.dds,41.7183,0.0265,0.0140,4.9345 diff --git a/Test/Images/Small/astc_reference-4.4-sse2_fast_results.csv b/Test/Images/Small/astc_reference-4.4-sse2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..59cbf553fe9faee336cf313b88aa935ca6073870 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse2_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7281,0.1036,0.0151,4.3341 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0029,0.0005,0.5448 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0028,0.0004,0.5767 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0005,0.5666 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0028,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0028,0.0004,0.5767 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0028,0.0004,0.5874 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0029,0.0005,0.5529 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0028,0.0004,0.5779 +Small,4x4,ldr-rgb-00.png,38.2512,0.0156,0.0102,6.4294 +Small,4x4,ldr-rgb-01.png,39.9266,0.0136,0.0084,7.8028 +Small,4x4,ldr-rgb-02.png,35.1621,0.0188,0.0134,4.8918 +Small,4x4,ldr-rgb-03.png,46.0782,0.0080,0.0031,21.1542 +Small,4x4,ldr-rgb-04.png,41.9798,0.0111,0.0059,11.0892 +Small,4x4,ldr-rgb-05.png,37.3372,0.0184,0.0132,4.9544 +Small,4x4,ldr-rgb-06.png,35.3603,0.0175,0.0122,5.3767 +Small,4x4,ldr-rgb-07.png,38.1442,0.0190,0.0138,4.7580 +Small,4x4,ldr-rgb-08.png,43.8361,0.0099,0.0049,13.4185 +Small,4x4,ldr-rgb-09.png,41.9339,0.0111,0.0060,10.9413 +Small,4x4,ldr-rgb-10.png,44.4590,0.0044,0.0015,11.0884 +Small,4x4,ldr-rgba-00.png,35.6010,0.0189,0.0134,4.8780 +Small,4x4,ldr-rgba-01.png,38.8640,0.0134,0.0079,8.2620 +Small,4x4,ldr-rgba-02.png,34.8755,0.0167,0.0112,5.8508 +Small,4x4,ldr-xy-00.png,37.5551,0.0127,0.0055,11.9413 +Small,4x4,ldr-xy-01.png,44.3046,0.0140,0.0067,9.8094 +Small,4x4,ldr-xy-02.png,48.2608,0.0115,0.0041,15.8724 +Small,4x4,ldrs-rgba-00.png,35.6065,0.0190,0.0135,4.8621 +Small,4x4,ldrs-rgba-01.png,38.8848,0.0135,0.0079,8.2529 +Small,4x4,ldrs-rgba-02.png,34.8762,0.0168,0.0113,5.7976 +Small,5x5,hdr-rgb-00.hdr,29.5480,0.1057,0.0162,4.0492 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0035,0.0004,0.5767 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5887 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5690 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5791 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.6039 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.5926 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.6108 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5926 +Small,5x5,ldr-rgb-00.png,34.4321,0.0162,0.0102,6.4460 +Small,5x5,ldr-rgb-01.png,36.2469,0.0127,0.0068,9.6290 +Small,5x5,ldr-rgb-02.png,31.0931,0.0168,0.0109,6.0223 +Small,5x5,ldr-rgb-03.png,42.7531,0.0082,0.0025,25.7593 +Small,5x5,ldr-rgb-04.png,37.2747,0.0117,0.0059,11.0892 +Small,5x5,ldr-rgb-05.png,33.2744,0.0199,0.0139,4.7078 +Small,5x5,ldr-rgb-06.png,31.1326,0.0167,0.0107,6.1466 +Small,5x5,ldr-rgb-07.png,35.0664,0.0172,0.0113,5.8022 +Small,5x5,ldr-rgb-08.png,40.1866,0.0100,0.0043,15.3838 +Small,5x5,ldr-rgb-09.png,37.3026,0.0118,0.0060,10.9978 +Small,5x5,ldr-rgb-10.png,40.1964,0.0051,0.0014,11.5544 +Small,5x5,ldr-rgba-00.png,32.1470,0.0205,0.0143,4.5823 +Small,5x5,ldr-rgba-01.png,35.1987,0.0138,0.0077,8.5146 +Small,5x5,ldr-rgba-02.png,31.1340,0.0175,0.0112,5.8618 +Small,5x5,ldr-xy-00.png,36.7495,0.0128,0.0044,14.9969 +Small,5x5,ldr-xy-01.png,39.8321,0.0139,0.0057,11.5016 +Small,5x5,ldr-xy-02.png,43.9343,0.0124,0.0040,16.4243 +Small,5x5,ldrs-rgba-00.png,32.1514,0.0205,0.0145,4.5219 +Small,5x5,ldrs-rgba-01.png,35.2069,0.0139,0.0078,8.4192 +Small,5x5,ldrs-rgba-02.png,31.1349,0.0175,0.0112,5.8603 +Small,6x6,hdr-rgb-00.hdr,27.0790,0.1060,0.0165,3.9711 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0033,0.0004,0.5845 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0033,0.0004,0.5845 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5871 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0033,0.0004,0.5817 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5751 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0033,0.0004,0.5739 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0005,0.5578 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5639 +Small,6x6,ldr-rgb-00.png,31.7144,0.0185,0.0127,5.1660 +Small,6x6,ldr-rgb-01.png,32.9244,0.0140,0.0083,7.8893 +Small,6x6,ldr-rgb-02.png,27.4795,0.0182,0.0123,5.3389 +Small,6x6,ldr-rgb-03.png,40.5991,0.0082,0.0026,24.7682 +Small,6x6,ldr-rgb-04.png,33.9357,0.0128,0.0070,9.3078 +Small,6x6,ldr-rgb-05.png,29.9800,0.0226,0.0168,3.9040 +Small,6x6,ldr-rgb-06.png,27.5476,0.0182,0.0123,5.3269 +Small,6x6,ldr-rgb-07.png,32.9378,0.0170,0.0114,5.7721 +Small,6x6,ldr-rgb-08.png,37.8129,0.0097,0.0043,15.4054 +Small,6x6,ldr-rgb-09.png,33.4946,0.0130,0.0073,8.9873 +Small,6x6,ldr-rgb-10.png,36.6909,0.0053,0.0017,9.5668 +Small,6x6,ldr-rgba-00.png,29.6086,0.0231,0.0171,3.8381 +Small,6x6,ldr-rgba-01.png,32.0847,0.0151,0.0091,7.2239 +Small,6x6,ldr-rgba-02.png,27.8414,0.0190,0.0130,5.0560 +Small,6x6,ldr-xy-00.png,35.9075,0.0129,0.0048,13.6450 +Small,6x6,ldr-xy-01.png,37.1654,0.0151,0.0070,9.3198 +Small,6x6,ldr-xy-02.png,41.9299,0.0118,0.0039,16.9741 +Small,6x6,ldrs-rgba-00.png,29.6031,0.0231,0.0172,3.8138 +Small,6x6,ldrs-rgba-01.png,32.0904,0.0152,0.0092,7.1577 +Small,6x6,ldrs-rgba-02.png,27.8386,0.0192,0.0130,5.0227 +Small,8x8,hdr-rgb-00.hdr,23.7844,0.1092,0.0207,3.1642 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0036,0.0004,0.5767 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5702 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5742 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5675 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0004,0.5702 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0005,0.5663 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5952 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0005,0.5628 +Small,8x8,ldr-rgb-00.png,28.0659,0.0206,0.0142,4.6113 +Small,8x8,ldr-rgb-01.png,28.7734,0.0171,0.0112,5.8582 +Small,8x8,ldr-rgb-02.png,23.1042,0.0231,0.0171,3.8418 +Small,8x8,ldr-rgb-03.png,37.3496,0.0089,0.0030,21.6935 +Small,8x8,ldr-rgb-04.png,29.3469,0.0166,0.0105,6.2606 +Small,8x8,ldr-rgb-05.png,25.8034,0.0262,0.0201,3.2544 +Small,8x8,ldr-rgb-06.png,23.1655,0.0238,0.0176,3.7150 +Small,8x8,ldr-rgb-07.png,29.8427,0.0176,0.0115,5.6874 +Small,8x8,ldr-rgb-08.png,34.4844,0.0106,0.0048,13.5435 +Small,8x8,ldr-rgb-09.png,28.6410,0.0155,0.0096,6.8245 +Small,8x8,ldr-rgb-10.png,31.9947,0.0058,0.0020,7.9458 +Small,8x8,ldr-rgba-00.png,25.7010,0.0254,0.0193,3.4027 +Small,8x8,ldr-rgba-01.png,28.2814,0.0194,0.0131,4.9986 +Small,8x8,ldr-rgba-02.png,23.9350,0.0249,0.0186,3.5178 +Small,8x8,ldr-xy-00.png,33.3347,0.0151,0.0065,10.0902 +Small,8x8,ldr-xy-01.png,34.3877,0.0165,0.0078,8.3935 +Small,8x8,ldr-xy-02.png,39.8793,0.0112,0.0024,26.7938 +Small,8x8,ldrs-rgba-00.png,25.7001,0.0256,0.0194,3.3817 +Small,8x8,ldrs-rgba-01.png,28.2840,0.0194,0.0132,4.9810 +Small,8x8,ldrs-rgba-02.png,23.9352,0.0251,0.0187,3.4962 +Small,12x12,hdr-rgb-00.hdr,20.5374,0.1218,0.0297,2.2065 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0054,0.0004,0.5817 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0054,0.0004,0.5874 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0054,0.0004,0.5702 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0054,0.0004,0.5730 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0054,0.0004,0.5767 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0054,0.0005,0.5601 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0004,0.5845 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0055,0.0004,0.5804 +Small,12x12,ldr-rgb-00.png,23.7930,0.0204,0.0122,5.3651 +Small,12x12,ldr-rgb-01.png,24.7698,0.0170,0.0089,7.3603 +Small,12x12,ldr-rgb-02.png,19.2293,0.0274,0.0194,3.3719 +Small,12x12,ldr-rgb-03.png,33.2561,0.0098,0.0022,30.2996 +Small,12x12,ldr-rgb-04.png,24.5727,0.0164,0.0084,7.7586 +Small,12x12,ldr-rgb-05.png,21.4915,0.0251,0.0171,3.8256 +Small,12x12,ldr-rgb-06.png,19.2266,0.0285,0.0205,3.2037 +Small,12x12,ldr-rgb-07.png,25.3769,0.0162,0.0083,7.8854 +Small,12x12,ldr-rgb-08.png,30.2961,0.0113,0.0037,17.7421 +Small,12x12,ldr-rgb-09.png,23.7353,0.0186,0.0108,6.0732 +Small,12x12,ldr-rgb-10.png,27.3243,0.0084,0.0027,5.9590 +Small,12x12,ldr-rgba-00.png,21.6059,0.0274,0.0193,3.3918 +Small,12x12,ldr-rgba-01.png,24.5172,0.0188,0.0107,6.1416 +Small,12x12,ldr-rgba-02.png,20.1746,0.0316,0.0234,2.8015 +Small,12x12,ldr-xy-00.png,29.2247,0.0181,0.0066,9.9611 +Small,12x12,ldr-xy-01.png,30.5463,0.0172,0.0059,11.1894 +Small,12x12,ldr-xy-02.png,37.9988,0.0123,0.0012,53.0243 +Small,12x12,ldrs-rgba-00.png,21.6106,0.0277,0.0194,3.3703 +Small,12x12,ldrs-rgba-01.png,24.5187,0.0188,0.0107,6.1416 +Small,12x12,ldrs-rgba-02.png,20.1751,0.0318,0.0235,2.7832 +Small,3x3x3,ldr-l-00-3.dds,50.8347,0.0198,0.0117,22.4152 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0091,0.0048,14.2873 +Small,6x6x6,ldr-l-00-3.dds,32.5284,0.0679,0.0561,4.6718 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0293,0.0213,3.2405 diff --git a/Test/Images/Small/astc_reference-4.4-sse2_fastest_results.csv b/Test/Images/Small/astc_reference-4.4-sse2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..0d86909422820e5a8701139c23f9bc026bcbe213 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse2_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3455,0.0973,0.0092,7.1289 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0022,0.0004,0.6053 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0022,0.0004,0.5913 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.5820 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0022,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0023,0.0004,0.5742 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0022,0.0004,0.5829 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5871 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0023,0.0004,0.5751 +Small,4x4,ldr-rgb-00.png,37.2470,0.0106,0.0058,11.3483 +Small,4x4,ldr-rgb-01.png,39.5439,0.0099,0.0052,12.5498 +Small,4x4,ldr-rgb-02.png,34.7920,0.0120,0.0074,8.8779 +Small,4x4,ldr-rgb-03.png,45.4866,0.0066,0.0023,28.5321 +Small,4x4,ldr-rgb-04.png,41.7158,0.0085,0.0039,16.6764 +Small,4x4,ldr-rgb-05.png,36.8705,0.0125,0.0079,8.3402 +Small,4x4,ldr-rgb-06.png,34.9665,0.0116,0.0068,9.5686 +Small,4x4,ldr-rgb-07.png,37.3645,0.0120,0.0073,8.9516 +Small,4x4,ldr-rgb-08.png,42.9454,0.0076,0.0032,20.6349 +Small,4x4,ldr-rgb-09.png,41.7396,0.0086,0.0040,16.3676 +Small,4x4,ldr-rgb-10.png,43.9436,0.0036,0.0011,14.2106 +Small,4x4,ldr-rgba-00.png,34.7343,0.0123,0.0074,8.8382 +Small,4x4,ldr-rgba-01.png,38.6694,0.0103,0.0055,11.9502 +Small,4x4,ldr-rgba-02.png,34.5634,0.0127,0.0078,8.4215 +Small,4x4,ldr-xy-00.png,37.5260,0.0106,0.0039,16.9166 +Small,4x4,ldr-xy-01.png,43.9781,0.0113,0.0046,14.3629 +Small,4x4,ldr-xy-02.png,48.2748,0.0100,0.0031,20.8130 +Small,4x4,ldrs-rgba-00.png,34.7385,0.0125,0.0076,8.6404 +Small,4x4,ldrs-rgba-01.png,38.6861,0.0106,0.0057,11.5543 +Small,4x4,ldrs-rgba-02.png,34.5669,0.0130,0.0080,8.2383 +Small,5x5,hdr-rgb-00.hdr,28.8745,0.0988,0.0099,6.5920 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5858 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.6084 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5779 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5952 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5817 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5702 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5767 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5767 +Small,5x5,ldr-rgb-00.png,33.7228,0.0112,0.0059,11.1210 +Small,5x5,ldr-rgb-01.png,36.0754,0.0099,0.0049,13.3391 +Small,5x5,ldr-rgb-02.png,30.9932,0.0129,0.0078,8.4280 +Small,5x5,ldr-rgb-03.png,42.3634,0.0068,0.0021,31.3716 +Small,5x5,ldr-rgb-04.png,37.0411,0.0095,0.0045,14.5963 +Small,5x5,ldr-rgb-05.png,32.9651,0.0139,0.0088,7.4600 +Small,5x5,ldr-rgb-06.png,31.0371,0.0127,0.0076,8.5848 +Small,5x5,ldr-rgb-07.png,34.4079,0.0123,0.0072,9.0719 +Small,5x5,ldr-rgb-08.png,39.5746,0.0077,0.0029,22.7491 +Small,5x5,ldr-rgb-09.png,37.0834,0.0093,0.0043,15.1665 +Small,5x5,ldr-rgb-10.png,39.9180,0.0040,0.0011,14.6033 +Small,5x5,ldr-rgba-00.png,31.1153,0.0132,0.0080,8.2250 +Small,5x5,ldr-rgba-01.png,35.0411,0.0109,0.0057,11.5933 +Small,5x5,ldr-rgba-02.png,31.0383,0.0138,0.0084,7.8288 +Small,5x5,ldr-xy-00.png,36.5692,0.0109,0.0035,18.5340 +Small,5x5,ldr-xy-01.png,39.2568,0.0114,0.0041,16.0513 +Small,5x5,ldr-xy-02.png,43.8559,0.0107,0.0033,20.0964 +Small,5x5,ldrs-rgba-00.png,31.1160,0.0134,0.0081,8.1330 +Small,5x5,ldrs-rgba-01.png,35.0497,0.0109,0.0058,11.3558 +Small,5x5,ldrs-rgba-02.png,31.0387,0.0138,0.0084,7.7686 +Small,6x6,hdr-rgb-00.hdr,26.7600,0.0981,0.0096,6.8359 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0026,0.0004,0.5804 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5858 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5982 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5887 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5942 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5900 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5871 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.6228 +Small,6x6,ldr-rgb-00.png,31.3436,0.0123,0.0070,9.3065 +Small,6x6,ldr-rgb-01.png,32.8352,0.0109,0.0059,11.0950 +Small,6x6,ldr-rgb-02.png,27.3910,0.0137,0.0088,7.4736 +Small,6x6,ldr-rgb-03.png,40.3557,0.0068,0.0021,30.9582 +Small,6x6,ldr-rgb-04.png,33.7632,0.0103,0.0052,12.4882 +Small,6x6,ldr-rgb-05.png,29.7440,0.0150,0.0101,6.5191 +Small,6x6,ldr-rgb-06.png,27.4701,0.0139,0.0088,7.4616 +Small,6x6,ldr-rgb-07.png,32.3394,0.0122,0.0072,9.0668 +Small,6x6,ldr-rgb-08.png,37.4420,0.0077,0.0029,22.2699 +Small,6x6,ldr-rgb-09.png,33.3139,0.0101,0.0051,12.9208 +Small,6x6,ldr-rgb-10.png,36.5787,0.0041,0.0013,12.4285 +Small,6x6,ldr-rgba-00.png,28.8478,0.0140,0.0088,7.4491 +Small,6x6,ldr-rgba-01.png,31.9937,0.0119,0.0066,9.9446 +Small,6x6,ldr-rgba-02.png,27.7812,0.0140,0.0088,7.4736 +Small,6x6,ldr-xy-00.png,35.6139,0.0108,0.0037,17.9506 +Small,6x6,ldr-xy-01.png,36.5248,0.0120,0.0048,13.6789 +Small,6x6,ldr-xy-02.png,41.7978,0.0102,0.0030,21.8887 +Small,6x6,ldrs-rgba-00.png,28.8438,0.0140,0.0088,7.4295 +Small,6x6,ldrs-rgba-01.png,31.9996,0.0118,0.0065,10.0211 +Small,6x6,ldrs-rgba-02.png,27.7798,0.0141,0.0088,7.4456 +Small,8x8,hdr-rgb-00.hdr,23.6156,0.1041,0.0143,4.5980 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5926 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5982 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5926 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5767 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5739 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5832 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5820 +Small,8x8,ldr-rgb-00.png,27.7154,0.0158,0.0098,6.6820 +Small,8x8,ldr-rgb-01.png,28.6823,0.0140,0.0082,7.9767 +Small,8x8,ldr-rgb-02.png,23.0282,0.0182,0.0123,5.3083 +Small,8x8,ldr-rgb-03.png,37.0615,0.0079,0.0024,27.3076 +Small,8x8,ldr-rgb-04.png,29.1235,0.0137,0.0079,8.3390 +Small,8x8,ldr-rgb-05.png,25.6005,0.0202,0.0143,4.5804 +Small,8x8,ldr-rgb-06.png,23.0809,0.0188,0.0129,5.0795 +Small,8x8,ldr-rgb-07.png,29.4687,0.0140,0.0082,8.0069 +Small,8x8,ldr-rgb-08.png,33.9575,0.0091,0.0035,18.7617 +Small,8x8,ldr-rgb-09.png,28.4481,0.0132,0.0074,8.8995 +Small,8x8,ldr-rgb-10.png,31.9049,0.0052,0.0015,10.7020 +Small,8x8,ldr-rgba-00.png,25.3472,0.0191,0.0130,5.0401 +Small,8x8,ldr-rgba-01.png,28.1822,0.0155,0.0094,6.9949 +Small,8x8,ldr-rgba-02.png,23.8729,0.0190,0.0127,5.1449 +Small,8x8,ldr-xy-00.png,33.2129,0.0136,0.0050,13.0286 +Small,8x8,ldr-xy-01.png,34.1355,0.0144,0.0059,11.1039 +Small,8x8,ldr-xy-02.png,39.7699,0.0107,0.0020,31.9700 +Small,8x8,ldrs-rgba-00.png,25.3477,0.0192,0.0131,4.9928 +Small,8x8,ldrs-rgba-01.png,28.1833,0.0155,0.0094,6.9890 +Small,8x8,ldrs-rgba-02.png,23.8723,0.0191,0.0128,5.1176 +Small,12x12,hdr-rgb-00.hdr,20.4504,0.1126,0.0206,3.1885 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0049,0.0004,0.5791 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0048,0.0004,0.5764 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0048,0.0004,0.5874 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0048,0.0004,0.5939 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0048,0.0004,0.5871 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5900 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5845 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0048,0.0005,0.5651 +Small,12x12,ldr-rgb-00.png,23.7157,0.0161,0.0086,7.5782 +Small,12x12,ldr-rgb-01.png,24.7251,0.0137,0.0064,10.2288 +Small,12x12,ldr-rgb-02.png,19.1954,0.0212,0.0138,4.7514 +Small,12x12,ldr-rgb-03.png,33.1615,0.0088,0.0018,36.6748 +Small,12x12,ldr-rgb-04.png,24.3846,0.0137,0.0063,10.4322 +Small,12x12,ldr-rgb-05.png,21.3862,0.0198,0.0125,5.2429 +Small,12x12,ldr-rgb-06.png,19.1691,0.0220,0.0145,4.5209 +Small,12x12,ldr-rgb-07.png,25.3196,0.0135,0.0060,10.8682 +Small,12x12,ldr-rgb-08.png,30.1240,0.0099,0.0028,23.4397 +Small,12x12,ldr-rgb-09.png,23.5957,0.0155,0.0081,8.0690 +Small,12x12,ldr-rgb-10.png,27.2837,0.0072,0.0021,7.9107 +Small,12x12,ldr-rgba-00.png,21.3587,0.0208,0.0132,4.9614 +Small,12x12,ldr-rgba-01.png,24.4758,0.0152,0.0077,8.5488 +Small,12x12,ldr-rgba-02.png,20.1402,0.0240,0.0163,4.0128 +Small,12x12,ldr-xy-00.png,28.8913,0.0158,0.0050,13.1836 +Small,12x12,ldr-xy-01.png,29.6644,0.0152,0.0044,14.8270 +Small,12x12,ldr-xy-02.png,37.9766,0.0118,0.0012,54.8440 +Small,12x12,ldrs-rgba-00.png,21.3601,0.0211,0.0134,4.8864 +Small,12x12,ldrs-rgba-01.png,24.4766,0.0154,0.0077,8.4857 +Small,12x12,ldrs-rgba-02.png,20.1395,0.0243,0.0166,3.9389 +Small,3x3x3,ldr-l-00-3.dds,50.6895,0.0187,0.0114,23.0129 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0082,0.0048,14.3948 +Small,6x6x6,ldr-l-00-3.dds,32.5118,0.0678,0.0558,4.7004 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0292,0.0212,3.2535 diff --git a/Test/Images/Small/astc_reference-4.4-sse2_medium_results.csv b/Test/Images/Small/astc_reference-4.4-sse2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..7d9078de5fb8c243e462f041c5c16da876dd67c9 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse2_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1462,0.1123,0.0233,2.8114 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0035,0.0004,0.5817 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5791 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5884 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0005,0.5529 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5779 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0005,0.4867 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5829 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5434 +Small,4x4,ldr-rgb-00.png,38.8432,0.0319,0.0257,2.5506 +Small,4x4,ldr-rgb-01.png,40.2258,0.0277,0.0218,3.0071 +Small,4x4,ldr-rgb-02.png,35.2933,0.0282,0.0222,2.9545 +Small,4x4,ldr-rgb-03.png,47.2820,0.0186,0.0130,5.0564 +Small,4x4,ldr-rgb-04.png,42.2203,0.0230,0.0171,3.8327 +Small,4x4,ldr-rgb-05.png,37.8177,0.0306,0.0247,2.6581 +Small,4x4,ldr-rgb-06.png,35.4758,0.0252,0.0193,3.4033 +Small,4x4,ldr-rgb-07.png,39.2847,0.0376,0.0318,2.0593 +Small,4x4,ldr-rgb-08.png,45.1880,0.0217,0.0160,4.0970 +Small,4x4,ldr-rgb-09.png,42.1624,0.0235,0.0177,3.7022 +Small,4x4,ldr-rgb-10.png,44.9412,0.0065,0.0028,5.8266 +Small,4x4,ldr-rgba-00.png,36.2597,0.0356,0.0291,2.2521 +Small,4x4,ldr-rgba-01.png,38.9707,0.0224,0.0164,4.0078 +Small,4x4,ldr-rgba-02.png,34.9421,0.0246,0.0184,3.5612 +Small,4x4,ldr-xy-00.png,37.7304,0.0217,0.0143,4.5730 +Small,4x4,ldr-xy-01.png,45.3643,0.0293,0.0220,2.9823 +Small,4x4,ldr-xy-02.png,51.1886,0.0333,0.0258,2.5439 +Small,4x4,ldrs-rgba-00.png,36.2659,0.0356,0.0293,2.2348 +Small,4x4,ldrs-rgba-01.png,38.9909,0.0227,0.0166,3.9572 +Small,4x4,ldrs-rgba-02.png,34.9450,0.0249,0.0185,3.5450 +Small,5x5,hdr-rgb-00.hdr,29.9063,0.1161,0.0273,2.3976 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0044,0.0004,0.5791 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0045,0.0004,0.5795 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0004,0.5751 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0005,0.5613 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5613 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0004,0.5727 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0046,0.0005,0.5401 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5566 +Small,5x5,ldr-rgb-00.png,35.1487,0.0358,0.0286,2.2881 +Small,5x5,ldr-rgb-01.png,36.4456,0.0270,0.0201,3.2576 +Small,5x5,ldr-rgb-02.png,31.1355,0.0276,0.0205,3.1948 +Small,5x5,ldr-rgb-03.png,44.0259,0.0153,0.0086,7.6427 +Small,5x5,ldr-rgb-04.png,37.6738,0.0254,0.0185,3.5494 +Small,5x5,ldr-rgb-05.png,33.5459,0.0369,0.0298,2.1968 +Small,5x5,ldr-rgb-06.png,31.1791,0.0265,0.0195,3.3614 +Small,5x5,ldr-rgb-07.png,36.1557,0.0424,0.0354,1.8493 +Small,5x5,ldr-rgb-08.png,41.6368,0.0212,0.0146,4.4980 +Small,5x5,ldr-rgb-09.png,37.5922,0.0242,0.0172,3.8012 +Small,5x5,ldr-rgb-10.png,40.5794,0.0079,0.0032,5.0720 +Small,5x5,ldr-rgba-00.png,32.8173,0.0427,0.0352,1.8611 +Small,5x5,ldr-rgba-01.png,35.3162,0.0259,0.0187,3.4998 +Small,5x5,ldr-rgba-02.png,31.1464,0.0283,0.0211,3.1089 +Small,5x5,ldr-xy-00.png,37.0404,0.0234,0.0150,4.3834 +Small,5x5,ldr-xy-01.png,40.7159,0.0300,0.0214,3.0600 +Small,5x5,ldr-xy-02.png,49.1543,0.0248,0.0161,4.0731 +Small,5x5,ldrs-rgba-00.png,32.8214,0.0427,0.0354,1.8499 +Small,5x5,ldrs-rgba-01.png,35.3251,0.0260,0.0188,3.4813 +Small,5x5,ldrs-rgba-02.png,31.1476,0.0282,0.0210,3.1234 +Small,6x6,hdr-rgb-00.hdr,27.5227,0.1186,0.0288,2.2779 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0043,0.0005,0.5269 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0004,0.5887 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0043,0.0005,0.5518 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0043,0.0004,0.5690 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0043,0.0004,0.5858 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0043,0.0004,0.5791 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0004,0.5739 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0043,0.0005,0.5628 +Small,6x6,ldr-rgb-00.png,32.4046,0.0373,0.0305,2.1479 +Small,6x6,ldr-rgb-01.png,33.0877,0.0276,0.0209,3.1363 +Small,6x6,ldr-rgb-02.png,27.5101,0.0284,0.0217,3.0264 +Small,6x6,ldr-rgb-03.png,41.7485,0.0130,0.0066,9.8923 +Small,6x6,ldr-rgb-04.png,34.2066,0.0244,0.0177,3.7037 +Small,6x6,ldr-rgb-05.png,30.1436,0.0384,0.0316,2.0764 +Small,6x6,ldr-rgb-06.png,27.5774,0.0278,0.0210,3.1203 +Small,6x6,ldr-rgb-07.png,33.8833,0.0414,0.0347,1.8904 +Small,6x6,ldr-rgb-08.png,39.2140,0.0177,0.0112,5.8260 +Small,6x6,ldr-rgb-09.png,33.6689,0.0239,0.0172,3.8196 +Small,6x6,ldr-rgb-10.png,36.9896,0.0079,0.0034,4.8439 +Small,6x6,ldr-rgba-00.png,30.2544,0.0460,0.0391,1.6762 +Small,6x6,ldr-rgba-01.png,32.2005,0.0270,0.0200,3.2830 +Small,6x6,ldr-rgba-02.png,27.8556,0.0307,0.0236,2.7785 +Small,6x6,ldr-xy-00.png,36.1662,0.0215,0.0132,4.9690 +Small,6x6,ldr-xy-01.png,38.0135,0.0249,0.0166,3.9503 +Small,6x6,ldr-xy-02.png,46.1312,0.0205,0.0121,5.4197 +Small,6x6,ldrs-rgba-00.png,30.2495,0.0467,0.0397,1.6519 +Small,6x6,ldrs-rgba-01.png,32.2065,0.0271,0.0201,3.2680 +Small,6x6,ldrs-rgba-02.png,27.8520,0.0308,0.0237,2.7678 +Small,8x8,hdr-rgb-00.hdr,24.1390,0.1283,0.0372,1.7596 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0052,0.0006,0.4070 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0049,0.0005,0.5566 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0049,0.0004,0.5952 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5926 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0004,0.5995 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5807 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5871 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0004,0.5690 +Small,8x8,ldr-rgb-00.png,28.7594,0.0490,0.0415,1.5784 +Small,8x8,ldr-rgb-01.png,28.9369,0.0339,0.0265,2.4749 +Small,8x8,ldr-rgb-02.png,23.1670,0.0362,0.0287,2.2843 +Small,8x8,ldr-rgb-03.png,38.5914,0.0152,0.0081,8.1371 +Small,8x8,ldr-rgb-04.png,29.6483,0.0337,0.0264,2.4865 +Small,8x8,ldr-rgb-05.png,25.9418,0.0472,0.0396,1.6545 +Small,8x8,ldr-rgb-06.png,23.2010,0.0369,0.0293,2.2354 +Small,8x8,ldr-rgb-07.png,30.7551,0.0491,0.0416,1.5761 +Small,8x8,ldr-rgb-08.png,35.9297,0.0214,0.0142,4.6217 +Small,8x8,ldr-rgb-09.png,28.9847,0.0308,0.0234,2.8036 +Small,8x8,ldr-rgb-10.png,32.1811,0.0097,0.0045,3.5854 +Small,8x8,ldr-rgba-00.png,26.4734,0.0573,0.0497,1.3187 +Small,8x8,ldr-rgba-01.png,28.3748,0.0341,0.0264,2.4778 +Small,8x8,ldr-rgba-02.png,23.9432,0.0388,0.0311,2.1099 +Small,8x8,ldr-xy-00.png,33.9578,0.0290,0.0187,3.5059 +Small,8x8,ldr-xy-01.png,34.9740,0.0291,0.0190,3.4582 +Small,8x8,ldr-xy-02.png,41.6833,0.0228,0.0125,5.2304 +Small,8x8,ldrs-rgba-00.png,26.4748,0.0573,0.0497,1.3181 +Small,8x8,ldrs-rgba-01.png,28.3782,0.0342,0.0265,2.4761 +Small,8x8,ldrs-rgba-02.png,23.9434,0.0394,0.0315,2.0772 +Small,12x12,hdr-rgb-00.hdr,20.7679,0.1472,0.0532,1.2314 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0080,0.0006,0.4498 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0078,0.0004,0.5779 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0078,0.0004,0.5779 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0078,0.0004,0.5742 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0078,0.0004,0.5751 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0079,0.0005,0.5678 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0078,0.0005,0.5663 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0078,0.0004,0.5702 +Small,12x12,ldr-rgb-00.png,24.6928,0.0590,0.0481,1.3622 +Small,12x12,ldr-rgb-01.png,25.0361,0.0439,0.0336,1.9530 +Small,12x12,ldr-rgb-02.png,19.2723,0.0513,0.0408,1.6045 +Small,12x12,ldr-rgb-03.png,34.9910,0.0188,0.0087,7.5634 +Small,12x12,ldr-rgb-04.png,24.8973,0.0417,0.0313,2.0948 +Small,12x12,ldr-rgb-05.png,21.6527,0.0590,0.0486,1.3474 +Small,12x12,ldr-rgb-06.png,19.2558,0.0523,0.0418,1.5689 +Small,12x12,ldr-rgb-07.png,26.7423,0.0541,0.0437,1.5007 +Small,12x12,ldr-rgb-08.png,31.6843,0.0246,0.0144,4.5517 +Small,12x12,ldr-rgb-09.png,24.1545,0.0404,0.0301,2.1784 +Small,12x12,ldr-rgb-10.png,28.0447,0.0173,0.0093,1.7519 +Small,12x12,ldr-rgba-00.png,22.2585,0.0649,0.0543,1.2071 +Small,12x12,ldr-rgba-01.png,24.6414,0.0425,0.0317,2.0656 +Small,12x12,ldr-rgba-02.png,20.1882,0.0553,0.0446,1.4684 +Small,12x12,ldr-xy-00.png,30.2558,0.0355,0.0213,3.0718 +Small,12x12,ldr-xy-01.png,31.8636,0.0373,0.0231,2.8379 +Small,12x12,ldr-xy-02.png,38.5089,0.0187,0.0047,13.8848 +Small,12x12,ldrs-rgba-00.png,22.2585,0.0656,0.0549,1.1931 +Small,12x12,ldrs-rgba-01.png,24.6434,0.0428,0.0321,2.0430 +Small,12x12,ldrs-rgba-02.png,20.1890,0.0551,0.0445,1.4743 +Small,3x3x3,ldr-l-00-3.dds,51.8899,0.0255,0.0164,15.9523 +Small,3x3x3,ldr-l-01-3.dds,54.6239,0.0103,0.0052,13.3442 +Small,6x6x6,ldr-l-00-3.dds,32.9631,0.0807,0.0668,3.9266 +Small,6x6x6,ldr-l-01-3.dds,41.0369,0.0318,0.0214,3.2175 diff --git a/Test/Images/Small/astc_reference-4.4-sse2_thorough_results.csv b/Test/Images/Small/astc_reference-4.4-sse2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..e6ff8e61984189c72f3288c059ef5dea9bb2d65c --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse2_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.4205,0.1351,0.0461,1.4213 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.5089 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5120 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0005,0.5140 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5345 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0005,0.5529 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0005,0.5235 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5289 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0005,0.5601 +Small,4x4,ldr-rgb-00.png,39.1635,0.0594,0.0533,1.2288 +Small,4x4,ldr-rgb-01.png,40.4120,0.0564,0.0504,1.2996 +Small,4x4,ldr-rgb-02.png,35.4711,0.0528,0.0468,1.4015 +Small,4x4,ldr-rgb-03.png,47.7527,0.0534,0.0478,1.3703 +Small,4x4,ldr-rgb-04.png,42.3660,0.0479,0.0420,1.5616 +Small,4x4,ldr-rgb-05.png,37.9925,0.0577,0.0516,1.2700 +Small,4x4,ldr-rgb-06.png,35.6403,0.0470,0.0409,1.6030 +Small,4x4,ldr-rgb-07.png,39.8791,0.0701,0.0642,1.0203 +Small,4x4,ldr-rgb-08.png,45.8775,0.0523,0.0466,1.4078 +Small,4x4,ldr-rgb-09.png,42.2993,0.0515,0.0456,1.4387 +Small,4x4,ldr-rgb-10.png,45.1694,0.0096,0.0059,2.7454 +Small,4x4,ldr-rgba-00.png,36.7416,0.0626,0.0564,1.1619 +Small,4x4,ldr-rgba-01.png,39.1154,0.0445,0.0384,1.7065 +Small,4x4,ldr-rgba-02.png,35.0328,0.0449,0.0386,1.6991 +Small,4x4,ldr-xy-00.png,37.7724,0.0543,0.0468,1.4007 +Small,4x4,ldr-xy-01.png,45.4608,0.0602,0.0529,1.2398 +Small,4x4,ldr-xy-02.png,51.1938,0.0787,0.0710,0.9226 +Small,4x4,ldrs-rgba-00.png,36.7495,0.0628,0.0567,1.1560 +Small,4x4,ldrs-rgba-01.png,39.1372,0.0450,0.0388,1.6899 +Small,4x4,ldrs-rgba-02.png,35.0344,0.0448,0.0386,1.6965 +Small,5x5,hdr-rgb-00.hdr,30.3005,0.1429,0.0528,1.2419 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0048,0.0006,0.4485 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0050,0.0005,0.4670 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0046,0.0005,0.5601 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0046,0.0005,0.5651 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5518 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0005,0.5601 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0005,0.5663 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5639 +Small,5x5,ldr-rgb-00.png,35.3880,0.0708,0.0636,1.0309 +Small,5x5,ldr-rgb-01.png,36.5413,0.0618,0.0548,1.1956 +Small,5x5,ldr-rgb-02.png,31.1967,0.0540,0.0469,1.3974 +Small,5x5,ldr-rgb-03.png,44.5932,0.0619,0.0549,1.1927 +Small,5x5,ldr-rgb-04.png,37.8267,0.0559,0.0490,1.3377 +Small,5x5,ldr-rgb-05.png,33.6963,0.0699,0.0629,1.0422 +Small,5x5,ldr-rgb-06.png,31.2331,0.0505,0.0434,1.5087 +Small,5x5,ldr-rgb-07.png,36.7232,0.0865,0.0795,0.8242 +Small,5x5,ldr-rgb-08.png,42.3949,0.0605,0.0537,1.2198 +Small,5x5,ldr-rgb-09.png,37.7126,0.0616,0.0547,1.1992 +Small,5x5,ldr-rgb-10.png,40.7580,0.0119,0.0072,2.2628 +Small,5x5,ldr-rgba-00.png,33.1240,0.0772,0.0699,0.9373 +Small,5x5,ldr-rgba-01.png,35.4134,0.0531,0.0459,1.4283 +Small,5x5,ldr-rgba-02.png,31.1844,0.0516,0.0443,1.4791 +Small,5x5,ldr-xy-00.png,37.1442,0.0638,0.0552,1.1880 +Small,5x5,ldr-xy-01.png,41.4542,0.0756,0.0671,0.9772 +Small,5x5,ldr-xy-02.png,49.3313,0.0904,0.0816,0.8034 +Small,5x5,ldrs-rgba-00.png,33.1272,0.0775,0.0702,0.9330 +Small,5x5,ldrs-rgba-01.png,35.4217,0.0534,0.0462,1.4200 +Small,5x5,ldrs-rgba-02.png,31.1853,0.0514,0.0441,1.4870 +Small,6x6,hdr-rgb-00.hdr,27.7238,0.1476,0.0567,1.1561 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0005,0.4856 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0004,0.5791 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0004,0.5702 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0044,0.0005,0.5566 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5235 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5313 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0005,0.5079 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0004,0.5832 +Small,6x6,ldr-rgb-00.png,32.6509,0.0800,0.0727,0.9017 +Small,6x6,ldr-rgb-01.png,33.1881,0.0666,0.0596,1.0995 +Small,6x6,ldr-rgb-02.png,27.5552,0.0578,0.0510,1.2843 +Small,6x6,ldr-rgb-03.png,42.5885,0.0536,0.0471,1.3916 +Small,6x6,ldr-rgb-04.png,34.3416,0.0592,0.0523,1.2528 +Small,6x6,ldr-rgb-05.png,30.2875,0.0745,0.0677,0.9685 +Small,6x6,ldr-rgb-06.png,27.6306,0.0557,0.0488,1.3419 +Small,6x6,ldr-rgb-07.png,34.4380,0.0930,0.0861,0.7609 +Small,6x6,ldr-rgb-08.png,40.0373,0.0538,0.0472,1.3881 +Small,6x6,ldr-rgb-09.png,33.8118,0.0624,0.0556,1.1790 +Small,6x6,ldr-rgb-10.png,37.1861,0.0133,0.0088,1.8521 +Small,6x6,ldr-rgba-00.png,30.5164,0.0855,0.0785,0.8345 +Small,6x6,ldr-rgba-01.png,32.2794,0.0600,0.0529,1.2383 +Small,6x6,ldr-rgba-02.png,27.8936,0.0564,0.0492,1.3323 +Small,6x6,ldr-xy-00.png,36.2540,0.0547,0.0463,1.4155 +Small,6x6,ldr-xy-01.png,38.0244,0.0762,0.0679,0.9654 +Small,6x6,ldr-xy-02.png,47.5902,0.0946,0.0861,0.7611 +Small,6x6,ldrs-rgba-00.png,30.5127,0.0856,0.0784,0.8354 +Small,6x6,ldrs-rgba-01.png,32.2857,0.0602,0.0531,1.2335 +Small,6x6,ldrs-rgba-02.png,27.8909,0.0564,0.0494,1.3276 +Small,8x8,hdr-rgb-00.hdr,24.3460,0.1700,0.0770,0.8514 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0062,0.0006,0.4324 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0063,0.0005,0.5628 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0005,0.5543 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0062,0.0004,0.5727 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0062,0.0005,0.5678 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0062,0.0004,0.5791 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0063,0.0005,0.5215 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0063,0.0005,0.5481 +Small,8x8,ldr-rgb-00.png,28.9780,0.1010,0.0920,0.7123 +Small,8x8,ldr-rgb-01.png,29.0210,0.0837,0.0749,0.8745 +Small,8x8,ldr-rgb-02.png,23.2052,0.0762,0.0673,0.9745 +Small,8x8,ldr-rgb-03.png,39.4314,0.0388,0.0302,2.1689 +Small,8x8,ldr-rgb-04.png,29.7779,0.0752,0.0664,0.9864 +Small,8x8,ldr-rgb-05.png,26.0426,0.0917,0.0829,0.7905 +Small,8x8,ldr-rgb-06.png,23.2530,0.0754,0.0663,0.9891 +Small,8x8,ldr-rgb-07.png,31.2138,0.1125,0.1038,0.6316 +Small,8x8,ldr-rgb-08.png,36.5612,0.0565,0.0480,1.3658 +Small,8x8,ldr-rgb-09.png,29.1484,0.0656,0.0567,1.1563 +Small,8x8,ldr-rgb-10.png,32.3330,0.0181,0.0115,1.4096 +Small,8x8,ldr-rgba-00.png,26.7531,0.1111,0.1020,0.6426 +Small,8x8,ldr-rgba-01.png,28.4341,0.0810,0.0718,0.9134 +Small,8x8,ldr-rgba-02.png,23.9687,0.0739,0.0648,1.0115 +Small,8x8,ldr-xy-00.png,34.2380,0.0661,0.0555,1.1811 +Small,8x8,ldr-xy-01.png,35.3165,0.0676,0.0573,1.1444 +Small,8x8,ldr-xy-02.png,44.6234,0.0858,0.0754,0.8691 +Small,8x8,ldrs-rgba-00.png,26.7540,0.1111,0.1021,0.6417 +Small,8x8,ldrs-rgba-01.png,28.4376,0.0811,0.0721,0.9090 +Small,8x8,ldrs-rgba-02.png,23.9689,0.0736,0.0643,1.0191 +Small,12x12,hdr-rgb-00.hdr,21.0311,0.2083,0.1125,0.5827 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0101,0.0005,0.5532 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0102,0.0005,0.5613 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0102,0.0004,0.5727 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0102,0.0004,0.5767 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0102,0.0005,0.5377 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0102,0.0004,0.5714 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0102,0.0005,0.5289 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0101,0.0004,0.5767 +Small,12x12,ldr-rgb-00.png,25.0530,0.1308,0.1176,0.5571 +Small,12x12,ldr-rgb-01.png,25.1392,0.1073,0.0945,0.6934 +Small,12x12,ldr-rgb-02.png,19.2921,0.1186,0.1057,0.6201 +Small,12x12,ldr-rgb-03.png,36.1864,0.0432,0.0306,2.1388 +Small,12x12,ldr-rgb-04.png,24.9919,0.0969,0.0838,0.7819 +Small,12x12,ldr-rgb-05.png,21.7388,0.1182,0.1052,0.6227 +Small,12x12,ldr-rgb-06.png,19.2959,0.1157,0.1028,0.6377 +Small,12x12,ldr-rgb-07.png,27.1136,0.1355,0.1226,0.5344 +Small,12x12,ldr-rgb-08.png,32.5295,0.0555,0.0430,1.5246 +Small,12x12,ldr-rgb-09.png,24.3026,0.0900,0.0772,0.8484 +Small,12x12,ldr-rgb-10.png,28.1806,0.0302,0.0196,0.8278 +Small,12x12,ldr-rgba-00.png,22.7565,0.1387,0.1256,0.5219 +Small,12x12,ldr-rgba-01.png,24.7322,0.1105,0.0974,0.6725 +Small,12x12,ldr-rgba-02.png,20.2051,0.1150,0.1017,0.6441 +Small,12x12,ldr-xy-00.png,30.5347,0.0871,0.0725,0.9036 +Small,12x12,ldr-xy-01.png,32.2811,0.0689,0.0545,1.2031 +Small,12x12,ldr-xy-02.png,40.3051,0.0487,0.0343,1.9082 +Small,12x12,ldrs-rgba-00.png,22.7551,0.1388,0.1257,0.5214 +Small,12x12,ldrs-rgba-01.png,24.7337,0.1111,0.0981,0.6683 +Small,12x12,ldrs-rgba-02.png,20.2055,0.1148,0.1014,0.6461 +Small,3x3x3,ldr-l-00-3.dds,52.3291,0.0436,0.0346,7.5775 +Small,3x3x3,ldr-l-01-3.dds,55.2576,0.0187,0.0135,5.0924 +Small,6x6x6,ldr-l-00-3.dds,33.2763,0.1113,0.0945,2.7728 +Small,6x6x6,ldr-l-01-3.dds,41.7183,0.0349,0.0221,3.1240 diff --git a/Test/Images/Small/astc_reference-4.4-sse4.1_fast_results.csv b/Test/Images/Small/astc_reference-4.4-sse4.1_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..158e8c86476b0ad6a6a6ff0aeaee0315a6f122c5 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse4.1_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7281,0.0989,0.0131,5.0065 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0030,0.0005,0.5412 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0030,0.0005,0.5426 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0029,0.0005,0.5470 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0029,0.0005,0.5552 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0029,0.0005,0.5504 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0029,0.0005,0.5390 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0030,0.0005,0.5300 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0029,0.0005,0.5310 +Small,4x4,ldr-rgb-00.png,38.2512,0.0140,0.0086,7.6446 +Small,4x4,ldr-rgb-01.png,39.9266,0.0125,0.0073,9.0222 +Small,4x4,ldr-rgb-02.png,35.1621,0.0169,0.0115,5.7033 +Small,4x4,ldr-rgb-03.png,46.0782,0.0078,0.0027,23.8651 +Small,4x4,ldr-rgb-04.png,41.9798,0.0102,0.0050,13.1703 +Small,4x4,ldr-rgb-05.png,37.3372,0.0168,0.0116,5.6702 +Small,4x4,ldr-rgb-06.png,35.3603,0.0157,0.0104,6.2756 +Small,4x4,ldr-rgb-07.png,38.1442,0.0172,0.0120,5.4464 +Small,4x4,ldr-rgb-08.png,43.8361,0.0096,0.0048,13.6789 +Small,4x4,ldr-rgb-09.png,41.9339,0.0103,0.0052,12.6859 +Small,4x4,ldr-rgb-10.png,44.4590,0.0044,0.0013,12.1951 +Small,4x4,ldr-rgba-00.png,35.6010,0.0168,0.0115,5.6780 +Small,4x4,ldr-rgba-01.png,38.8640,0.0120,0.0068,9.6959 +Small,4x4,ldr-rgba-02.png,34.8755,0.0151,0.0097,6.7597 +Small,4x4,ldr-xy-00.png,37.5551,0.0123,0.0048,13.7797 +Small,4x4,ldr-xy-01.png,44.3046,0.0128,0.0056,11.7109 +Small,4x4,ldr-xy-02.png,48.2608,0.0109,0.0036,18.3057 +Small,4x4,ldrs-rgba-00.png,35.6065,0.0169,0.0115,5.6795 +Small,4x4,ldrs-rgba-01.png,38.8848,0.0123,0.0069,9.5146 +Small,4x4,ldrs-rgba-02.png,34.8762,0.0155,0.0099,6.6298 +Small,5x5,hdr-rgb-00.hdr,29.5480,0.1016,0.0138,4.7456 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0036,0.0005,0.5470 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0037,0.0005,0.5108 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0037,0.0005,0.5205 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0036,0.0005,0.5279 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0037,0.0006,0.4604 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0005,0.5225 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5323 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0037,0.0005,0.5377 +Small,5x5,ldr-rgb-00.png,34.4321,0.0145,0.0084,7.7770 +Small,5x5,ldr-rgb-01.png,36.2469,0.0117,0.0057,11.4195 +Small,5x5,ldr-rgb-02.png,31.0931,0.0151,0.0092,7.1477 +Small,5x5,ldr-rgb-03.png,42.7531,0.0077,0.0023,28.4082 +Small,5x5,ldr-rgb-04.png,37.2747,0.0109,0.0048,13.7110 +Small,5x5,ldr-rgb-05.png,33.2744,0.0178,0.0118,5.5371 +Small,5x5,ldr-rgb-06.png,31.1326,0.0150,0.0089,7.3314 +Small,5x5,ldr-rgb-07.png,35.0664,0.0153,0.0095,6.8804 +Small,5x5,ldr-rgb-08.png,40.1866,0.0091,0.0036,18.4099 +Small,5x5,ldr-rgb-09.png,37.3026,0.0111,0.0050,13.0132 +Small,5x5,ldr-rgb-10.png,40.1964,0.0049,0.0013,12.8308 +Small,5x5,ldr-rgba-00.png,32.1470,0.0188,0.0128,5.1048 +Small,5x5,ldr-rgba-01.png,35.1987,0.0128,0.0067,9.8034 +Small,5x5,ldr-rgba-02.png,31.1340,0.0159,0.0097,6.7632 +Small,5x5,ldr-xy-00.png,36.7495,0.0121,0.0038,17.0668 +Small,5x5,ldr-xy-01.png,39.8321,0.0130,0.0048,13.7274 +Small,5x5,ldr-xy-02.png,43.9343,0.0118,0.0034,19.0398 +Small,5x5,ldrs-rgba-00.png,32.1514,0.0187,0.0124,5.2946 +Small,5x5,ldrs-rgba-01.png,35.2069,0.0127,0.0066,9.8909 +Small,5x5,ldrs-rgba-02.png,31.1349,0.0157,0.0094,6.9586 +Small,6x6,hdr-rgb-00.hdr,27.0790,0.1006,0.0139,4.6997 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5470 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5518 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5651 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0005,0.5310 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0005,0.5423 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0005,0.5518 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5804 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5235 +Small,6x6,ldr-rgb-00.png,31.7144,0.0166,0.0106,6.1979 +Small,6x6,ldr-rgb-01.png,32.9244,0.0126,0.0070,9.3892 +Small,6x6,ldr-rgb-02.png,27.4795,0.0161,0.0103,6.3682 +Small,6x6,ldr-rgb-03.png,40.5991,0.0078,0.0024,27.2264 +Small,6x6,ldr-rgb-04.png,33.9357,0.0116,0.0059,11.0945 +Small,6x6,ldr-rgb-05.png,29.9800,0.0204,0.0146,4.4937 +Small,6x6,ldr-rgb-06.png,27.5476,0.0160,0.0103,6.3925 +Small,6x6,ldr-rgb-07.png,32.9378,0.0153,0.0096,6.7984 +Small,6x6,ldr-rgb-08.png,37.8129,0.0091,0.0037,17.5944 +Small,6x6,ldr-rgb-09.png,33.4946,0.0123,0.0064,10.2498 +Small,6x6,ldr-rgb-10.png,36.6909,0.0051,0.0015,10.9040 +Small,6x6,ldr-rgba-00.png,29.6086,0.0202,0.0142,4.6133 +Small,6x6,ldr-rgba-01.png,32.0847,0.0136,0.0077,8.5123 +Small,6x6,ldr-rgba-02.png,27.8414,0.0170,0.0109,6.0054 +Small,6x6,ldr-xy-00.png,35.9075,0.0124,0.0042,15.5818 +Small,6x6,ldr-xy-01.png,37.1654,0.0144,0.0060,10.9408 +Small,6x6,ldr-xy-02.png,41.9299,0.0112,0.0033,20.0905 +Small,6x6,ldrs-rgba-00.png,29.6031,0.0205,0.0146,4.5008 +Small,6x6,ldrs-rgba-01.png,32.0904,0.0136,0.0077,8.4978 +Small,6x6,ldrs-rgba-02.png,27.8386,0.0170,0.0109,5.9877 +Small,8x8,hdr-rgb-00.hdr,23.7844,0.1050,0.0176,3.7198 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0038,0.0005,0.5051 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0037,0.0005,0.5300 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0037,0.0005,0.5366 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0037,0.0005,0.5529 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0037,0.0005,0.5613 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0004,0.5832 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5613 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0037,0.0005,0.5470 +Small,8x8,ldr-rgb-00.png,28.0659,0.0185,0.0124,5.2920 +Small,8x8,ldr-rgb-01.png,28.7734,0.0157,0.0097,6.7639 +Small,8x8,ldr-rgb-02.png,23.1042,0.0204,0.0143,4.5740 +Small,8x8,ldr-rgb-03.png,37.3496,0.0083,0.0027,24.4184 +Small,8x8,ldr-rgb-04.png,29.3469,0.0148,0.0088,7.4778 +Small,8x8,ldr-rgb-05.png,25.8034,0.0235,0.0174,3.7560 +Small,8x8,ldr-rgb-06.png,23.1655,0.0207,0.0148,4.4138 +Small,8x8,ldr-rgb-07.png,29.8427,0.0157,0.0098,6.7170 +Small,8x8,ldr-rgb-08.png,34.4844,0.0098,0.0042,15.7163 +Small,8x8,ldr-rgb-09.png,28.6410,0.0140,0.0082,8.0371 +Small,8x8,ldr-rgb-10.png,31.9947,0.0057,0.0019,8.7358 +Small,8x8,ldr-rgba-00.png,25.7010,0.0245,0.0179,3.6621 +Small,8x8,ldr-rgba-01.png,28.2814,0.0172,0.0111,5.9270 +Small,8x8,ldr-rgba-02.png,23.9350,0.0220,0.0158,4.1515 +Small,8x8,ldr-xy-00.png,33.3347,0.0148,0.0059,11.0833 +Small,8x8,ldr-xy-01.png,34.3877,0.0159,0.0068,9.5713 +Small,8x8,ldr-xy-02.png,39.8793,0.0110,0.0023,28.8707 +Small,8x8,ldrs-rgba-00.png,25.7001,0.0229,0.0167,3.9168 +Small,8x8,ldrs-rgba-01.png,28.2840,0.0173,0.0111,5.8882 +Small,8x8,ldrs-rgba-02.png,23.9352,0.0223,0.0159,4.1106 +Small,12x12,hdr-rgb-00.hdr,20.5374,0.1165,0.0269,2.4393 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0055,0.0005,0.5495 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0056,0.0005,0.5518 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0055,0.0005,0.5625 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0056,0.0005,0.5578 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0056,0.0005,0.5456 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0056,0.0005,0.5518 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0057,0.0005,0.4953 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0057,0.0005,0.5345 +Small,12x12,ldr-rgb-00.png,23.7930,0.0190,0.0109,6.0263 +Small,12x12,ldr-rgb-01.png,24.7698,0.0161,0.0082,7.9865 +Small,12x12,ldr-rgb-02.png,19.2293,0.0259,0.0179,3.6555 +Small,12x12,ldr-rgb-03.png,33.2561,0.0096,0.0020,32.3158 +Small,12x12,ldr-rgb-04.png,24.5727,0.0155,0.0075,8.6860 +Small,12x12,ldr-rgb-05.png,21.4915,0.0243,0.0161,4.0741 +Small,12x12,ldr-rgb-06.png,19.2266,0.0265,0.0186,3.5242 +Small,12x12,ldr-rgb-07.png,25.3769,0.0151,0.0074,8.8802 +Small,12x12,ldr-rgb-08.png,30.2961,0.0112,0.0035,18.5980 +Small,12x12,ldr-rgb-09.png,23.7353,0.0175,0.0096,6.8061 +Small,12x12,ldr-rgb-10.png,27.3243,0.0081,0.0024,6.6734 +Small,12x12,ldr-rgba-00.png,21.6059,0.0252,0.0171,3.8271 +Small,12x12,ldr-rgba-01.png,24.5172,0.0177,0.0095,6.8876 +Small,12x12,ldr-rgba-02.png,20.1746,0.0287,0.0206,3.1880 +Small,12x12,ldr-xy-00.png,29.2247,0.0172,0.0059,11.1098 +Small,12x12,ldr-xy-01.png,30.5463,0.0163,0.0053,12.3657 +Small,12x12,ldr-xy-02.png,37.9988,0.0123,0.0011,58.3605 +Small,12x12,ldrs-rgba-00.png,21.6106,0.0252,0.0173,3.7773 +Small,12x12,ldrs-rgba-01.png,24.5187,0.0176,0.0094,6.9565 +Small,12x12,ldrs-rgba-02.png,20.1751,0.0288,0.0207,3.1712 +Small,3x3x3,ldr-l-00-3.dds,50.8347,0.0168,0.0088,29.7181 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0080,0.0038,18.3203 +Small,6x6x6,ldr-l-00-3.dds,32.5284,0.0621,0.0506,5.1780 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0271,0.0193,3.5665 diff --git a/Test/Images/Small/astc_reference-4.4-sse4.1_fastest_results.csv b/Test/Images/Small/astc_reference-4.4-sse4.1_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..18c73297b25b0a753eaf6fbfcd6e4cef663bd93e --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse4.1_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3455,0.0915,0.0080,8.2198 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0023,0.0005,0.5470 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0023,0.0005,0.5639 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0023,0.0005,0.5506 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0023,0.0005,0.5401 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0023,0.0005,0.5484 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0023,0.0005,0.5552 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5887 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0023,0.0005,0.5616 +Small,4x4,ldr-rgb-00.png,37.2470,0.0096,0.0050,13.2102 +Small,4x4,ldr-rgb-01.png,39.5439,0.0088,0.0044,14.7372 +Small,4x4,ldr-rgb-02.png,34.7920,0.0109,0.0063,10.4271 +Small,4x4,ldr-rgb-03.png,45.4866,0.0061,0.0020,32.6381 +Small,4x4,ldr-rgb-04.png,41.7158,0.0079,0.0034,19.4301 +Small,4x4,ldr-rgb-05.png,36.8705,0.0111,0.0066,9.9658 +Small,4x4,ldr-rgb-06.png,34.9665,0.0104,0.0058,11.2356 +Small,4x4,ldr-rgb-07.png,37.3645,0.0109,0.0064,10.3074 +Small,4x4,ldr-rgb-08.png,42.9454,0.0069,0.0027,24.0236 +Small,4x4,ldr-rgb-09.png,41.7396,0.0079,0.0034,19.3658 +Small,4x4,ldr-rgb-10.png,43.9436,0.0035,0.0010,15.4820 +Small,4x4,ldr-rgba-00.png,34.7343,0.0112,0.0065,10.0405 +Small,4x4,ldr-rgba-01.png,38.6694,0.0095,0.0048,13.7797 +Small,4x4,ldr-rgba-02.png,34.5634,0.0116,0.0068,9.6819 +Small,4x4,ldr-xy-00.png,37.5260,0.0100,0.0034,19.0122 +Small,4x4,ldr-xy-01.png,43.9781,0.0105,0.0039,16.8647 +Small,4x4,ldr-xy-02.png,48.2748,0.0095,0.0029,22.9218 +Small,4x4,ldrs-rgba-00.png,34.7385,0.0112,0.0065,10.1166 +Small,4x4,ldrs-rgba-01.png,38.6861,0.0097,0.0049,13.4237 +Small,4x4,ldrs-rgba-02.png,34.5669,0.0116,0.0068,9.6676 +Small,5x5,hdr-rgb-00.hdr,28.8745,0.0922,0.0083,7.9227 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0027,0.0005,0.5470 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0027,0.0005,0.5369 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5754 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5858 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5820 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5871 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5779 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0027,0.0004,0.5861 +Small,5x5,ldr-rgb-00.png,33.7228,0.0100,0.0050,13.0988 +Small,5x5,ldr-rgb-01.png,36.0754,0.0090,0.0041,15.8294 +Small,5x5,ldr-rgb-02.png,30.9932,0.0114,0.0065,10.0500 +Small,5x5,ldr-rgb-03.png,42.3634,0.0064,0.0018,36.1301 +Small,5x5,ldr-rgb-04.png,37.0411,0.0086,0.0037,17.6930 +Small,5x5,ldr-rgb-05.png,32.9651,0.0122,0.0073,8.9971 +Small,5x5,ldr-rgb-06.png,31.0371,0.0112,0.0063,10.4504 +Small,5x5,ldr-rgb-07.png,34.4079,0.0109,0.0061,10.7753 +Small,5x5,ldr-rgb-08.png,39.5746,0.0072,0.0025,25.8004 +Small,5x5,ldr-rgb-09.png,37.0834,0.0085,0.0037,17.8376 +Small,5x5,ldr-rgb-10.png,39.9180,0.0041,0.0012,14.1340 +Small,5x5,ldr-rgba-00.png,31.1153,0.0119,0.0069,9.5590 +Small,5x5,ldr-rgba-01.png,35.0411,0.0099,0.0048,13.6078 +Small,5x5,ldr-rgba-02.png,31.0383,0.0122,0.0069,9.4567 +Small,5x5,ldr-xy-00.png,36.5692,0.0104,0.0031,20.9511 +Small,5x5,ldr-xy-01.png,39.2568,0.0108,0.0036,18.3582 +Small,5x5,ldr-xy-02.png,43.8559,0.0101,0.0028,23.2494 +Small,5x5,ldrs-rgba-00.png,31.1160,0.0119,0.0067,9.7495 +Small,5x5,ldrs-rgba-01.png,35.0497,0.0100,0.0049,13.3995 +Small,5x5,ldrs-rgba-02.png,31.0387,0.0123,0.0071,9.2592 +Small,6x6,hdr-rgb-00.hdr,26.7600,0.0918,0.0080,8.1870 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0027,0.0005,0.5401 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.5845 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.5727 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5779 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5690 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5730 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.5842 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5858 +Small,6x6,ldr-rgb-00.png,31.3436,0.0108,0.0058,11.3619 +Small,6x6,ldr-rgb-01.png,32.8352,0.0098,0.0050,13.1729 +Small,6x6,ldr-rgb-02.png,27.3910,0.0121,0.0073,8.9654 +Small,6x6,ldr-rgb-03.png,40.3557,0.0063,0.0018,37.3425 +Small,6x6,ldr-rgb-04.png,33.7632,0.0092,0.0043,15.1423 +Small,6x6,ldr-rgb-05.png,29.7440,0.0132,0.0083,7.8626 +Small,6x6,ldr-rgb-06.png,27.4701,0.0123,0.0073,9.0035 +Small,6x6,ldr-rgb-07.png,32.3394,0.0109,0.0061,10.7454 +Small,6x6,ldr-rgb-08.png,37.4420,0.0072,0.0026,25.0915 +Small,6x6,ldr-rgb-09.png,33.3139,0.0092,0.0043,15.3769 +Small,6x6,ldr-rgb-10.png,36.5787,0.0040,0.0012,13.8358 +Small,6x6,ldr-rgba-00.png,28.8478,0.0123,0.0073,8.9467 +Small,6x6,ldr-rgba-01.png,31.9937,0.0105,0.0055,12.0139 +Small,6x6,ldr-rgba-02.png,27.7812,0.0126,0.0074,8.8465 +Small,6x6,ldr-xy-00.png,35.6139,0.0102,0.0031,21.2639 +Small,6x6,ldr-xy-01.png,36.5248,0.0111,0.0040,16.2304 +Small,6x6,ldr-xy-02.png,41.7978,0.0097,0.0026,24.7482 +Small,6x6,ldrs-rgba-00.png,28.8438,0.0123,0.0073,9.0059 +Small,6x6,ldrs-rgba-01.png,31.9996,0.0107,0.0055,11.9351 +Small,6x6,ldrs-rgba-02.png,27.7798,0.0126,0.0074,8.8133 +Small,8x8,hdr-rgb-00.hdr,23.6156,0.0968,0.0120,5.4650 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0034,0.0005,0.5687 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5764 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5791 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5845 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5779 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5791 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5804 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5702 +Small,8x8,ldr-rgb-00.png,27.7154,0.0142,0.0084,7.8177 +Small,8x8,ldr-rgb-01.png,28.6823,0.0126,0.0070,9.3397 +Small,8x8,ldr-rgb-02.png,23.0282,0.0160,0.0103,6.3454 +Small,8x8,ldr-rgb-03.png,37.0615,0.0075,0.0022,30.3833 +Small,8x8,ldr-rgb-04.png,29.1235,0.0123,0.0065,10.0298 +Small,8x8,ldr-rgb-05.png,25.6005,0.0177,0.0120,5.4637 +Small,8x8,ldr-rgb-06.png,23.0809,0.0165,0.0107,6.1123 +Small,8x8,ldr-rgb-07.png,29.4687,0.0125,0.0069,9.5104 +Small,8x8,ldr-rgb-08.png,33.9575,0.0086,0.0031,21.1950 +Small,8x8,ldr-rgb-09.png,28.4481,0.0118,0.0061,10.7223 +Small,8x8,ldr-rgb-10.png,31.9049,0.0051,0.0014,11.7455 +Small,8x8,ldr-rgba-00.png,25.3472,0.0169,0.0110,5.9584 +Small,8x8,ldr-rgba-01.png,28.1822,0.0138,0.0079,8.3030 +Small,8x8,ldr-rgba-02.png,23.8729,0.0168,0.0107,6.1038 +Small,8x8,ldr-xy-00.png,33.2129,0.0126,0.0043,15.3298 +Small,8x8,ldr-xy-01.png,34.1355,0.0133,0.0050,13.0708 +Small,8x8,ldr-xy-02.png,39.7699,0.0101,0.0019,35.2724 +Small,8x8,ldrs-rgba-00.png,25.3477,0.0169,0.0110,5.9524 +Small,8x8,ldrs-rgba-01.png,28.1833,0.0138,0.0079,8.3158 +Small,8x8,ldrs-rgba-02.png,23.8723,0.0167,0.0107,6.1204 +Small,12x12,hdr-rgb-00.hdr,20.4504,0.1050,0.0182,3.5995 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0050,0.0005,0.5625 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0049,0.0005,0.5601 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0050,0.0005,0.5470 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0005,0.5266 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0005,0.5555 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0005,0.5651 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0005,0.5540 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0005,0.5459 +Small,12x12,ldr-rgb-00.png,23.7157,0.0150,0.0077,8.4878 +Small,12x12,ldr-rgb-01.png,24.7251,0.0129,0.0057,11.5320 +Small,12x12,ldr-rgb-02.png,19.1954,0.0195,0.0122,5.3525 +Small,12x12,ldr-rgb-03.png,33.1615,0.0086,0.0016,40.1810 +Small,12x12,ldr-rgb-04.png,24.3846,0.0128,0.0056,11.7701 +Small,12x12,ldr-rgb-05.png,21.3862,0.0185,0.0112,5.8730 +Small,12x12,ldr-rgb-06.png,19.1691,0.0202,0.0129,5.0985 +Small,12x12,ldr-rgb-07.png,25.3196,0.0126,0.0054,12.0937 +Small,12x12,ldr-rgb-08.png,30.1240,0.0095,0.0025,26.3419 +Small,12x12,ldr-rgb-09.png,23.5957,0.0145,0.0073,8.9873 +Small,12x12,ldr-rgb-10.png,27.2837,0.0069,0.0018,9.0813 +Small,12x12,ldr-rgba-00.png,21.3587,0.0192,0.0118,5.5455 +Small,12x12,ldr-rgba-01.png,24.4758,0.0144,0.0069,9.4992 +Small,12x12,ldr-rgba-02.png,20.1402,0.0219,0.0144,4.5438 +Small,12x12,ldr-xy-00.png,28.8913,0.0152,0.0045,14.4955 +Small,12x12,ldr-xy-01.png,29.6644,0.0144,0.0040,16.4047 +Small,12x12,ldr-xy-02.png,37.9766,0.0115,0.0011,58.4101 +Small,12x12,ldrs-rgba-00.png,21.3601,0.0193,0.0119,5.4976 +Small,12x12,ldrs-rgba-01.png,24.4766,0.0143,0.0068,9.5967 +Small,12x12,ldrs-rgba-02.png,20.1395,0.0221,0.0146,4.4900 +Small,3x3x3,ldr-l-00-3.dds,50.6895,0.0158,0.0086,30.3758 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0071,0.0037,18.7080 +Small,6x6x6,ldr-l-00-3.dds,32.5118,0.0620,0.0504,5.1970 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0271,0.0193,3.5770 diff --git a/Test/Images/Small/astc_reference-4.4-sse4.1_medium_results.csv b/Test/Images/Small/astc_reference-4.4-sse4.1_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..3706ef873e267cb950b287cd29929abaddc2595b --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse4.1_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1462,0.1047,0.0200,3.2693 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5651 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5492 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0036,0.0005,0.5331 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0037,0.0005,0.5651 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0005,0.5150 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0005,0.5355 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0005,0.5506 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0005,0.5345 +Small,4x4,ldr-rgb-00.png,38.8432,0.0295,0.0228,2.8697 +Small,4x4,ldr-rgb-01.png,40.2258,0.0248,0.0188,3.4832 +Small,4x4,ldr-rgb-02.png,35.2933,0.0248,0.0189,3.4622 +Small,4x4,ldr-rgb-03.png,47.2820,0.0166,0.0110,5.9384 +Small,4x4,ldr-rgb-04.png,42.2203,0.0203,0.0146,4.4866 +Small,4x4,ldr-rgb-05.png,37.8177,0.0267,0.0210,3.1240 +Small,4x4,ldr-rgb-06.png,35.4758,0.0226,0.0166,3.9525 +Small,4x4,ldr-rgb-07.png,39.2847,0.0328,0.0270,2.4233 +Small,4x4,ldr-rgb-08.png,45.1880,0.0192,0.0135,4.8374 +Small,4x4,ldr-rgb-09.png,42.1624,0.0208,0.0150,4.3664 +Small,4x4,ldr-rgb-10.png,44.9412,0.0061,0.0024,6.6351 +Small,4x4,ldr-rgba-00.png,36.2597,0.0307,0.0248,2.6449 +Small,4x4,ldr-rgba-01.png,38.9707,0.0200,0.0141,4.6483 +Small,4x4,ldr-rgba-02.png,34.9421,0.0218,0.0157,4.1621 +Small,4x4,ldr-xy-00.png,37.7304,0.0197,0.0123,5.3191 +Small,4x4,ldr-xy-01.png,45.3643,0.0261,0.0189,3.4710 +Small,4x4,ldr-xy-02.png,51.1886,0.0295,0.0221,2.9648 +Small,4x4,ldrs-rgba-00.png,36.2659,0.0309,0.0249,2.6344 +Small,4x4,ldrs-rgba-01.png,38.9909,0.0202,0.0143,4.5945 +Small,4x4,ldrs-rgba-02.png,34.9450,0.0219,0.0159,4.1298 +Small,5x5,hdr-rgb-00.hdr,29.9063,0.1075,0.0229,2.8670 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0045,0.0004,0.5714 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0045,0.0005,0.5529 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0005,0.5529 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0047,0.0005,0.5388 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0047,0.0004,0.5754 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0047,0.0005,0.5323 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0046,0.0005,0.5366 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0005,0.4971 +Small,5x5,ldr-rgb-00.png,35.1487,0.0303,0.0232,2.8267 +Small,5x5,ldr-rgb-01.png,36.4456,0.0234,0.0166,3.9580 +Small,5x5,ldr-rgb-02.png,31.1355,0.0236,0.0167,3.9168 +Small,5x5,ldr-rgb-03.png,44.0259,0.0139,0.0072,9.0809 +Small,5x5,ldr-rgb-04.png,37.6738,0.0220,0.0152,4.3153 +Small,5x5,ldr-rgb-05.png,33.5459,0.0315,0.0245,2.6712 +Small,5x5,ldr-rgb-06.png,31.1791,0.0232,0.0160,4.0850 +Small,5x5,ldr-rgb-07.png,36.1557,0.0357,0.0288,2.2789 +Small,5x5,ldr-rgb-08.png,41.6368,0.0184,0.0118,5.5352 +Small,5x5,ldr-rgb-09.png,37.5922,0.0210,0.0142,4.6188 +Small,5x5,ldr-rgb-10.png,40.5794,0.0074,0.0026,6.1693 +Small,5x5,ldr-rgba-00.png,32.8173,0.0357,0.0287,2.2833 +Small,5x5,ldr-rgba-01.png,35.3162,0.0226,0.0155,4.2173 +Small,5x5,ldr-rgba-02.png,31.1464,0.0245,0.0174,3.7580 +Small,5x5,ldr-xy-00.png,37.0404,0.0208,0.0123,5.3151 +Small,5x5,ldr-xy-01.png,40.7159,0.0262,0.0179,3.6620 +Small,5x5,ldr-xy-02.png,49.1543,0.0219,0.0134,4.8948 +Small,5x5,ldrs-rgba-00.png,32.8214,0.0361,0.0290,2.2602 +Small,5x5,ldrs-rgba-01.png,35.3251,0.0227,0.0156,4.1919 +Small,5x5,ldrs-rgba-02.png,31.1476,0.0247,0.0175,3.7432 +Small,6x6,hdr-rgb-00.hdr,27.5227,0.1101,0.0242,2.7108 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0046,0.0006,0.4392 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0005,0.5628 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0005,0.5459 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0005,0.4796 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5001 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0005,0.5401 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0005,0.4941 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0044,0.0005,0.5448 +Small,6x6,ldr-rgb-00.png,32.4046,0.0322,0.0253,2.5889 +Small,6x6,ldr-rgb-01.png,33.0877,0.0241,0.0174,3.7617 +Small,6x6,ldr-rgb-02.png,27.5101,0.0245,0.0179,3.6625 +Small,6x6,ldr-rgb-03.png,41.7485,0.0118,0.0055,11.9919 +Small,6x6,ldr-rgb-04.png,34.2066,0.0211,0.0145,4.5266 +Small,6x6,ldr-rgb-05.png,30.1436,0.0326,0.0260,2.5217 +Small,6x6,ldr-rgb-06.png,27.5774,0.0242,0.0174,3.7572 +Small,6x6,ldr-rgb-07.png,33.8833,0.0351,0.0282,2.3207 +Small,6x6,ldr-rgb-08.png,39.2140,0.0158,0.0093,7.0348 +Small,6x6,ldr-rgb-09.png,33.6689,0.0206,0.0141,4.6575 +Small,6x6,ldr-rgb-10.png,36.9896,0.0073,0.0028,5.8286 +Small,6x6,ldr-rgba-00.png,30.2544,0.0391,0.0323,2.0309 +Small,6x6,ldr-rgba-01.png,32.2005,0.0235,0.0165,3.9601 +Small,6x6,ldr-rgba-02.png,27.8556,0.0265,0.0196,3.3483 +Small,6x6,ldr-xy-00.png,36.1662,0.0192,0.0110,5.9839 +Small,6x6,ldr-xy-01.png,38.0135,0.0218,0.0137,4.7858 +Small,6x6,ldr-xy-02.png,46.1312,0.0183,0.0101,6.4886 +Small,6x6,ldrs-rgba-00.png,30.2495,0.0391,0.0324,2.0255 +Small,6x6,ldrs-rgba-01.png,32.2065,0.0234,0.0166,3.9572 +Small,6x6,ldrs-rgba-02.png,27.8520,0.0264,0.0195,3.3622 +Small,8x8,hdr-rgb-00.hdr,24.1390,0.1184,0.0318,2.0578 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0052,0.0006,0.4498 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0049,0.0004,0.5795 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0051,0.0005,0.5529 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0051,0.0005,0.5079 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0050,0.0004,0.5887 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0050,0.0005,0.5289 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0050,0.0005,0.5423 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0051,0.0005,0.5470 +Small,8x8,ldr-rgb-00.png,28.7594,0.0419,0.0344,1.9028 +Small,8x8,ldr-rgb-01.png,28.9369,0.0294,0.0222,2.9576 +Small,8x8,ldr-rgb-02.png,23.1670,0.0320,0.0246,2.6591 +Small,8x8,ldr-rgb-03.png,38.5914,0.0138,0.0069,9.5560 +Small,8x8,ldr-rgb-04.png,29.6483,0.0293,0.0220,2.9845 +Small,8x8,ldr-rgb-05.png,25.9418,0.0404,0.0332,1.9761 +Small,8x8,ldr-rgb-06.png,23.2010,0.0320,0.0245,2.6772 +Small,8x8,ldr-rgb-07.png,30.7551,0.0429,0.0354,1.8502 +Small,8x8,ldr-rgb-08.png,35.9297,0.0190,0.0119,5.4924 +Small,8x8,ldr-rgb-09.png,28.9847,0.0268,0.0195,3.3625 +Small,8x8,ldr-rgb-10.png,32.1811,0.0092,0.0039,4.2145 +Small,8x8,ldr-rgba-00.png,26.4734,0.0495,0.0419,1.5657 +Small,8x8,ldr-rgba-01.png,28.3748,0.0299,0.0224,2.9250 +Small,8x8,ldr-rgba-02.png,23.9432,0.0340,0.0264,2.4855 +Small,8x8,ldr-xy-00.png,33.9578,0.0260,0.0157,4.1815 +Small,8x8,ldr-xy-01.png,34.9740,0.0260,0.0158,4.1350 +Small,8x8,ldr-xy-02.png,41.6833,0.0205,0.0105,6.2518 +Small,8x8,ldrs-rgba-00.png,26.4748,0.0493,0.0418,1.5689 +Small,8x8,ldrs-rgba-01.png,28.3782,0.0297,0.0223,2.9409 +Small,8x8,ldrs-rgba-02.png,23.9434,0.0338,0.0263,2.4961 +Small,12x12,hdr-rgb-00.hdr,20.7679,0.1367,0.0473,1.3863 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0080,0.0006,0.4654 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0079,0.0005,0.5321 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0079,0.0005,0.5470 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0081,0.0005,0.5039 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0083,0.0005,0.5412 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0079,0.0005,0.5555 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0080,0.0005,0.5540 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0079,0.0005,0.5651 +Small,12x12,ldr-rgb-00.png,24.6928,0.0530,0.0424,1.5444 +Small,12x12,ldr-rgb-01.png,25.0361,0.0397,0.0295,2.2210 +Small,12x12,ldr-rgb-02.png,19.2723,0.0471,0.0367,1.7872 +Small,12x12,ldr-rgb-03.png,34.9910,0.0175,0.0077,8.4627 +Small,12x12,ldr-rgb-04.png,24.8973,0.0383,0.0280,2.3366 +Small,12x12,ldr-rgb-05.png,21.6527,0.0536,0.0431,1.5202 +Small,12x12,ldr-rgb-06.png,19.2558,0.0472,0.0369,1.7784 +Small,12x12,ldr-rgb-07.png,26.7423,0.0487,0.0385,1.7022 +Small,12x12,ldr-rgb-08.png,31.6843,0.0227,0.0127,5.1401 +Small,12x12,ldr-rgb-09.png,24.1545,0.0369,0.0267,2.4512 +Small,12x12,ldr-rgb-10.png,28.0447,0.0165,0.0084,1.9327 +Small,12x12,ldr-rgba-00.png,22.2585,0.0590,0.0486,1.3498 +Small,12x12,ldr-rgba-01.png,24.6414,0.0388,0.0283,2.3162 +Small,12x12,ldr-rgba-02.png,20.1882,0.0501,0.0396,1.6550 +Small,12x12,ldr-xy-00.png,30.2558,0.0329,0.0189,3.4751 +Small,12x12,ldr-xy-01.png,31.8636,0.0344,0.0206,3.1798 +Small,12x12,ldr-xy-02.png,38.5089,0.0184,0.0045,14.5415 +Small,12x12,ldrs-rgba-00.png,22.2585,0.0596,0.0492,1.3307 +Small,12x12,ldrs-rgba-01.png,24.6434,0.0393,0.0287,2.2833 +Small,12x12,ldrs-rgba-02.png,20.1890,0.0510,0.0403,1.6271 +Small,3x3x3,ldr-l-00-3.dds,51.8899,0.0216,0.0127,20.6171 +Small,3x3x3,ldr-l-01-3.dds,54.6239,0.0092,0.0040,17.2562 +Small,6x6x6,ldr-l-00-3.dds,32.9631,0.0742,0.0604,4.3398 +Small,6x6x6,ldr-l-01-3.dds,41.0369,0.0294,0.0194,3.5602 diff --git a/Test/Images/Small/astc_reference-4.4-sse4.1_thorough_results.csv b/Test/Images/Small/astc_reference-4.4-sse4.1_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..d57276593685cd5847b52f18fb26970e929ce635 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.4-sse4.1_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.4205,0.1248,0.0397,1.6492 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0037,0.0006,0.4506 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5412 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5832 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5791 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5742 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0005,0.5529 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0037,0.0005,0.5089 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0036,0.0005,0.5321 +Small,4x4,ldr-rgb-00.png,39.1635,0.0510,0.0451,1.4547 +Small,4x4,ldr-rgb-01.png,40.4120,0.0485,0.0427,1.5353 +Small,4x4,ldr-rgb-02.png,35.4711,0.0458,0.0400,1.6398 +Small,4x4,ldr-rgb-03.png,47.7527,0.0459,0.0403,1.6275 +Small,4x4,ldr-rgb-04.png,42.3660,0.0413,0.0355,1.8438 +Small,4x4,ldr-rgb-05.png,37.9925,0.0498,0.0440,1.4890 +Small,4x4,ldr-rgb-06.png,35.6403,0.0408,0.0349,1.8790 +Small,4x4,ldr-rgb-07.png,39.8791,0.0605,0.0546,1.1994 +Small,4x4,ldr-rgb-08.png,45.8775,0.0445,0.0390,1.6814 +Small,4x4,ldr-rgb-09.png,42.2993,0.0445,0.0388,1.6883 +Small,4x4,ldr-rgb-10.png,45.1694,0.0090,0.0053,3.0951 +Small,4x4,ldr-rgba-00.png,36.7416,0.0539,0.0480,1.3641 +Small,4x4,ldr-rgba-01.png,39.1154,0.0389,0.0329,1.9911 +Small,4x4,ldr-rgba-02.png,35.0328,0.0390,0.0329,1.9931 +Small,4x4,ldr-xy-00.png,37.7724,0.0475,0.0402,1.6290 +Small,4x4,ldr-xy-01.png,45.4608,0.0534,0.0462,1.4175 +Small,4x4,ldr-xy-02.png,51.1938,0.0701,0.0626,1.0473 +Small,4x4,ldrs-rgba-00.png,36.7495,0.0549,0.0489,1.3412 +Small,4x4,ldrs-rgba-01.png,39.1372,0.0393,0.0333,1.9693 +Small,4x4,ldrs-rgba-02.png,35.0344,0.0393,0.0331,1.9783 +Small,5x5,hdr-rgb-00.hdr,30.3005,0.1299,0.0439,1.4927 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0047,0.0005,0.4730 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0046,0.0005,0.5412 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0047,0.0005,0.5388 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0046,0.0005,0.5390 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0046,0.0005,0.5377 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0047,0.0005,0.5518 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0046,0.0005,0.5459 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0046,0.0005,0.5401 +Small,5x5,ldr-rgb-00.png,35.3880,0.0592,0.0521,1.2573 +Small,5x5,ldr-rgb-01.png,36.5413,0.0519,0.0449,1.4603 +Small,5x5,ldr-rgb-02.png,31.1967,0.0454,0.0384,1.7050 +Small,5x5,ldr-rgb-03.png,44.5932,0.0523,0.0457,1.4342 +Small,5x5,ldr-rgb-04.png,37.8267,0.0471,0.0402,1.6312 +Small,5x5,ldr-rgb-05.png,33.6963,0.0593,0.0524,1.2498 +Small,5x5,ldr-rgb-06.png,31.2331,0.0434,0.0364,1.8018 +Small,5x5,ldr-rgb-07.png,36.7232,0.0718,0.0648,1.0107 +Small,5x5,ldr-rgb-08.png,42.3949,0.0505,0.0438,1.4949 +Small,5x5,ldr-rgb-09.png,37.7126,0.0521,0.0452,1.4511 +Small,5x5,ldr-rgb-10.png,40.7580,0.0109,0.0060,2.6883 +Small,5x5,ldr-rgba-00.png,33.1240,0.0645,0.0574,1.1408 +Small,5x5,ldr-rgba-01.png,35.4134,0.0451,0.0381,1.7205 +Small,5x5,ldr-rgba-02.png,31.1844,0.0440,0.0368,1.7796 +Small,5x5,ldr-xy-00.png,37.1442,0.0547,0.0462,1.4194 +Small,5x5,ldr-xy-01.png,41.4542,0.0641,0.0557,1.1770 +Small,5x5,ldr-xy-02.png,49.3313,0.0767,0.0682,0.9612 +Small,5x5,ldrs-rgba-00.png,33.1272,0.0648,0.0577,1.1351 +Small,5x5,ldrs-rgba-01.png,35.4217,0.0461,0.0390,1.6806 +Small,5x5,ldrs-rgba-02.png,31.1853,0.0443,0.0371,1.7672 +Small,6x6,hdr-rgb-00.hdr,27.7238,0.1337,0.0478,1.3718 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0005,0.4876 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0004,0.5858 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0044,0.0004,0.5845 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0043,0.0005,0.5578 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0044,0.0005,0.5639 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0046,0.0005,0.4732 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0004,0.5804 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0005,0.5481 +Small,6x6,ldr-rgb-00.png,32.6509,0.0658,0.0590,1.1105 +Small,6x6,ldr-rgb-01.png,33.1881,0.0568,0.0501,1.3090 +Small,6x6,ldr-rgb-02.png,27.5552,0.0491,0.0424,1.5443 +Small,6x6,ldr-rgb-03.png,42.5885,0.0451,0.0387,1.6937 +Small,6x6,ldr-rgb-04.png,34.3416,0.0494,0.0428,1.5317 +Small,6x6,ldr-rgb-05.png,30.2875,0.0631,0.0564,1.1615 +Small,6x6,ldr-rgb-06.png,27.6306,0.0471,0.0403,1.6255 +Small,6x6,ldr-rgb-07.png,34.4380,0.0773,0.0706,0.9282 +Small,6x6,ldr-rgb-08.png,40.0373,0.0454,0.0389,1.6861 +Small,6x6,ldr-rgb-09.png,33.8118,0.0526,0.0459,1.4287 +Small,6x6,ldr-rgb-10.png,37.1861,0.0120,0.0074,2.1932 +Small,6x6,ldr-rgba-00.png,30.5164,0.0728,0.0659,0.9947 +Small,6x6,ldr-rgba-01.png,32.2794,0.0515,0.0444,1.4746 +Small,6x6,ldr-rgba-02.png,27.8936,0.0483,0.0412,1.5911 +Small,6x6,ldr-xy-00.png,36.2540,0.0471,0.0387,1.6928 +Small,6x6,ldr-xy-01.png,38.0244,0.0646,0.0564,1.1619 +Small,6x6,ldr-xy-02.png,47.5902,0.0809,0.0725,0.9034 +Small,6x6,ldrs-rgba-00.png,30.5127,0.0720,0.0651,1.0064 +Small,6x6,ldrs-rgba-01.png,32.2857,0.0514,0.0445,1.4712 +Small,6x6,ldrs-rgba-02.png,27.8909,0.0481,0.0412,1.5916 +Small,8x8,hdr-rgb-00.hdr,24.3460,0.1543,0.0658,0.9964 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0064,0.0005,0.5182 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0063,0.0005,0.5563 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0004,0.5791 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0064,0.0005,0.5552 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0063,0.0005,0.5470 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0063,0.0005,0.5390 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0063,0.0004,0.5690 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0068,0.0005,0.4793 +Small,8x8,ldr-rgb-00.png,28.9780,0.0867,0.0779,0.8409 +Small,8x8,ldr-rgb-01.png,29.0210,0.0713,0.0626,1.0463 +Small,8x8,ldr-rgb-02.png,23.2052,0.0667,0.0580,1.1303 +Small,8x8,ldr-rgb-03.png,39.4314,0.0336,0.0252,2.6057 +Small,8x8,ldr-rgb-04.png,29.7779,0.0639,0.0552,1.1873 +Small,8x8,ldr-rgb-05.png,26.0426,0.0790,0.0704,0.9308 +Small,8x8,ldr-rgb-06.png,23.2530,0.0644,0.0557,1.1764 +Small,8x8,ldr-rgb-07.png,31.2138,0.0971,0.0881,0.7435 +Small,8x8,ldr-rgb-08.png,36.5612,0.0487,0.0403,1.6248 +Small,8x8,ldr-rgb-09.png,29.1484,0.0561,0.0475,1.3802 +Small,8x8,ldr-rgb-10.png,32.3330,0.0163,0.0097,1.6792 +Small,8x8,ldr-rgba-00.png,26.7531,0.0964,0.0875,0.7487 +Small,8x8,ldr-rgba-01.png,28.4341,0.0691,0.0602,1.0878 +Small,8x8,ldr-rgba-02.png,23.9687,0.0636,0.0547,1.1984 +Small,8x8,ldr-xy-00.png,34.2380,0.0579,0.0476,1.3782 +Small,8x8,ldr-xy-01.png,35.3165,0.0587,0.0485,1.3523 +Small,8x8,ldr-xy-02.png,44.6234,0.0741,0.0638,1.0266 +Small,8x8,ldrs-rgba-00.png,26.7540,0.0952,0.0863,0.7591 +Small,8x8,ldrs-rgba-01.png,28.4376,0.0696,0.0607,1.0800 +Small,8x8,ldrs-rgba-02.png,23.9689,0.0637,0.0547,1.1978 +Small,12x12,hdr-rgb-00.hdr,21.0311,0.1923,0.1000,0.6555 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0106,0.0006,0.4430 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0104,0.0004,0.5845 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0105,0.0005,0.5589 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0104,0.0004,0.5913 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0103,0.0005,0.5481 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0103,0.0004,0.5751 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0103,0.0005,0.5675 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0102,0.0005,0.5540 +Small,12x12,ldr-rgb-00.png,25.0530,0.1176,0.1046,0.6267 +Small,12x12,ldr-rgb-01.png,25.1392,0.0963,0.0835,0.7853 +Small,12x12,ldr-rgb-02.png,19.2921,0.1060,0.0929,0.7056 +Small,12x12,ldr-rgb-03.png,36.1864,0.0396,0.0273,2.4022 +Small,12x12,ldr-rgb-04.png,24.9919,0.0873,0.0745,0.8792 +Small,12x12,ldr-rgb-05.png,21.7388,0.1060,0.0932,0.7035 +Small,12x12,ldr-rgb-06.png,19.2959,0.1035,0.0904,0.7250 +Small,12x12,ldr-rgb-07.png,27.1136,0.1225,0.1098,0.5969 +Small,12x12,ldr-rgb-08.png,32.5295,0.0506,0.0381,1.7192 +Small,12x12,ldr-rgb-09.png,24.3026,0.0817,0.0690,0.9501 +Small,12x12,ldr-rgb-10.png,28.1806,0.0281,0.0175,0.9296 +Small,12x12,ldr-rgba-00.png,22.7565,0.1241,0.1109,0.5907 +Small,12x12,ldr-rgba-01.png,24.7322,0.1001,0.0870,0.7531 +Small,12x12,ldr-rgba-02.png,20.2051,0.1034,0.0901,0.7271 +Small,12x12,ldr-xy-00.png,30.5347,0.0788,0.0644,1.0172 +Small,12x12,ldr-xy-01.png,32.2811,0.0626,0.0483,1.3567 +Small,12x12,ldr-xy-02.png,40.3051,0.0448,0.0303,2.1614 +Small,12x12,ldrs-rgba-00.png,22.7551,0.1263,0.1133,0.5783 +Small,12x12,ldrs-rgba-01.png,24.7337,0.0999,0.0869,0.7539 +Small,12x12,ldrs-rgba-02.png,20.2055,0.1040,0.0906,0.7231 +Small,3x3x3,ldr-l-00-3.dds,52.3291,0.0370,0.0281,9.3200 +Small,3x3x3,ldr-l-01-3.dds,55.2576,0.0162,0.0110,6.2457 +Small,6x6x6,ldr-l-00-3.dds,33.2763,0.1021,0.0854,3.0691 +Small,6x6x6,ldr-l-01-3.dds,41.7183,0.0330,0.0201,3.4313 diff --git a/Test/Images/Small/astc_reference-4.5-avx2_fast_results.csv b/Test/Images/Small/astc_reference-4.5-avx2_fast_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..75776a08b9d180bd24c8d5ababa1ef20c77e8737 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.5-avx2_fast_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.7281,0.0967,0.0120,5.4806 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0030,0.0005,0.5334 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0028,0.0004,0.5955 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0028,0.0004,0.5804 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0029,0.0005,0.5563 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0028,0.0004,0.5939 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0028,0.0004,0.5887 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0028,0.0004,0.5739 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0028,0.0004,0.5979 +Small,4x4,ldr-rgb-00.png,38.2569,0.0132,0.0080,8.1928 +Small,4x4,ldr-rgb-01.png,39.9470,0.0118,0.0069,9.5354 +Small,4x4,ldr-rgb-02.png,35.1660,0.0158,0.0107,6.1197 +Small,4x4,ldr-rgb-03.png,46.1020,0.0072,0.0025,26.0572 +Small,4x4,ldr-rgb-04.png,41.9998,0.0096,0.0046,14.1028 +Small,4x4,ldr-rgb-05.png,37.3375,0.0156,0.0106,6.1582 +Small,4x4,ldr-rgb-06.png,35.3601,0.0148,0.0098,6.6648 +Small,4x4,ldr-rgb-07.png,38.1498,0.0157,0.0108,6.0526 +Small,4x4,ldr-rgb-08.png,43.8943,0.0086,0.0039,16.6250 +Small,4x4,ldr-rgb-09.png,41.9436,0.0096,0.0047,13.8666 +Small,4x4,ldr-rgb-10.png,44.4607,0.0043,0.0014,11.7536 +Small,4x4,ldr-rgba-00.png,35.6023,0.0159,0.0106,6.2101 +Small,4x4,ldr-rgba-01.png,38.8858,0.0114,0.0062,10.5600 +Small,4x4,ldr-rgba-02.png,34.8778,0.0143,0.0089,7.3676 +Small,4x4,ldr-xy-00.png,37.5551,0.0116,0.0045,14.4604 +Small,4x4,ldr-xy-01.png,44.3046,0.0122,0.0051,12.7826 +Small,4x4,ldr-xy-02.png,48.2608,0.0104,0.0032,20.2907 +Small,4x4,ldrs-rgba-00.png,35.6078,0.0159,0.0105,6.2208 +Small,4x4,ldrs-rgba-01.png,38.9075,0.0116,0.0064,10.3159 +Small,4x4,ldrs-rgba-02.png,34.8785,0.0143,0.0089,7.3603 +Small,5x5,hdr-rgb-00.hdr,29.5480,0.0983,0.0121,5.4228 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0035,0.0005,0.5456 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0035,0.0005,0.5481 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5942 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5845 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5965 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.6066 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.6066 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,5x5,ldr-rgb-00.png,34.4341,0.0133,0.0075,8.7720 +Small,5x5,ldr-rgb-01.png,36.2623,0.0106,0.0051,12.9312 +Small,5x5,ldr-rgb-02.png,31.0936,0.0136,0.0080,8.1787 +Small,5x5,ldr-rgb-03.png,42.8088,0.0074,0.0021,30.5386 +Small,5x5,ldr-rgb-04.png,37.2825,0.0099,0.0043,15.2270 +Small,5x5,ldr-rgb-05.png,33.2757,0.0161,0.0103,6.3919 +Small,5x5,ldr-rgb-06.png,31.1333,0.0136,0.0079,8.3413 +Small,5x5,ldr-rgb-07.png,35.0677,0.0138,0.0082,7.9465 +Small,5x5,ldr-rgb-08.png,40.2429,0.0086,0.0032,20.3463 +Small,5x5,ldr-rgb-09.png,37.3051,0.0101,0.0045,14.5438 +Small,5x5,ldr-rgb-10.png,40.2131,0.0048,0.0012,13.2806 +Small,5x5,ldr-rgba-00.png,32.1489,0.0164,0.0106,6.1919 +Small,5x5,ldr-rgba-01.png,35.2139,0.0118,0.0059,11.0927 +Small,5x5,ldr-rgba-02.png,31.1368,0.0143,0.0084,7.7603 +Small,5x5,ldr-xy-00.png,36.7495,0.0115,0.0035,18.7412 +Small,5x5,ldr-xy-01.png,39.8321,0.0123,0.0043,15.2160 +Small,5x5,ldr-xy-02.png,43.9343,0.0111,0.0031,21.4179 +Small,5x5,ldrs-rgba-00.png,32.1529,0.0165,0.0106,6.1617 +Small,5x5,ldrs-rgba-01.png,35.2217,0.0117,0.0058,11.3132 +Small,5x5,ldrs-rgba-02.png,31.1375,0.0145,0.0084,7.8253 +Small,6x6,hdr-rgb-00.hdr,27.0790,0.0982,0.0119,5.5286 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0034,0.0005,0.5540 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0034,0.0005,0.5412 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0033,0.0004,0.5913 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5742 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5871 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5952 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.6066 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.5887 +Small,6x6,ldr-rgb-00.png,31.7166,0.0145,0.0088,7.4329 +Small,6x6,ldr-rgb-01.png,32.9399,0.0113,0.0059,11.0909 +Small,6x6,ldr-rgb-02.png,27.4804,0.0141,0.0086,7.6561 +Small,6x6,ldr-rgb-03.png,40.6162,0.0073,0.0021,31.7045 +Small,6x6,ldr-rgb-04.png,33.9381,0.0104,0.0048,13.5991 +Small,6x6,ldr-rgb-05.png,29.9812,0.0172,0.0116,5.6312 +Small,6x6,ldr-rgb-06.png,27.5471,0.0140,0.0085,7.6902 +Small,6x6,ldr-rgb-07.png,32.9397,0.0133,0.0078,8.3707 +Small,6x6,ldr-rgb-08.png,37.8487,0.0085,0.0032,20.6675 +Small,6x6,ldr-rgb-09.png,33.5003,0.0104,0.0050,13.2178 +Small,6x6,ldr-rgb-10.png,36.6941,0.0049,0.0014,11.5544 +Small,6x6,ldr-rgba-00.png,29.6087,0.0177,0.0120,5.4791 +Small,6x6,ldr-rgba-01.png,32.0982,0.0122,0.0065,10.1573 +Small,6x6,ldr-rgba-02.png,27.8405,0.0149,0.0090,7.2527 +Small,6x6,ldr-xy-00.png,35.9075,0.0113,0.0036,18.2655 +Small,6x6,ldr-xy-01.png,37.1654,0.0128,0.0050,13.1382 +Small,6x6,ldr-xy-02.png,41.9299,0.0109,0.0029,22.6685 +Small,6x6,ldrs-rgba-00.png,29.6033,0.0178,0.0120,5.4769 +Small,6x6,ldrs-rgba-01.png,32.1035,0.0123,0.0065,10.1229 +Small,6x6,ldrs-rgba-02.png,27.8382,0.0148,0.0089,7.3258 +Small,8x8,hdr-rgb-00.hdr,23.7844,0.1000,0.0141,4.6431 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0036,0.0004,0.5939 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.6012 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5965 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0036,0.0005,0.5648 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0036,0.0004,0.5952 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0036,0.0004,0.5926 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5926 +Small,8x8,ldr-rgb-00.png,28.0676,0.0155,0.0095,6.9247 +Small,8x8,ldr-rgb-01.png,28.7806,0.0133,0.0076,8.6242 +Small,8x8,ldr-rgb-02.png,23.1041,0.0172,0.0115,5.6914 +Small,8x8,ldr-rgb-03.png,37.3709,0.0078,0.0023,28.2013 +Small,8x8,ldr-rgb-04.png,29.3495,0.0126,0.0068,9.6462 +Small,8x8,ldr-rgb-05.png,25.8037,0.0190,0.0133,4.9409 +Small,8x8,ldr-rgb-06.png,23.1652,0.0174,0.0115,5.6944 +Small,8x8,ldr-rgb-07.png,29.8451,0.0132,0.0075,8.7185 +Small,8x8,ldr-rgb-08.png,34.5025,0.0089,0.0035,18.8054 +Small,8x8,ldr-rgb-09.png,28.6427,0.0122,0.0065,10.0980 +Small,8x8,ldr-rgb-10.png,31.9962,0.0053,0.0017,9.6823 +Small,8x8,ldr-rgba-00.png,25.7043,0.0189,0.0130,5.0545 +Small,8x8,ldr-rgba-01.png,28.2957,0.0146,0.0088,7.4848 +Small,8x8,ldr-rgba-02.png,23.9357,0.0187,0.0126,5.2141 +Small,8x8,ldr-xy-00.png,33.3347,0.0129,0.0045,14.4993 +Small,8x8,ldr-xy-01.png,34.3877,0.0138,0.0054,12.2157 +Small,8x8,ldr-xy-02.png,39.8793,0.0102,0.0020,33.3024 +Small,8x8,ldrs-rgba-00.png,25.7036,0.0191,0.0132,4.9815 +Small,8x8,ldrs-rgba-01.png,28.2982,0.0150,0.0089,7.3977 +Small,8x8,ldrs-rgba-02.png,23.9357,0.0189,0.0128,5.1188 +Small,12x12,hdr-rgb-00.hdr,20.5374,0.1077,0.0204,3.2108 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0055,0.0005,0.4960 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0054,0.0004,0.6039 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0054,0.0004,0.5939 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0054,0.0004,0.5871 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0055,0.0004,0.5702 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0054,0.0004,0.5845 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0054,0.0004,0.5832 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0054,0.0004,0.5929 +Small,12x12,ldr-rgb-00.png,23.7935,0.0160,0.0084,7.8440 +Small,12x12,ldr-rgb-01.png,24.7788,0.0136,0.0060,10.8759 +Small,12x12,ldr-rgb-02.png,19.2303,0.0211,0.0135,4.8595 +Small,12x12,ldr-rgb-03.png,33.2628,0.0089,0.0016,41.7430 +Small,12x12,ldr-rgb-04.png,24.5747,0.0135,0.0058,11.2296 +Small,12x12,ldr-rgb-05.png,21.4927,0.0194,0.0117,5.5880 +Small,12x12,ldr-rgb-06.png,19.2272,0.0219,0.0140,4.6745 +Small,12x12,ldr-rgb-07.png,25.3785,0.0131,0.0055,11.9940 +Small,12x12,ldr-rgb-08.png,30.3013,0.0101,0.0027,24.6749 +Small,12x12,ldr-rgb-09.png,23.7371,0.0152,0.0075,8.7826 +Small,12x12,ldr-rgb-10.png,27.3251,0.0076,0.0021,7.9025 +Small,12x12,ldr-rgba-00.png,21.6082,0.0213,0.0135,4.8675 +Small,12x12,ldr-rgba-01.png,24.5280,0.0152,0.0073,8.9900 +Small,12x12,ldr-rgba-02.png,20.1750,0.0241,0.0160,4.1004 +Small,12x12,ldr-xy-00.png,29.2247,0.0158,0.0047,14.0876 +Small,12x12,ldr-xy-01.png,30.5463,0.0150,0.0041,16.0232 +Small,12x12,ldr-xy-02.png,37.9988,0.0118,0.0010,65.2762 +Small,12x12,ldrs-rgba-00.png,21.6128,0.0214,0.0136,4.8224 +Small,12x12,ldrs-rgba-01.png,24.5296,0.0152,0.0074,8.8311 +Small,12x12,ldrs-rgba-02.png,20.1745,0.0239,0.0160,4.0917 +Small,3x3x3,ldr-l-00-3.dds,50.8347,0.0152,0.0076,34.5932 +Small,3x3x3,ldr-l-01-3.dds,54.0740,0.0074,0.0032,21.6325 +Small,6x6x6,ldr-l-00-3.dds,32.5284,0.0459,0.0348,7.5407 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0211,0.0135,5.1151 diff --git a/Test/Images/Small/astc_reference-4.5-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-4.5-avx2_fastest_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..21c8783d65ad4e5d4bf40c750fb07b174da1e5b1 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.5-avx2_fastest_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,33.3455,0.0914,0.0074,8.8029 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0024,0.0006,0.4444 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0022,0.0004,0.5982 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0022,0.0004,0.5913 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0023,0.0004,0.5913 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0023,0.0004,0.5779 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0023,0.0004,0.5871 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0022,0.0004,0.5995 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0022,0.0004,0.5900 +Small,4x4,ldr-rgb-00.png,37.2529,0.0091,0.0044,14.7601 +Small,4x4,ldr-rgb-01.png,39.5638,0.0086,0.0043,15.3084 +Small,4x4,ldr-rgb-02.png,34.7942,0.0106,0.0060,10.9649 +Small,4x4,ldr-rgb-03.png,45.5124,0.0061,0.0020,33.0144 +Small,4x4,ldr-rgb-04.png,41.7336,0.0075,0.0031,21.3266 +Small,4x4,ldr-rgb-05.png,36.8693,0.0107,0.0062,10.5552 +Small,4x4,ldr-rgb-06.png,34.9652,0.0101,0.0055,11.8085 +Small,4x4,ldr-rgb-07.png,37.3689,0.0103,0.0059,11.1894 +Small,4x4,ldr-rgb-08.png,43.0306,0.0066,0.0025,26.3621 +Small,4x4,ldr-rgb-09.png,41.7486,0.0075,0.0031,21.0990 +Small,4x4,ldr-rgb-10.png,43.9452,0.0035,0.0011,14.9687 +Small,4x4,ldr-rgba-00.png,34.7374,0.0105,0.0059,11.1834 +Small,4x4,ldr-rgba-01.png,38.6951,0.0092,0.0045,14.4194 +Small,4x4,ldr-rgba-02.png,34.5660,0.0110,0.0062,10.5112 +Small,4x4,ldr-xy-00.png,37.5260,0.0098,0.0033,19.7527 +Small,4x4,ldr-xy-01.png,43.9781,0.0101,0.0035,18.5078 +Small,4x4,ldr-xy-02.png,48.2748,0.0091,0.0026,25.3507 +Small,4x4,ldrs-rgba-00.png,34.7414,0.0107,0.0061,10.8237 +Small,4x4,ldrs-rgba-01.png,38.7117,0.0092,0.0045,14.4225 +Small,4x4,ldrs-rgba-02.png,34.5694,0.0111,0.0064,10.2900 +Small,5x5,hdr-rgb-00.hdr,28.8745,0.0934,0.0074,8.8802 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0027,0.0005,0.5555 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0026,0.0004,0.6012 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0026,0.0004,0.6066 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5896 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.6066 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5969 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0027,0.0005,0.5437 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0026,0.0004,0.5926 +Small,5x5,ldr-rgb-00.png,33.7244,0.0093,0.0043,15.2127 +Small,5x5,ldr-rgb-01.png,36.0878,0.0084,0.0036,18.0579 +Small,5x5,ldr-rgb-02.png,30.9936,0.0106,0.0059,11.1666 +Small,5x5,ldr-rgb-03.png,42.4162,0.0061,0.0018,36.5529 +Small,5x5,ldr-rgb-04.png,37.0506,0.0081,0.0033,19.7158 +Small,5x5,ldr-rgb-05.png,32.9675,0.0111,0.0064,10.2643 +Small,5x5,ldr-rgb-06.png,31.0371,0.0104,0.0055,11.9460 +Small,5x5,ldr-rgb-07.png,34.4113,0.0101,0.0055,11.9982 +Small,5x5,ldr-rgb-08.png,39.6331,0.0068,0.0024,27.5015 +Small,5x5,ldr-rgb-09.png,37.0868,0.0080,0.0033,19.8597 +Small,5x5,ldr-rgb-10.png,39.9339,0.0039,0.0011,15.0381 +Small,5x5,ldr-rgba-00.png,31.1173,0.0108,0.0060,10.9978 +Small,5x5,ldr-rgba-01.png,35.0547,0.0093,0.0043,15.3520 +Small,5x5,ldr-rgba-02.png,31.0412,0.0114,0.0063,10.4207 +Small,5x5,ldr-xy-00.png,36.5692,0.0099,0.0028,23.4298 +Small,5x5,ldr-xy-01.png,39.2568,0.0104,0.0032,20.6086 +Small,5x5,ldr-xy-02.png,43.8559,0.0098,0.0026,25.0321 +Small,5x5,ldrs-rgba-00.png,31.1179,0.0111,0.0061,10.7332 +Small,5x5,ldrs-rgba-01.png,35.0634,0.0094,0.0044,14.8647 +Small,5x5,ldrs-rgba-02.png,31.0416,0.0113,0.0062,10.5604 +Small,6x6,hdr-rgb-00.hdr,26.7600,0.0910,0.0069,9.5660 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0028,0.0005,0.4679 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0028,0.0006,0.4461 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0027,0.0005,0.5663 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0026,0.0004,0.5804 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0026,0.0004,0.5858 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0026,0.0004,0.5939 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0026,0.0004,0.6009 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0027,0.0005,0.5678 +Small,6x6,ldr-rgb-00.png,31.3444,0.0099,0.0049,13.3281 +Small,6x6,ldr-rgb-01.png,32.8499,0.0088,0.0041,16.1779 +Small,6x6,ldr-rgb-02.png,27.3935,0.0110,0.0061,10.7825 +Small,6x6,ldr-rgb-03.png,40.3786,0.0062,0.0018,37.3019 +Small,6x6,ldr-rgb-04.png,33.7681,0.0086,0.0038,17.1338 +Small,6x6,ldr-rgb-05.png,29.7460,0.0117,0.0068,9.5716 +Small,6x6,ldr-rgb-06.png,27.4712,0.0109,0.0061,10.8041 +Small,6x6,ldr-rgb-07.png,32.3405,0.0098,0.0050,13.0732 +Small,6x6,ldr-rgb-08.png,37.4798,0.0068,0.0023,28.8950 +Small,6x6,ldr-rgb-09.png,33.3198,0.0085,0.0037,17.5238 +Small,6x6,ldr-rgb-10.png,36.5819,0.0039,0.0012,14.0757 +Small,6x6,ldr-rgba-00.png,28.8490,0.0111,0.0062,10.6426 +Small,6x6,ldr-rgba-01.png,32.0060,0.0098,0.0047,13.8519 +Small,6x6,ldr-rgba-02.png,27.7806,0.0112,0.0061,10.7808 +Small,6x6,ldr-xy-00.png,35.6139,0.0097,0.0027,23.9712 +Small,6x6,ldr-xy-01.png,36.5248,0.0104,0.0034,19.3481 +Small,6x6,ldr-xy-02.png,41.7978,0.0093,0.0023,27.9575 +Small,6x6,ldrs-rgba-00.png,28.8451,0.0114,0.0063,10.4676 +Small,6x6,ldrs-rgba-01.png,32.0127,0.0099,0.0049,13.5015 +Small,6x6,ldrs-rgba-02.png,27.7795,0.0113,0.0061,10.6649 +Small,8x8,hdr-rgb-00.hdr,23.6156,0.0961,0.0097,6.7367 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0036,0.0006,0.4491 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0035,0.0004,0.5690 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0034,0.0004,0.5982 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5817 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0034,0.0004,0.5913 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5871 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0034,0.0004,0.6084 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0034,0.0004,0.6080 +Small,8x8,ldr-rgb-00.png,27.7167,0.0125,0.0067,9.7682 +Small,8x8,ldr-rgb-01.png,28.6907,0.0112,0.0057,11.5277 +Small,8x8,ldr-rgb-02.png,23.0278,0.0141,0.0085,7.6966 +Small,8x8,ldr-rgb-03.png,37.0821,0.0071,0.0019,34.8609 +Small,8x8,ldr-rgb-04.png,29.1235,0.0108,0.0052,12.6590 +Small,8x8,ldr-rgb-05.png,25.6014,0.0153,0.0096,6.8323 +Small,8x8,ldr-rgb-06.png,23.0812,0.0143,0.0087,7.5416 +Small,8x8,ldr-rgb-07.png,29.4710,0.0112,0.0056,11.6860 +Small,8x8,ldr-rgb-08.png,33.9667,0.0080,0.0027,24.6549 +Small,8x8,ldr-rgb-09.png,28.4474,0.0105,0.0049,13.2612 +Small,8x8,ldr-rgb-10.png,31.9065,0.0048,0.0012,13.3482 +Small,8x8,ldr-rgba-00.png,25.3490,0.0149,0.0090,7.3020 +Small,8x8,ldr-rgba-01.png,28.1981,0.0122,0.0064,10.1825 +Small,8x8,ldr-rgba-02.png,23.8740,0.0149,0.0089,7.3554 +Small,8x8,ldr-xy-00.png,33.2129,0.0118,0.0035,18.9414 +Small,8x8,ldr-xy-01.png,34.1355,0.0124,0.0041,15.8458 +Small,8x8,ldr-xy-02.png,39.7699,0.0099,0.0017,38.3693 +Small,8x8,ldrs-rgba-00.png,25.3494,0.0147,0.0090,7.3125 +Small,8x8,ldrs-rgba-01.png,28.2001,0.0122,0.0065,10.1465 +Small,8x8,ldrs-rgba-02.png,23.8734,0.0147,0.0088,7.4179 +Small,12x12,hdr-rgb-00.hdr,20.4504,0.1013,0.0142,4.6266 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0050,0.0005,0.5423 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0050,0.0005,0.5345 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0050,0.0004,0.6053 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0050,0.0005,0.5687 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0050,0.0004,0.5764 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0050,0.0004,0.5982 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.5871 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0049,0.0005,0.5687 +Small,12x12,ldr-rgb-00.png,23.7161,0.0134,0.0061,10.7593 +Small,12x12,ldr-rgb-01.png,24.7331,0.0115,0.0044,14.8840 +Small,12x12,ldr-rgb-02.png,19.1961,0.0167,0.0096,6.8502 +Small,12x12,ldr-rgb-03.png,33.1683,0.0081,0.0013,48.7632 +Small,12x12,ldr-rgb-04.png,24.3855,0.0114,0.0044,15.0626 +Small,12x12,ldr-rgb-05.png,21.3869,0.0155,0.0086,7.6634 +Small,12x12,ldr-rgb-06.png,19.1690,0.0171,0.0099,6.6057 +Small,12x12,ldr-rgb-07.png,25.3202,0.0113,0.0042,15.5228 +Small,12x12,ldr-rgb-08.png,30.1264,0.0088,0.0020,32.0184 +Small,12x12,ldr-rgb-09.png,23.5982,0.0127,0.0058,11.3675 +Small,12x12,ldr-rgb-10.png,27.2845,0.0065,0.0015,10.6319 +Small,12x12,ldr-rgba-00.png,21.3617,0.0166,0.0093,7.0750 +Small,12x12,ldr-rgba-01.png,24.4897,0.0128,0.0053,12.4188 +Small,12x12,ldr-rgba-02.png,20.1411,0.0187,0.0113,5.7909 +Small,12x12,ldr-xy-00.png,28.8913,0.0141,0.0036,18.3313 +Small,12x12,ldr-xy-01.png,29.6644,0.0135,0.0031,21.0393 +Small,12x12,ldr-xy-02.png,37.9766,0.0115,0.0011,61.2473 +Small,12x12,ldrs-rgba-00.png,21.3630,0.0167,0.0094,7.0061 +Small,12x12,ldrs-rgba-01.png,24.4906,0.0129,0.0053,12.3630 +Small,12x12,ldrs-rgba-02.png,20.1404,0.0188,0.0114,5.7740 +Small,3x3x3,ldr-l-00-3.dds,50.6895,0.0143,0.0074,35.3723 +Small,3x3x3,ldr-l-01-3.dds,54.0388,0.0065,0.0032,21.8253 +Small,6x6x6,ldr-l-00-3.dds,32.5118,0.0454,0.0345,7.5986 +Small,6x6x6,ldr-l-01-3.dds,40.9269,0.0211,0.0135,5.1193 diff --git a/Test/Images/Small/astc_reference-4.5-avx2_medium_results.csv b/Test/Images/Small/astc_reference-4.5-avx2_medium_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..4c7f55b40292aa5e3cb87fd3ee96b6f75116f125 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.5-avx2_medium_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.1462,0.1032,0.0180,3.6421 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0034,0.0004,0.5807 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0034,0.0004,0.5955 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0005,0.5678 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0034,0.0004,0.5845 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.6053 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0034,0.0004,0.5969 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5871 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0035,0.0004,0.5952 +Small,4x4,ldr-rgb-00.png,38.8447,0.0256,0.0198,3.3171 +Small,4x4,ldr-rgb-01.png,40.2430,0.0226,0.0169,3.8850 +Small,4x4,ldr-rgb-02.png,35.2978,0.0230,0.0173,3.7946 +Small,4x4,ldr-rgb-03.png,47.3064,0.0149,0.0096,6.8473 +Small,4x4,ldr-rgb-04.png,42.2335,0.0189,0.0133,4.9245 +Small,4x4,ldr-rgb-05.png,37.8203,0.0244,0.0188,3.4885 +Small,4x4,ldr-rgb-06.png,35.4765,0.0208,0.0150,4.3720 +Small,4x4,ldr-rgb-07.png,39.2891,0.0297,0.0241,2.7239 +Small,4x4,ldr-rgb-08.png,45.2670,0.0174,0.0121,5.4355 +Small,4x4,ldr-rgb-09.png,42.1643,0.0193,0.0136,4.8029 +Small,4x4,ldr-rgb-10.png,44.9416,0.0060,0.0023,7.1991 +Small,4x4,ldr-rgba-00.png,36.2622,0.0276,0.0217,3.0166 +Small,4x4,ldr-rgba-01.png,38.9940,0.0183,0.0125,5.2571 +Small,4x4,ldr-rgba-02.png,34.9453,0.0200,0.0139,4.7090 +Small,4x4,ldr-xy-00.png,37.7304,0.0181,0.0108,6.0619 +Small,4x4,ldr-xy-01.png,45.3643,0.0240,0.0168,3.9037 +Small,4x4,ldr-xy-02.png,51.1886,0.0269,0.0196,3.3416 +Small,4x4,ldrs-rgba-00.png,36.2683,0.0277,0.0219,2.9990 +Small,4x4,ldrs-rgba-01.png,39.0152,0.0185,0.0126,5.2000 +Small,4x4,ldrs-rgba-02.png,34.9482,0.0200,0.0140,4.6801 +Small,5x5,hdr-rgb-00.hdr,29.9063,0.1065,0.0195,3.3581 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0046,0.0004,0.5858 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0045,0.0004,0.5900 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0004,0.5887 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0004,0.5913 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5791 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0046,0.0005,0.5651 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0046,0.0004,0.5791 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0004,0.5896 +Small,5x5,ldr-rgb-00.png,35.1493,0.0266,0.0197,3.3265 +Small,5x5,ldr-rgb-01.png,36.4584,0.0209,0.0141,4.6506 +Small,5x5,ldr-rgb-02.png,31.1362,0.0214,0.0146,4.5027 +Small,5x5,ldr-rgb-03.png,44.0254,0.0122,0.0059,11.0442 +Small,5x5,ldr-rgb-04.png,37.6864,0.0198,0.0130,5.0435 +Small,5x5,ldr-rgb-05.png,33.5492,0.0276,0.0209,3.1351 +Small,5x5,ldr-rgb-06.png,31.1811,0.0206,0.0137,4.7708 +Small,5x5,ldr-rgb-07.png,36.1585,0.0311,0.0244,2.6829 +Small,5x5,ldr-rgb-08.png,41.6847,0.0167,0.0101,6.4856 +Small,5x5,ldr-rgb-09.png,37.5941,0.0189,0.0122,5.3533 +Small,5x5,ldr-rgb-10.png,40.5906,0.0070,0.0023,7.0590 +Small,5x5,ldr-rgba-00.png,32.8187,0.0311,0.0241,2.7211 +Small,5x5,ldr-rgba-01.png,35.3326,0.0202,0.0131,5.0020 +Small,5x5,ldr-rgba-02.png,31.1493,0.0218,0.0147,4.4607 +Small,5x5,ldr-xy-00.png,37.0404,0.0187,0.0104,6.3032 +Small,5x5,ldr-xy-01.png,40.7159,0.0232,0.0150,4.3807 +Small,5x5,ldr-xy-02.png,49.1543,0.0195,0.0111,5.9101 +Small,5x5,ldrs-rgba-00.png,32.8232,0.0312,0.0243,2.6941 +Small,5x5,ldrs-rgba-01.png,35.3411,0.0202,0.0131,4.9902 +Small,5x5,ldrs-rgba-02.png,31.1502,0.0218,0.0147,4.4519 +Small,6x6,hdr-rgb-00.hdr,27.5227,0.1060,0.0200,3.2775 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0005,0.4766 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0043,0.0004,0.5804 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0043,0.0004,0.5887 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0042,0.0004,0.6122 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0005,0.5355 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0043,0.0004,0.6094 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0044,0.0004,0.5804 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0043,0.0004,0.5858 +Small,6x6,ldr-rgb-00.png,32.4047,0.0269,0.0203,3.2291 +Small,6x6,ldr-rgb-01.png,33.1026,0.0202,0.0137,4.7763 +Small,6x6,ldr-rgb-02.png,27.5112,0.0210,0.0145,4.5094 +Small,6x6,ldr-rgb-03.png,41.7463,0.0108,0.0046,14.3719 +Small,6x6,ldr-rgb-04.png,34.2123,0.0180,0.0117,5.6119 +Small,6x6,ldr-rgb-05.png,30.1467,0.0276,0.0211,3.1001 +Small,6x6,ldr-rgb-06.png,27.5763,0.0207,0.0141,4.6619 +Small,6x6,ldr-rgb-07.png,33.8876,0.0293,0.0228,2.8715 +Small,6x6,ldr-rgb-08.png,39.2539,0.0138,0.0076,8.5827 +Small,6x6,ldr-rgb-09.png,33.6738,0.0179,0.0115,5.7177 +Small,6x6,ldr-rgb-10.png,36.9931,0.0068,0.0023,6.9766 +Small,6x6,ldr-rgba-00.png,30.2533,0.0330,0.0263,2.4935 +Small,6x6,ldr-rgba-01.png,32.2127,0.0201,0.0133,4.9290 +Small,6x6,ldr-rgba-02.png,27.8543,0.0225,0.0157,4.1647 +Small,6x6,ldr-xy-00.png,36.1662,0.0171,0.0090,7.2617 +Small,6x6,ldr-xy-01.png,38.0135,0.0192,0.0112,5.8598 +Small,6x6,ldr-xy-02.png,46.1312,0.0161,0.0080,8.2176 +Small,6x6,ldrs-rgba-00.png,30.2485,0.0331,0.0264,2.4804 +Small,6x6,ldrs-rgba-01.png,32.2188,0.0202,0.0134,4.8914 +Small,6x6,ldrs-rgba-02.png,27.8512,0.0227,0.0158,4.1555 +Small,8x8,hdr-rgb-00.hdr,24.1390,0.1114,0.0250,2.6267 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0051,0.0004,0.5791 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0049,0.0004,0.5884 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0049,0.0004,0.5913 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0049,0.0004,0.5926 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0049,0.0004,0.5926 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0049,0.0004,0.5995 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0049,0.0004,0.6066 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0050,0.0004,0.5982 +Small,8x8,ldr-rgb-00.png,28.7602,0.0339,0.0267,2.4585 +Small,8x8,ldr-rgb-01.png,28.9505,0.0243,0.0173,3.7946 +Small,8x8,ldr-rgb-02.png,23.1668,0.0259,0.0188,3.4942 +Small,8x8,ldr-rgb-03.png,38.5948,0.0125,0.0055,11.8339 +Small,8x8,ldr-rgb-04.png,29.6515,0.0240,0.0169,3.8827 +Small,8x8,ldr-rgb-05.png,25.9410,0.0326,0.0254,2.5757 +Small,8x8,ldr-rgb-06.png,23.2026,0.0261,0.0189,3.4585 +Small,8x8,ldr-rgb-07.png,30.7566,0.0337,0.0265,2.4770 +Small,8x8,ldr-rgb-08.png,35.9377,0.0161,0.0093,7.0597 +Small,8x8,ldr-rgb-09.png,28.9876,0.0221,0.0151,4.3450 +Small,8x8,ldr-rgb-10.png,32.1821,0.0083,0.0032,5.1315 +Small,8x8,ldr-rgba-00.png,26.4742,0.0397,0.0322,2.0324 +Small,8x8,ldr-rgba-01.png,28.3861,0.0244,0.0171,3.8370 +Small,8x8,ldr-rgba-02.png,23.9437,0.0278,0.0204,3.2091 +Small,8x8,ldr-xy-00.png,33.9578,0.0221,0.0121,5.4018 +Small,8x8,ldr-xy-01.png,34.9740,0.0221,0.0122,5.3803 +Small,8x8,ldr-xy-02.png,41.6833,0.0180,0.0081,8.0749 +Small,8x8,ldrs-rgba-00.png,26.4759,0.0397,0.0323,2.0276 +Small,8x8,ldrs-rgba-01.png,28.3894,0.0245,0.0171,3.8385 +Small,8x8,ldrs-rgba-02.png,23.9439,0.0280,0.0206,3.1880 +Small,12x12,hdr-rgb-00.hdr,20.7679,0.1257,0.0360,1.8221 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0077,0.0004,0.5727 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0077,0.0004,0.5871 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0077,0.0004,0.5845 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0079,0.0005,0.5566 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0078,0.0004,0.5829 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0079,0.0004,0.5804 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0078,0.0004,0.5942 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0078,0.0004,0.5739 +Small,12x12,ldr-rgb-00.png,24.6929,0.0431,0.0328,1.9974 +Small,12x12,ldr-rgb-01.png,25.0453,0.0324,0.0224,2.9287 +Small,12x12,ldr-rgb-02.png,19.2722,0.0378,0.0278,2.3610 +Small,12x12,ldr-rgb-03.png,35.0023,0.0155,0.0060,10.9517 +Small,12x12,ldr-rgb-04.png,24.8982,0.0313,0.0213,3.0801 +Small,12x12,ldr-rgb-05.png,21.6540,0.0429,0.0329,1.9948 +Small,12x12,ldr-rgb-06.png,19.2563,0.0384,0.0282,2.3213 +Small,12x12,ldr-rgb-07.png,26.7438,0.0392,0.0291,2.2495 +Small,12x12,ldr-rgb-08.png,31.6917,0.0198,0.0102,6.4365 +Small,12x12,ldr-rgb-09.png,24.1554,0.0303,0.0204,3.2140 +Small,12x12,ldr-rgb-10.png,28.0456,0.0146,0.0065,2.4944 +Small,12x12,ldr-rgba-00.png,22.2625,0.0477,0.0372,1.7613 +Small,12x12,ldr-rgba-01.png,24.6525,0.0317,0.0214,3.0561 +Small,12x12,ldr-rgba-02.png,20.1885,0.0408,0.0303,2.1635 +Small,12x12,ldr-xy-00.png,30.2558,0.0284,0.0146,4.4848 +Small,12x12,ldr-xy-01.png,31.8636,0.0294,0.0156,4.2067 +Small,12x12,ldr-xy-02.png,38.5089,0.0172,0.0036,18.3423 +Small,12x12,ldrs-rgba-00.png,22.2625,0.0474,0.0371,1.7644 +Small,12x12,ldrs-rgba-01.png,24.6544,0.0319,0.0216,3.0317 +Small,12x12,ldrs-rgba-02.png,20.1884,0.0408,0.0302,2.1694 +Small,3x3x3,ldr-l-00-3.dds,51.8899,0.0193,0.0107,24.5224 +Small,3x3x3,ldr-l-01-3.dds,54.6239,0.0084,0.0034,20.2704 +Small,6x6x6,ldr-l-00-3.dds,32.9631,0.0552,0.0420,6.2402 +Small,6x6x6,ldr-l-01-3.dds,41.0369,0.0231,0.0133,5.1755 diff --git a/Test/Images/Small/astc_reference-4.5-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-4.5-avx2_thorough_results.csv new file mode 100644 index 0000000000000000000000000000000000000000..f1f642f830a06ed76bc6487cce27f7d3ad0bd616 --- /dev/null +++ b/Test/Images/Small/astc_reference-4.5-avx2_thorough_results.csv @@ -0,0 +1,150 @@ +Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate +Small,4x4,hdr-rgb-00.hdr,34.4205,0.1204,0.0355,1.8483 +Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0037,0.0005,0.4859 +Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0036,0.0005,0.5412 +Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0035,0.0004,0.5900 +Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0035,0.0004,0.5858 +Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0035,0.0004,0.5969 +Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0035,0.0004,0.6036 +Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0035,0.0004,0.5913 +Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0037,0.0005,0.5437 +Small,4x4,ldr-rgb-00.png,39.1653,0.0463,0.0403,1.6270 +Small,4x4,ldr-rgb-01.png,40.4305,0.0440,0.0383,1.7127 +Small,4x4,ldr-rgb-02.png,35.4779,0.0412,0.0355,1.8457 +Small,4x4,ldr-rgb-03.png,47.7789,0.0411,0.0358,1.8327 +Small,4x4,ldr-rgb-04.png,42.3777,0.0375,0.0318,2.0616 +Small,4x4,ldr-rgb-05.png,37.9945,0.0446,0.0389,1.6836 +Small,4x4,ldr-rgb-06.png,35.6411,0.0369,0.0311,2.1083 +Small,4x4,ldr-rgb-07.png,39.8829,0.0538,0.0481,1.3627 +Small,4x4,ldr-rgb-08.png,45.9519,0.0400,0.0347,1.8909 +Small,4x4,ldr-rgb-09.png,42.3046,0.0405,0.0347,1.8861 +Small,4x4,ldr-rgb-10.png,45.1703,0.0081,0.0045,3.6269 +Small,4x4,ldr-rgba-00.png,36.7436,0.0482,0.0421,1.5564 +Small,4x4,ldr-rgba-01.png,39.1381,0.0347,0.0288,2.2783 +Small,4x4,ldr-rgba-02.png,35.0377,0.0347,0.0286,2.2899 +Small,4x4,ldr-xy-00.png,37.7724,0.0428,0.0355,1.8449 +Small,4x4,ldr-xy-01.png,45.4608,0.0475,0.0403,1.6244 +Small,4x4,ldr-xy-02.png,51.1939,0.0612,0.0539,1.2162 +Small,4x4,ldrs-rgba-00.png,36.7515,0.0479,0.0420,1.5603 +Small,4x4,ldrs-rgba-01.png,39.1599,0.0354,0.0293,2.2390 +Small,4x4,ldrs-rgba-02.png,35.0390,0.0348,0.0288,2.2750 +Small,5x5,hdr-rgb-00.hdr,30.3005,0.1236,0.0374,1.7522 +Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0045,0.0004,0.5982 +Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0045,0.0004,0.6025 +Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0045,0.0004,0.6025 +Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0045,0.0004,0.5982 +Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0045,0.0004,0.5952 +Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0045,0.0004,0.6022 +Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0045,0.0004,0.5939 +Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0045,0.0004,0.5979 +Small,5x5,ldr-rgb-00.png,35.3902,0.0511,0.0442,1.4819 +Small,5x5,ldr-rgb-01.png,36.5553,0.0456,0.0389,1.6859 +Small,5x5,ldr-rgb-02.png,31.1974,0.0398,0.0330,1.9862 +Small,5x5,ldr-rgb-03.png,44.5998,0.0452,0.0388,1.6906 +Small,5x5,ldr-rgb-04.png,37.8369,0.0409,0.0342,1.9187 +Small,5x5,ldr-rgb-05.png,33.6969,0.0514,0.0446,1.4701 +Small,5x5,ldr-rgb-06.png,31.2355,0.0375,0.0306,2.1398 +Small,5x5,ldr-rgb-07.png,36.7265,0.0614,0.0546,1.2012 +Small,5x5,ldr-rgb-08.png,42.4358,0.0445,0.0380,1.7249 +Small,5x5,ldr-rgb-09.png,37.7154,0.0449,0.0383,1.7111 +Small,5x5,ldr-rgb-10.png,40.7599,0.0100,0.0052,3.1034 +Small,5x5,ldr-rgba-00.png,33.1255,0.0553,0.0482,1.3587 +Small,5x5,ldr-rgba-01.png,35.4348,0.0391,0.0322,2.0382 +Small,5x5,ldr-rgba-02.png,31.1872,0.0383,0.0312,2.0977 +Small,5x5,ldr-xy-00.png,37.1442,0.0467,0.0384,1.7049 +Small,5x5,ldr-xy-01.png,41.4542,0.0557,0.0475,1.3805 +Small,5x5,ldr-xy-02.png,49.3313,0.0658,0.0574,1.1419 +Small,5x5,ldrs-rgba-00.png,33.1284,0.0560,0.0490,1.3369 +Small,5x5,ldrs-rgba-01.png,35.4408,0.0397,0.0326,2.0130 +Small,5x5,ldrs-rgba-02.png,31.1882,0.0381,0.0311,2.1091 +Small,6x6,hdr-rgb-00.hdr,27.7238,0.1249,0.0394,1.6634 +Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0044,0.0005,0.5495 +Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0044,0.0004,0.5727 +Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0043,0.0004,0.6039 +Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0044,0.0004,0.5982 +Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0043,0.0004,0.5926 +Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0044,0.0004,0.5845 +Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0043,0.0004,0.5965 +Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0043,0.0004,0.6009 +Small,6x6,ldr-rgb-00.png,32.6511,0.0544,0.0478,1.3713 +Small,6x6,ldr-rgb-01.png,33.2029,0.0469,0.0403,1.6268 +Small,6x6,ldr-rgb-02.png,27.5566,0.0404,0.0339,1.9330 +Small,6x6,ldr-rgb-03.png,42.5941,0.0374,0.0311,2.1067 +Small,6x6,ldr-rgb-04.png,34.3471,0.0413,0.0347,1.8859 +Small,6x6,ldr-rgb-05.png,30.2883,0.0518,0.0453,1.4474 +Small,6x6,ldr-rgb-06.png,27.6307,0.0392,0.0325,2.0185 +Small,6x6,ldr-rgb-07.png,34.4395,0.0637,0.0571,1.1472 +Small,6x6,ldr-rgb-08.png,40.0725,0.0377,0.0314,2.0904 +Small,6x6,ldr-rgb-09.png,33.8181,0.0433,0.0368,1.7815 +Small,6x6,ldr-rgb-10.png,37.1873,0.0105,0.0060,2.7097 +Small,6x6,ldr-rgba-00.png,30.5153,0.0599,0.0531,1.2348 +Small,6x6,ldr-rgba-01.png,32.2918,0.0426,0.0357,1.8338 +Small,6x6,ldr-rgba-02.png,27.8929,0.0398,0.0328,1.9955 +Small,6x6,ldr-xy-00.png,36.2540,0.0391,0.0310,2.1143 +Small,6x6,ldr-xy-01.png,38.0244,0.0538,0.0457,1.4350 +Small,6x6,ldr-xy-02.png,47.5902,0.0671,0.0589,1.1120 +Small,6x6,ldrs-rgba-00.png,30.5116,0.0600,0.0531,1.2341 +Small,6x6,ldrs-rgba-01.png,32.2979,0.0428,0.0360,1.8188 +Small,6x6,ldrs-rgba-02.png,27.8904,0.0400,0.0330,1.9842 +Small,8x8,hdr-rgb-00.hdr,24.3460,0.1381,0.0508,1.2902 +Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0064,0.0005,0.4741 +Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0062,0.0004,0.5939 +Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0004,0.5939 +Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0004,0.5751 +Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0063,0.0004,0.5845 +Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0063,0.0004,0.5829 +Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0063,0.0004,0.5767 +Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0062,0.0004,0.5969 +Small,8x8,ldr-rgb-00.png,28.9786,0.0685,0.0598,1.0958 +Small,8x8,ldr-rgb-01.png,29.0317,0.0575,0.0491,1.3358 +Small,8x8,ldr-rgb-02.png,23.2061,0.0536,0.0449,1.4609 +Small,8x8,ldr-rgb-03.png,39.4355,0.0274,0.0191,3.4231 +Small,8x8,ldr-rgb-04.png,29.7808,0.0509,0.0423,1.5491 +Small,8x8,ldr-rgb-05.png,26.0425,0.0623,0.0538,1.2190 +Small,8x8,ldr-rgb-06.png,23.2542,0.0518,0.0432,1.5153 +Small,8x8,ldr-rgb-07.png,31.2165,0.0749,0.0663,0.9886 +Small,8x8,ldr-rgb-08.png,36.5870,0.0389,0.0306,2.1399 +Small,8x8,ldr-rgb-09.png,29.1509,0.0449,0.0363,1.8069 +Small,8x8,ldr-rgb-10.png,32.3332,0.0144,0.0077,2.1065 +Small,8x8,ldr-rgba-00.png,26.7535,0.0753,0.0666,0.9842 +Small,8x8,ldr-rgba-01.png,28.4484,0.0548,0.0461,1.4210 +Small,8x8,ldr-rgba-02.png,23.9699,0.0509,0.0419,1.5625 +Small,8x8,ldr-xy-00.png,34.2380,0.0464,0.0362,1.8083 +Small,8x8,ldr-xy-01.png,35.3165,0.0474,0.0373,1.7571 +Small,8x8,ldr-xy-02.png,44.6234,0.0590,0.0489,1.3413 +Small,8x8,ldrs-rgba-00.png,26.7544,0.0758,0.0671,0.9774 +Small,8x8,ldrs-rgba-01.png,28.4521,0.0553,0.0465,1.4089 +Small,8x8,ldrs-rgba-02.png,23.9700,0.0512,0.0424,1.5472 +Small,12x12,hdr-rgb-00.hdr,21.0311,0.1698,0.0763,0.8589 +Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0104,0.0006,0.4638 +Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0101,0.0004,0.5820 +Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0102,0.0004,0.5887 +Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0102,0.0004,0.5754 +Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0102,0.0004,0.5887 +Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0103,0.0004,0.5817 +Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0103,0.0004,0.5727 +Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0102,0.0004,0.5896 +Small,12x12,ldr-rgb-00.png,25.0540,0.0931,0.0803,0.8166 +Small,12x12,ldr-rgb-01.png,25.1449,0.0759,0.0634,1.0342 +Small,12x12,ldr-rgb-02.png,19.2913,0.0844,0.0718,0.9132 +Small,12x12,ldr-rgb-03.png,36.1893,0.0331,0.0206,3.1818 +Small,12x12,ldr-rgb-04.png,24.9923,0.0691,0.0563,1.1633 +Small,12x12,ldr-rgb-05.png,21.7396,0.0848,0.0721,0.9087 +Small,12x12,ldr-rgb-06.png,19.2966,0.0818,0.0690,0.9491 +Small,12x12,ldr-rgb-07.png,27.1152,0.0947,0.0821,0.7981 +Small,12x12,ldr-rgb-08.png,32.5339,0.0414,0.0289,2.2676 +Small,12x12,ldr-rgb-09.png,24.3034,0.0648,0.0523,1.2538 +Small,12x12,ldr-rgb-10.png,28.1786,0.0235,0.0133,1.2243 +Small,12x12,ldr-rgba-00.png,22.7580,0.0983,0.0854,0.7677 +Small,12x12,ldr-rgba-01.png,24.7473,0.0784,0.0656,0.9997 +Small,12x12,ldr-rgba-02.png,20.2061,0.0820,0.0691,0.9486 +Small,12x12,ldr-xy-00.png,30.5347,0.0630,0.0487,1.3465 +Small,12x12,ldr-xy-01.png,32.2811,0.0504,0.0361,1.8137 +Small,12x12,ldr-xy-02.png,40.3051,0.0368,0.0229,2.8627 +Small,12x12,ldrs-rgba-00.png,22.7566,0.0991,0.0863,0.7598 +Small,12x12,ldrs-rgba-01.png,24.7489,0.0787,0.0657,0.9969 +Small,12x12,ldrs-rgba-02.png,20.2062,0.0822,0.0692,0.9472 +Small,3x3x3,ldr-l-00-3.dds,52.3291,0.0325,0.0240,10.9081 +Small,3x3x3,ldr-l-01-3.dds,55.2576,0.0144,0.0094,7.3210 +Small,6x6x6,ldr-l-00-3.dds,33.2763,0.0775,0.0616,4.2547 +Small,6x6x6,ldr-l-01-3.dds,41.7183,0.0263,0.0140,4.9381 diff --git a/Test/astc_dump_binary.py b/Test/astc_dump_binary.py index 89b4ca5bc0ad132bc6f4826a1029680ce241b2df..1e8399175fb57e311df4c4d070b35a2fade5a889 100644 --- a/Test/astc_dump_binary.py +++ b/Test/astc_dump_binary.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2021 Arm Limited +# Copyright 2021-2022 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -56,7 +56,7 @@ def run_objdump(binary, symbol): result = sp.run(args, stdout=sp.PIPE, stderr=sp.PIPE, check=True, universal_newlines=True) - funcPattern = re.compile(r"^[0-9a-f]{16} <(.*)\(.*\)>:$") + funcPattern = re.compile(r"^[0-9a-f]{16} <(.*?)\(.*\)>:$") funcLines = [] funcActive = False diff --git a/Test/astc_image_sweep.py b/Test/astc_image_sweep.py index 8c829b3fcfd88cbe83187cc2ca67e676bc4681ba..575a75a21b31476fe51c7b29bde7e3ea04293fd8 100644 --- a/Test/astc_image_sweep.py +++ b/Test/astc_image_sweep.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2021 Arm Limited +# Copyright 2021-2022 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -16,7 +16,7 @@ # under the License. # ----------------------------------------------------------------------------- """ -A benchmarking sweep helper, which can genrate a performance-vs-quality sweep +A benchmarking sweep helper, which can generate a performance-vs-quality sweep for a single input images. Like other test functionality, this uses structured image directory layouts for determining image settings to pass to the codec. """ diff --git a/Test/astc_minify_test.sh b/Test/astc_minify_test.sh index b027425aa59f75cc1a7af9deb23e1a66ca71ab96..27b6f50576e7a17cee97cb366627144d019c8f9c 100755 --- a/Test/astc_minify_test.sh +++ b/Test/astc_minify_test.sh @@ -1,19 +1,21 @@ #!/bin/bash -BLOCK_SIZE=6x6 -QUALITY=-thorough +GOOD=astcenc-good.exe +BAD=astcenc-avx2.exe +BLOCK_SIZE=4x4 +QUALITY=-fastest -./astcenc/astcenc-avx2-good -tl in.png out-good.png ${BLOCK_SIZE} ${QUALITY} -silent +./bin/${GOOD} -tl in.png out-good.png ${BLOCK_SIZE} ${QUALITY} -silent -./astcenc/astcenc-avx2 -tl in.png out-bad.png ${BLOCK_SIZE} ${QUALITY} -silent +./bin/${BAD} -tl in.png out-bad.png ${BLOCK_SIZE} ${QUALITY} -silent compare out-good.png out-bad.png out-vs-out-diff.png compare in.png out-bad.png out-vs-in-diff.png -./astcenc/astc_test_autoextract ${BLOCK_SIZE} in.png out-good.png out-bad.png in-min.png +./bin/astc_test_autoextract ${BLOCK_SIZE} in.png out-good.png out-bad.png in-min.png -./astcenc/astcenc-avx2-good -tl in-min.png out-min-good.png ${BLOCK_SIZE} ${QUALITY} -silent +./bin/${GOOD} -tl in-min.png out-min-good.png ${BLOCK_SIZE} ${QUALITY} -silent -./astcenc/astcenc-avx2 -tl in-min.png out-min-bad.png ${BLOCK_SIZE} ${QUALITY} -silent +./bin/${BAD} -tl in-min.png out-min-bad.png ${BLOCK_SIZE} ${QUALITY} -silent compare out-min-good.png out-min-bad.png out-min-diff.png diff --git a/Test/astc_profile_valgrind.py b/Test/astc_profile_valgrind.py index 82ed0e95842c96268416abe1e9fcb4115b82c681..eb9a82a4568fb20d45a14436b74677e08f0e8c8e 100644 --- a/Test/astc_profile_valgrind.py +++ b/Test/astc_profile_valgrind.py @@ -33,23 +33,22 @@ import re import subprocess as sp import sys -def postprocess_cga(logfile, outfile): +def postprocess_cga(lines, outfile): """ Postprocess the output of callgrind_annotate. Args: - logfile (str): The output of callgrind_annotate. + lines ([str]): The output of callgrind_annotate. outfile (str): The output file path to write. """ - pattern = re.compile("^\s*([0-9,]+)\s+Source/(\S+):(\S+)\(.*\).*$") - - lines = logfile.splitlines() + pattern = re.compile("^\s*([0-9,]+)\s+\([ 0-9.]+%\)\s+Source/(\S+):(\S+)\(.*\).*$") totalCost = 0.0 functionTable = [] functionMap = {} for line in lines: + line = line.strip() match = pattern.match(line) if not match: continue @@ -82,13 +81,19 @@ def postprocess_cga(logfile, outfile): function[2] *= 100.0 with open(outfile, "w") as fileHandle: + + totals = 0.0 for function in functionTable: # Omit entries less than 1% load if function[2] < 1: break + totals += function[2] fileHandle.write("%5.2f%% %s\n" % (function[2], function[0])) + fileHandle.write("======\n") + fileHandle.write(f"{totals:5.2f}%\n") + def run_pass(image, noStartup, encoder, blocksize, quality): """ @@ -104,7 +109,7 @@ def run_pass(image, noStartup, encoder, blocksize, quality): Raises: CalledProcessException: Any subprocess failed. """ - binary = "./astcenc/astcenc-%s" % encoder + binary = "./bin/astcenc-%s" % encoder args = ["valgrind", "--tool=callgrind", "--callgrind-out-file=callgrind.txt", binary, "-cl", image, "out.astc", blocksize, quality, "-j", "1"] @@ -112,11 +117,15 @@ def run_pass(image, noStartup, encoder, blocksize, quality): args = ["callgrind_annotate", "callgrind.txt"] ret = sp.run(args, stdout=sp.PIPE, check=True, encoding="utf-8") - postprocess_cga(ret.stdout, "perf_%s.txt" % quality.replace("-", "")) + lines = ret.stdout.splitlines() + with open("perf_%s_cga.txt" % quality.replace("-", ""), "w") as handle: + handle.write("\n".join(lines)) + + postprocess_cga(lines, "perf_%s.txt" % quality.replace("-", "")) if noStartup: args = ["gprof2dot", "--format=callgrind", "--output=out.dot", "callgrind.txt", - "-s", "-z", "compress_block(astcenc_context const&, image_block const&, physical_compressed_block&, compression_working_buffers&)"] + "-s", "-z", "compress_block(astcenc_contexti const&, image_block const&, physical_compressed_block&, compression_working_buffers&)"] else: args = ["gprof2dot", "--format=callgrind", "--output=out.dot", "callgrind.txt", "-s", "-z", "main"] diff --git a/Test/astc_quality_test.py b/Test/astc_quality_test.py index 1d5fda8042f793d58b9b2fcffc465055a85fe1dd..6d06419378c1e0fde6ac8e19f9e434b269a41917 100644 --- a/Test/astc_quality_test.py +++ b/Test/astc_quality_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2021 Arm Limited +# Copyright 2021-2022 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -100,7 +100,7 @@ def main(): for _ in range(0, repeats): command = [ - "./astcenc/astcenc-avx2", + "./bin/astcenc-avx2", "-tl", "./Test/Images/Kodak/LDR-RGB/ldr-rgb-kodak23.png", "/dev/null", diff --git a/Test/astc_test_competitive.py b/Test/astc_test_competitive.py index 1da4e9c602a58889c18507924848cdfe980e2cc0..188f4324d7c2ab2ec539cdcfa9d57e87d2ef5e78 100644 --- a/Test/astc_test_competitive.py +++ b/Test/astc_test_competitive.py @@ -30,7 +30,7 @@ LOG_PATTERN = re.compile(r"\s*Coding rate:\s*(.*)\s*MT/s") ISPC_BIN = "./Binaries/ISPC/ispc_astc.exe" ISPC_QUALITY = ["rgba", "rgb"] -ASTC_BIN = "./astcenc/astcenc-avx2" +ASTC_BIN = "./bin/astcenc-avx2" ASTC_QUALITY = ["0", "8", "10", "20", "30", "40", "50", "60"] TEST_BLOCK_SIZES = ["4x4", "6x6", "8x8"] diff --git a/Test/astc_test_functional.py b/Test/astc_test_functional.py index 5aa92e972c931b3f639b1b6f27820eeff866cdd1..c545412bae7e437e0c9b7db6e9918537b2a027ee 100644 --- a/Test/astc_test_functional.py +++ b/Test/astc_test_functional.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2020-2022 Arm Limited +# Copyright 2020-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -649,7 +649,8 @@ class CLIPTest(CLITestBase): """ Test all valid presets are accepted """ - presets = ["-fastest", "-fast", "-medium", "-thorough", "-exhaustive"] + presets = ["-fastest", "-fast", "-medium", + "-thorough", "-verythorough", "-exhaustive"] imIn = self.get_ref_image_path("LDR", "input", "A") imOut = self.get_tmp_image_path("LDR", "decomp") @@ -680,6 +681,19 @@ class CLIPTest(CLITestBase): if tli.Image.is_format_supported(imgFormat): colIn = tli.Image(imIn).get_colors((7, 7)) colOut = tli.Image(imOut).get_colors((7, 7)) + + # Catch exception and add fallback for tga handling + # having unstable origin in ImageMagick + try: + self.assertColorSame(colIn, colOut) + continue + except AssertionError as ex: + if imgFormat != "tga": + raise ex + + # Try yflipped TGA image + colIn = tli.Image(imIn).get_colors((7, 7)) + colOut = tli.Image(imOut).get_colors((7, 1)) self.assertColorSame(colIn, colOut) def test_valid_uncomp_ldr_output_formats(self): @@ -790,27 +804,6 @@ class CLIPTest(CLITestBase): colOut = tli.Image(imOut2).get_colors((7, 7)) self.assertColorSame(colIn, colOut2) - def test_compress_mask(self): - """ - Test compression of mask textures. - """ - decompFile = self.get_tmp_image_path("LDR", "decomp") - - command = [ - self.binary, "-tl", - "./Test/Images/Small/LDR-RGB/ldr-rgb-10.png", - decompFile, "4x4", "-medium"] - - noMaskdB = float(self.exec(command, LDR_RGB_PSNR_PATTERN)) - - command.append("-mask") - maskdB = float(self.exec(command, LDR_RGB_PSNR_PATTERN)) - - # Note that this test simply asserts that the "-mask" is connected and - # affects the output. We don't test it does something useful; that it - # outside the scope of this test case. - self.assertNotEqual(noMaskdB, maskdB) - def test_compress_normal_psnr(self): """ Test compression of normal textures using PSNR error metrics. @@ -1064,7 +1057,29 @@ class CLIPTest(CLITestBase): # RMSE should get worse (higher) if we reduce search space self.assertGreater(testRMSE, refRMSE) - def test_partition_index_limit(self): + def test_2partition_index_limit(self): + """ + Test partition index limit. + """ + inputFile = "./Test/Images/Small/LDR-RGBA/ldr-rgba-00.png" + decompFile = self.get_tmp_image_path("LDR", "decomp") + + # Compute the basic image without any channel weights + command = [ + self.binary, "-tl", + inputFile, decompFile, "4x4", "-medium"] + + self.exec(command) + refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + command += ["-2partitionindexlimit", "1"] + self.exec(command) + testRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + # RMSE should get worse (higher) if we reduce search space + self.assertGreater(testRMSE, refRMSE) + + def test_3partition_index_limit(self): """ Test partition index limit. """ @@ -1079,7 +1094,29 @@ class CLIPTest(CLITestBase): self.exec(command) refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) - command += ["-partitionindexlimit", "1"] + command += ["-3partitionindexlimit", "1"] + self.exec(command) + testRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + # RMSE should get worse (higher) if we reduce search space + self.assertGreater(testRMSE, refRMSE) + + def test_4partition_index_limit(self): + """ + Test partition index limit. + """ + inputFile = "./Test/Images/Small/LDR-RGBA/ldr-rgba-00.png" + decompFile = self.get_tmp_image_path("LDR", "decomp") + + # Compute the basic image without any channel weights + command = [ + self.binary, "-tl", + inputFile, decompFile, "4x4", "-medium"] + + self.exec(command) + refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + command += ["-4partitionindexlimit", "1"] self.exec(command) testRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) @@ -1238,6 +1275,74 @@ class CLIPTest(CLITestBase): # RMSE should get worse (higher) if we reduce search space self.assertGreater(testRMSE, refRMSE) + def test_2partition_candidate_limit(self): + """ + Test 2 partition partitioning candidate limit. + """ + inputFile = "./Test/Images/Small/LDR-RGBA/ldr-rgba-00.png" + decompFile = self.get_tmp_image_path("LDR", "decomp") + + # Compute the basic image without any channel weights + command = [ + self.binary, "-tl", + inputFile, decompFile, "4x4", "-medium"] + + self.exec(command) + refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + command += ["-2partitioncandidatelimit", "1"] + self.exec(command) + testRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + # RMSE should get worse (higher) if we reduce search space + self.assertGreater(testRMSE, refRMSE) + + def test_3partition_candidate_limit(self): + """ + Test 3 partition partitioning candidate limit. + """ + inputFile = "./Test/Images/Small/LDR-RGBA/ldr-rgba-00.png" + decompFile = self.get_tmp_image_path("LDR", "decomp") + + # Compute the basic image without any channel weights + command = [ + self.binary, "-tl", + inputFile, decompFile, "4x4", "-medium"] + + self.exec(command) + refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + command += ["-3partitioncandidatelimit", "1"] + self.exec(command) + testRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + # RMSE should get worse (higher) if we reduce search space + self.assertGreater(testRMSE, refRMSE) + + def test_4partition_candidate_limit(self): + """ + Test 4 partition partitioning candidate limit. + """ + inputFile = "./Test/Images/Small/LDR-RGBA/ldr-rgba-00.png" + decompFile = self.get_tmp_image_path("LDR", "decomp") + + # Compute the basic image without any channel weights + command = [ + self.binary, "-tl", + inputFile, decompFile, "4x4", "-medium"] + + self.exec(command) + refRMSE = sum(self.get_channel_rmse(inputFile, decompFile)) + + command += ["-4partitioncandidatelimit", "1"] + self.exec(command) + + # RMSE should get worse (higher) if we reduce search space + # Don't check this here, as 4 partitions not used in any Small image + # even for -exhaustive, BUT command line option must be accepted and + # not error ... + # self.assertGreater(testRMSE, refRMSE) + @unittest.skipIf(os.cpu_count() == 1, "Cannot test on single core host") def test_thread_count(self): """ @@ -1298,7 +1403,8 @@ class CLIPTest(CLITestBase): self.exec(command) # Compute the first image using a file-based round-trip - command = [self.binary, "-cl", inputFile, p2CompFile, "4x4", "-medium"] + command = [self.binary, "-cl", inputFile, p2CompFile, "4x4", "-medium", + "-decode_unorm8"] self.exec(command) command = [self.binary, "-dl", p2CompFile, p2DecFile] self.exec(command) @@ -1366,7 +1472,7 @@ class CLINTest(CLITestBase): # If we expected a pass, then rcode == 0 if expectPass: self.assertEqual(rcode, 0, "Exec did not pass as expected") - self.assertNotIn("ERROR", result.stdout) + self.assertNotIn("ERROR", result.stderr) return # If we got a negative that's always bad (signal of some kind) @@ -1376,7 +1482,7 @@ class CLINTest(CLITestBase): # Otherwise just assert that we got an error log, and some positive # return code value was returned - self.assertIn("ERROR", result.stdout) + self.assertIn("ERROR", result.stderr) self.assertGreater(rcode, 0, "Exec did not fail as expected") def exec_with_omit(self, command, startOmit): @@ -1437,7 +1543,7 @@ class CLINTest(CLITestBase): self.binary, "-cl", "./Test/Data/Tiles/ldr.png", self.get_tmp_image_path("LDR", "comp"), - "3x3x3", "-fast", "-array", "3"] + "3x3x3", "-fast", "-zdim", "3"] self.exec(command) @@ -1550,7 +1656,7 @@ class CLINTest(CLITestBase): self.binary, "-cl", "./Test/Data/Tiles/ldr.png", self.get_tmp_image_path("LDR", "comp"), - "4x4", "-fast", "-array", "2"] + "4x4", "-fast", "-zdim", "2"] self.exec(command) @@ -1563,7 +1669,7 @@ class CLINTest(CLITestBase): self.binary, "-cl", "./Test/Data/Tiles/ldr.png", self.get_tmp_image_path("LDR", "comp"), - "4x4x4", "-fast", "-array", "2"] + "4x4x4", "-fast", "-zdim", "2"] # Run the command, incrementally omitting arguments self.exec_with_omit(command, 7) @@ -1733,9 +1839,54 @@ class CLINTest(CLITestBase): # Run the command, incrementally omitting arguments self.exec_with_omit(command, 7) - def test_cl_partitionlimit_missing_args(self): + def test_cl_2partitionindexlimit_missing_args(self): + """ + Test -cl with -2partitionindexlimit and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-2partitionindexlimit", "3"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + def test_cl_3partitionindexlimit_missing_args(self): + """ + Test -cl with -3partitionindexlimit and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-3partitionindexlimit", "3"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + def test_cl_4partitionindexlimit_missing_args(self): + """ + Test -cl with -4partitionindexlimit and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-4partitionindexlimit", "3"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + def test_cl_2partitioncandidatelimit_missing_args(self): """ - Test -cl with -partitionindexlimit and missing arguments. + Test -cl with -2partitioncandidatelimit and missing arguments. """ # Build a valid command command = [ @@ -1743,7 +1894,38 @@ class CLINTest(CLITestBase): self.get_ref_image_path("LDR", "input", "A"), self.get_tmp_image_path("LDR", "comp"), "4x4", "-fast", - "-partitionindexlimit", "3"] + "-2partitioncandidatelimit", "1"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + def test_cl_3partitioncandidatelimit_missing_args(self): + """ + Test -cl with -3partitioncandidatelimit and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-3partitioncandidatelimit", "3"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + + def test_cl_4partitioncandidatelimit_missing_args(self): + """ + Test -cl with -4partitioncandidatelimit and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-4partitioncandidatelimit", "3"] # Run the command, incrementally omitting arguments self.exec_with_omit(command, 7) @@ -1885,6 +2067,50 @@ class CLINTest(CLITestBase): command[blockIndex] = badSwizzle self.exec(command) + def test_cl_ssw_missing_args(self): + """ + Test -cl with -ssw and missing arguments. + """ + # Build a valid command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-ssw", "rgba"] + + # Run the command, incrementally omitting arguments + self.exec_with_omit(command, 7) + + def test_cl_ssw_invalid_swizzle(self): + """ + Test -cl with -ssw and invalid swizzles. + """ + badSwizzles = [ + "", # Short swizzles + "rrrrr", # Long swizzles + ] + + # Create swizzles with all invalid printable ascii codes + good = ["r", "g", "b", "a"] + for channel in string.printable: + if channel not in good: + badSwizzles.append(channel * 4) + + # Build a valid base command + command = [ + self.binary, "-cl", + self.get_ref_image_path("LDR", "input", "A"), + self.get_tmp_image_path("LDR", "comp"), + "4x4", "-fast", + "-ssw", "rgba"] + + blockIndex = command.index("rgba") + for badSwizzle in badSwizzles: + with self.subTest(swizzle=badSwizzle): + command[blockIndex] = badSwizzle + self.exec(command) + def test_dl_dsw_missing_args(self): """ Test -dl with -dsw and missing arguments. diff --git a/Test/astc_test_image.py b/Test/astc_test_image.py index cf9d27b5e2e6e4b42f3bdb851c1fbd7c3ddec8ed..141b7015c28e7cb8f0a727027272d469a350a571 100644 --- a/Test/astc_test_image.py +++ b/Test/astc_test_image.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2019-2022 Arm Limited +# Copyright 2019-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -47,10 +47,9 @@ RESULT_THRESHOLD_FAIL = -0.00 RESULT_THRESHOLD_3D_FAIL = -0.00 -TEST_BLOCK_SIZES = ["4x4", "5x5", "6x6", "8x8", "12x12", - "3x3x3", "6x6x6"] +TEST_BLOCK_SIZES = ["4x4", "5x5", "6x6", "8x8", "12x12", "3x3x3", "6x6x6"] -TEST_QUALITIES = ["fastest", "fast", "medium", "thorough"] +TEST_QUALITIES = ["fastest", "fast", "medium", "thorough", "verythorough", "exhaustive"] def is_3d(blockSize): @@ -251,16 +250,9 @@ def get_encoder_params(encoderName, referenceName, imageSet): if encoderName.startswith("ref"): _, version, simd = encoderName.split("-") - # 2.x variants - if version.startswith("2."): - encoder = te.Encoder2xRel(version, simd) - name = f"reference-{version}-{simd}" - outDir = "Test/Images/%s" % imageSet - refName = None - return (encoder, name, outDir, refName) - - # 3.x variants - if version.startswith("3."): + # 2.x, 3.x, and 4.x variants + compatible2xPrefixes = ["2.", "3.", "4."] + if any(True for x in compatible2xPrefixes if version.startswith(x)): encoder = te.Encoder2xRel(version, simd) name = f"reference-{version}-{simd}" outDir = "Test/Images/%s" % imageSet @@ -296,21 +288,22 @@ def parse_command_line(): # All reference encoders refcoders = ["ref-1.7", "ref-2.5-neon", "ref-2.5-sse2", "ref-2.5-sse4.1", "ref-2.5-avx2", - "ref-3.6-neon", "ref-3.6-sse2", "ref-3.6-sse4.1", "ref-3.6-avx2", "ref-3.7-neon", "ref-3.7-sse2", "ref-3.7-sse4.1", "ref-3.7-avx2", + "ref-4.4-neon", "ref-4.4-sse2", "ref-4.4-sse4.1", "ref-4.4-avx2", + "ref-4.5-neon", "ref-4.5-sse2", "ref-4.5-sse4.1", "ref-4.5-avx2", "ref-main-neon", "ref-main-sse2", "ref-main-sse4.1", "ref-main-avx2"] # All test encoders - testcoders = ["none", "neon", "sse2", "sse4.1", "avx2", "native"] - testcodersAArch64 = ["none", "neon", "native"] - testcodersX86 = ["none", "sse2", "sse4.1", "avx2", "native"] + testcoders = ["none", "neon", "sse2", "sse4.1", "avx2", "native", "universal"] + testcodersAArch64 = ["neon"] + testcodersX86 = ["sse2", "sse4.1", "avx2"] coders = refcoders + testcoders + ["all-aarch64", "all-x86"] parser.add_argument("--encoder", dest="encoders", default="avx2", choices=coders, help="test encoder variant") - parser.add_argument("--reference", dest="reference", default="ref-3.7-avx2", + parser.add_argument("--reference", dest="reference", default="ref-main-avx2", choices=refcoders, help="reference encoder variant") astcProfile = ["ldr", "ldrs", "hdr", "all"] @@ -341,7 +334,7 @@ def parse_command_line(): parser.add_argument("--test-image", dest="testImage", default=None, help="select a specific test image from the test set") - choices = list(TEST_QUALITIES) + ["all"] + choices = list(TEST_QUALITIES) + ["all", "all+"] parser.add_argument("--test-quality", dest="testQual", default="thorough", choices=choices, help="select a specific test quality") @@ -365,8 +358,14 @@ def parse_command_line(): else: args.encoders = [args.encoders] - args.testQual = TEST_QUALITIES if args.testQual == "all" \ - else [args.testQual] + if args.testQual == "all+": + args.testQual = TEST_QUALITIES + elif args.testQual == "all": + args.testQual = TEST_QUALITIES + args.testQual.remove("verythorough") + args.testQual.remove("exhaustive") + else: + args.testQual = [args.testQual] if not args.blockSizes or ("all" in args.blockSizes): args.blockSizes = TEST_BLOCK_SIZES @@ -416,16 +415,8 @@ def main(): testSet = tts.TestSet(imageSet, testDir, args.profiles, args.formats, args.testImage) - # The fast and fastest presets are now sufficiently fast that - # the results are noisy without more repeats - testRepeats = args.testRepeats - if quality == "fast" and testRepeats > 1: - testRepeats *= 2 - elif quality == "fastest" and testRepeats > 1: - testRepeats *= 4 - resultSet = run_test_set(encoder, testRef, testSet, quality, - args.blockSizes, testRepeats, + args.blockSizes, args.testRepeats, args.keepOutput, args.threads) resultSet.save_to_file(testRes) @@ -446,3 +437,7 @@ def main(): if __name__ == "__main__": sys.exit(main()) + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/Test/astc_test_result_plot.py b/Test/astc_test_result_plot.py index 21950251f7666a0ce21a9afe51196f4a3fd62315..7d5fdc63dca9bae5939eef499525587520fe88e4 100644 --- a/Test/astc_test_result_plot.py +++ b/Test/astc_test_result_plot.py @@ -245,7 +245,6 @@ def main(): Returns: int: The process return code. """ - absXMin = 0 absXMax = 80 absXLimits = (absXMin, absXMax) @@ -254,101 +253,147 @@ def main(): relXMax = None relXLimits = (relXMin, relXMax) + last1x = "1.7" + last2x = "2.5" + last3x = "3.7" + prev4x = "4.3" + last4x = "4.4" + lastMain = "main" + charts = [ # -------------------------------------------------------- # Latest in stable series charts [ # Relative scores ["thorough", "medium", "fast"], - ["ref-2.5-avx2", "ref-3.7-avx2"], + [f"ref-{last2x}-avx2", f"ref-{last3x}-avx2", f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-1.7", + f"ref-{last1x}", None, - "relative-stable-series.png", + "results-relative-stable-series.png", (None, None) ], [ # Absolute scores ["thorough", "medium", "fast"], - ["ref-1.7", "ref-2.5-avx2", "ref-3.7-avx2"], + [f"ref-{last1x}", f"ref-{last2x}-avx2", f"ref-{last3x}-avx2", f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], False, None, None, - "absolute-stable-series.png", + "results-absolute-stable-series.png", (absXLimits, None) ], # -------------------------------------------------------- - # Latest 2.x vs 1.7 release charts + # Latest 2.x vs 1.x release charts + [ + # Relative scores + ["thorough", "medium", "fast"], + [f"ref-{last2x}-avx2"], + ["4x4", "6x6", "8x8"], + True, + f"ref-{last1x}", + None, + "results-relative-2.x-vs-1.x.png", + (None, None) + ], + # -------------------------------------------------------- + # Latest 3.x vs 1.x release charts [ # Relative scores ["thorough", "medium", "fast"], - ["ref-2.5-avx2"], + [f"ref-{last3x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-1.7", + f"ref-{last1x}", None, - "relative-2.x-vs-1.x.png", + "results-relative-3.x-vs-1.x.png", (None, None) ], # -------------------------------------------------------- - # Latest 3.x vs 1.7 release charts + # Latest 4.x vs 1.x release charts [ # Relative scores ["thorough", "medium", "fast"], - ["ref-3.7-avx2"], + [f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-1.7", + f"ref-{last1x}", None, - "relative-3.x-vs-1.x.png", + "results-relative-4.x-vs-1.x.png", (None, None) ], # -------------------------------------------------------- - # Latest 3.x vs 2.5 release charts + # Latest 3.x vs 2.x release charts [ # Relative scores ["thorough", "medium", "fast", "fastest"], - ["ref-3.7-avx2"], + [f"ref-{last3x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-2.5-avx2", + f"ref-{last2x}-avx2", None, - "relative-3.x-vs-2.x.png", + "results-relative-3.x-vs-2.x.png", (None, None) ], # -------------------------------------------------------- - # Latest 3.x vs 3.0 release charts + # Latest 4.x vs 3.x release charts [ # Relative scores ["thorough", "medium", "fast", "fastest"], - ["ref-3.7-avx2"], + [f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-3.6-avx2", + f"ref-{last3x}-avx2", None, - "relative-3.x-vs-3.x.png", + "results-relative-4.x-vs-3.x.png", (relXLimits, None), ], [ # Relative ISAs of latest ["thorough", "medium", "fast", "fastest"], - ["ref-3.7-sse4.1", "ref-3.7-avx2"], + [f"ref-{last4x}-sse4.1", f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], True, - "ref-3.7-sse2", + f"ref-{last4x}-sse2", None, - "relative-3.x-isa.png", + "results-relative-4.x-isa.png", (None, None) ], [ # Relative quality of latest ["medium", "fast", "fastest"], - ["ref-3.7-avx2"], + [f"ref-{last4x}-avx2"], ["4x4", "6x6", "8x8"], True, None, "thorough", - "relative-3.x-quality.png", + "results-relative-4.x-quality.png", (None, None) + ], + # -------------------------------------------------------- + # Latest 4.x vs previous 4.x release charts + [ + # Relative scores + ["thorough", "medium", "fast", "fastest"], + [f"ref-{last4x}-avx2"], + ["4x4", "6x6", "8x8"], + True, + f"ref-{prev4x}-avx2", + None, + "results-relative-4.x-vs-4.x.png", + (relXLimits, None) + ], + # -------------------------------------------------------- + # Latest 4.x vs previous 4.x release charts + [ + # Relative scores + ["thorough", "medium", "fast", "fastest"], + [f"ref-{lastMain}-avx2"], + ["4x4", "6x6", "8x8"], + True, + f"ref-{last4x}-avx2", + None, + "results-relative-main-vs-4.x.png", + (relXLimits, None) ] ] diff --git a/Test/astc_update_ref.sh b/Test/astc_update_ref.sh index 0591041394db54c8256ed9fbbc1aa499a7d56d73..bf6c320064c1a802ef04db932fb1241799b5256e 100755 --- a/Test/astc_update_ref.sh +++ b/Test/astc_update_ref.sh @@ -8,7 +8,7 @@ fi echo "Generating new ref-$1 results" if [ "$1" = "main" ]; then - echo "Using binary from ./astcenc/${1}/" + echo "Using binary from ./bin/${1}/" else echo "Using binary from ./Binaries/${1}/" fi @@ -17,6 +17,6 @@ echo "" TARGET_ROOT=${1} -python3 ./Test/astc_test_image.py --test-set Small --block-size all --test-quality all --repeats 5 --encoder ref-$1-avx2 -#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 8 --encoder ref-$1-sse4.1 -#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 8 --encoder ref-$1-sse2 +python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-avx2 +#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-sse4.1 +#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-sse2 diff --git a/Test/testlib/encoder.py b/Test/testlib/encoder.py index 8c46e7bb9beaaa32822f3f769ec2e7f3f8a0be65..f0bd08953f975e51d5147bf0b8c1bb65f90c4b43 100644 --- a/Test/testlib/encoder.py +++ b/Test/testlib/encoder.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2019-2022 Arm Limited +# Copyright 2019-2023 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -232,7 +232,6 @@ class EncoderBase(): class Encoder2x(EncoderBase): """ This class wraps the latest `astcenc` 2.x series binaries from main branch. - branch. """ VERSION = "main" @@ -252,11 +251,15 @@ class Encoder2x(EncoderBase): def __init__(self, variant, binary=None): name = "astcenc-%s-%s" % (variant, self.VERSION) + if binary is None: - if os.name == 'nt': - binary = "./astcenc/astcenc-%s.exe" % variant + if variant != "universal": + binary = f"./bin/astcenc-{variant}" else: - binary = "./astcenc/astcenc-%s" % variant + binary = "./bin/astcenc" + + if os.name == 'nt': + binary = f"{binary}.exe" super().__init__(name, variant, binary) @@ -286,9 +289,6 @@ class Encoder2x(EncoderBase): if image.colorFormat == "xy": command.append("-normal") - if image.isMask: - command.append("-mask") - if image.isAlphaScaled: command.append("-a") command.append("1") @@ -327,10 +327,13 @@ class Encoder2xRel(Encoder2x): self.VERSION = version - if os.name == 'nt': - binary = f"./Binaries/{version}/astcenc-{variant}.exe" - else: + if variant != "universal": binary = f"./Binaries/{version}/astcenc-{variant}" + else: + binary = f"./Binaries/{version}/astcenc" + + if os.name == 'nt': + binary = f"{binary}.exe" super().__init__(variant, binary) @@ -390,9 +393,6 @@ class Encoder1_7(EncoderBase): if image.colorProfile == "hdr": command.append("-hdr") - if image.isMask: - command.append("-mask") - if image.isAlphaScaled: command.append("-alphablend") diff --git a/Test/testlib/image.py b/Test/testlib/image.py index 8df5cdd1b87f4813c918cfe9d4e46904f62be7fd..153de09c03c7303a38a6de3aaf2bd142501899cd 100644 --- a/Test/testlib/image.py +++ b/Test/testlib/image.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2019-2020 Arm Limited +# Copyright 2019-2022 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -39,36 +39,6 @@ import testlib.misc as misc CONVERT_BINARY = ["convert"] -g_ConvertVersion = None - - -def get_convert_version(): - """ - Get the major/minor version of ImageMagick on the system. - """ - global g_ConvertVersion - - if g_ConvertVersion is None: - command = list(CONVERT_BINARY) - command += ["--version"] - result = sp.run(command, stdout=sp.PIPE, stderr=sp.PIPE, - check=True, encoding="utf-8") - - # Version is top row - version = result.stdout.splitlines()[0] - # ... third token - version = re.split(" ", version)[2] - # ... major/minor/patch/subpatch - version = re.split("\\.|-", version) - - numericVersion = float(version[0]) - numericVersion += float(version[1]) / 10.0 - - g_ConvertVersion = numericVersion - - return g_ConvertVersion - - class ImageException(Exception): """ Exception thrown for bad image specification. @@ -89,14 +59,13 @@ class TestImage(): colorFormat: The image color format. name: The image human name. is3D: True if the image is 3D, else False. - isMask: True if the image is a non-correlated mask texture, else False. isAlphaScaled: True if the image wants alpha scaling, else False. TEST_EXTS: Expected test image extensions. PROFILES: Tuple of valid color profile values. FORMATS: Tuple of valid color format values. FLAGS: Map of valid flags (key) and their meaning (value). """ - TEST_EXTS = (".jpg", ".png", ".tga", ".dds", ".hdr") + TEST_EXTS = (".jpg", ".png", ".tga", ".dds", ".hdr", ".ktx") PROFILES = ("ldr", "ldrs", "hdr") @@ -180,7 +149,6 @@ class TestImage(): # Set default values for the optional fields self.is3D = False - self.isMask = False self.isAlphaScaled = False # Decode the flags field if present @@ -195,7 +163,6 @@ class TestImage(): seenFlags.add(flag) self.is3D = "3" in seenFlags - self.isMask = "m" in seenFlags self.isAlphaScaled = "a" in seenFlags def get_size(self): @@ -262,14 +229,6 @@ class Image(): Args: filePath (str): The path to the image on disk. """ - convert = get_convert_version() - - # ImageMagick 7 started to use .tga file origin information. By default - # TGA files store data from bottom up, and define the origin as bottom - # left. We want our color samples to always use a top left origin, even - # if the data is stored in alternative layout. - self.invertYCoords = (convert >= 7.0) and filePath.endswith(".tga") - self.filePath = filePath self.proxyPath = None @@ -301,9 +260,8 @@ class Image(): command = list(CONVERT_BINARY) command += [self.filePath] - # Invert coordinates if the format needs it - if self.invertYCoords: - command += ["-flip"] + # Ensure convert factors in format origin if needed + command += ["-auto-orient"] command += [ "-format", "%%[pixel:p{%u,%u}]" % (x, y), diff --git a/Test/testlib/resultset.py b/Test/testlib/resultset.py index 995d093c7de6cd1dcce94a81011dcc4ebf5913dd..9b2fb18b50b572832e4ce9592916314f6ac5d9fc 100644 --- a/Test/testlib/resultset.py +++ b/Test/testlib/resultset.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # ----------------------------------------------------------------------------- -# Copyright 2020 Arm Limited +# Copyright 2020-2022 Arm Limited # # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy @@ -300,7 +300,7 @@ class ResultSet(): if not os.path.exists(dirName): os.makedirs(dirName) - with open(filePath, "w") as csvfile: + with open(filePath, "w", newline="") as csvfile: writer = csv.writer(csvfile) self._save_header(writer) for record in self.records: diff --git a/Utils/Example/CMakeLists.txt b/Utils/Example/CMakeLists.txt index dbc104770dd6edf0820a338d90e00312963ad1af..00437b0999815a8a175d58da0329c7a96ce48243 100644 --- a/Utils/Example/CMakeLists.txt +++ b/Utils/Example/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.15) include(ExternalProject) -project(astcencoder_example VERSION 1.0.0) +project(astcencoder_example VERSION 1.1.0) # Add the external project and pull out the project directories we need @@ -28,14 +28,14 @@ project(astcencoder_example VERSION 1.0.0) # SIMD enable to the CMAKE_CACHE_ARGS option to force something specific, but # remember to change the link library in target_link_libraries() to match. # -# * Add "-DISA_SSE2:String=ON" and link against "astcenc-sse2-static" -# * Add "-DISA_SSE41:String=ON" and link against "astcenc-sse4.1-static" -# * Add "-DISA_AVX2:String=ON" and link against "astcenc-avx2-static" -# * Add "-DISA_NEON:String=ON" and link against "astcenc-neon-static" +# * Add "-DASTCENC_ISA_SSE2:String=ON" and link against "astcenc-sse2-static" +# * Add "-DASTCENC_ISA_SSE41:String=ON" and link against "astcenc-sse4.1-static" +# * Add "-DASTCENC_ISA_AVX2:String=ON" and link against "astcenc-avx2-static" +# * Add "-DASTCENC_ISA_NEON:String=ON" and link against "astcenc-neon-static" ExternalProject_Add(astcencoder GIT_REPOSITORY https://github.com/ARM-software/astc-encoder GIT_TAG main - CMAKE_CACHE_ARGS -DCLI:STRING=OFF -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + CMAKE_CACHE_ARGS -DASTCENC_CLI:STRING=OFF -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} INSTALL_COMMAND "") ExternalProject_Get_property(astcencoder diff --git a/Utils/astc_blend_test.cpp b/Utils/astc_blend_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..67d27c3d96f6a8e1251fbf8f1324a374a0a082ce --- /dev/null +++ b/Utils/astc_blend_test.cpp @@ -0,0 +1,298 @@ +// SPDX-License-Identifier: Apache-2.0 +// ---------------------------------------------------------------------------- +// Copyright 2021 Arm Limited +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations +// under the License. +// ---------------------------------------------------------------------------- + +// This is a utility tool to test blend modes. + +#include +#include +#include + +#include "astcenc_mathlib.h" + +#define STB_IMAGE_IMPLEMENTATION +#include "stb_image.h" + +#define STB_IMAGE_WRITE_IMPLEMENTATION +#include "stb_image_write.h" + +/** + * @brief Linearize an sRGB value. + * + * @return The linearized value. + */ +static float srgb_to_linear( + float a +) { + if (a <= 0.04045f) + { + return a * (1.0f / 12.92f); + } + + return powf((a + 0.055f) * (1.0f / 1.055f), 2.4f); +} + +/** + * @brief sRGB gamma-encode a linear value. + * + * @return The gamma encoded value. + */ +static float linear_to_srgb( + float a +) { + if (a <= 0.0031308f) + { + return a * 12.92f; + } + + return 1.055f * powf(a, 1.0f / 2.4f) - 0.055f; +} + +int main(int argc, char **argv) +{ + // Parse command line + if (argc != 6) + { + printf("Usage: astc_blend_test \n"); + exit(1); + } + + const char* src_file = argv[1]; + const char* dst_file = argv[2]; + + bool use_linear = false; + if (!strcmp(argv[3], "linear")) + { + use_linear = true; + } + else if (!strcmp(argv[3], "srgb")) + { + use_linear = false; + } + else + { + printf(" must be either 'linear' or 'srgb'\n"); + exit(1); + } + + bool use_post_blend = false; + if (!strcmp(argv[4], "post")) + { + use_post_blend = true; + } + else if (!strcmp(argv[4], "pre")) + { + use_post_blend = false; + } + else + { + printf(" must be either 'post' or 'pre'\n"); + exit(1); + } + + bool use_filter = false; + if (!strcmp(argv[5], "on")) + { + use_filter = true; + } + else if (!strcmp(argv[5], "off")) + { + use_filter == false; + } + else + { + printf(" must be either 'on' or 'off'\n"); + exit(1); + } + + // Load the input image + int dim_x; + int dim_y; + const uint8_t* data_in = stbi_load(src_file, &dim_x, &dim_y, nullptr, 4); + if (!data_in) + { + printf("ERROR: Failed to load input image.\n"); + exit(1); + } + + // Allocate the output image + uint8_t* data_out = (uint8_t*)malloc(4 * dim_y * dim_x); + if (!data_out) + { + printf("ERROR: Failed to allocate output image.\n"); + exit(1); + } + + // For each pixel apply RGBM encoding + if (!use_filter) + { + for (int y = 0; y < dim_y; y++) + { + const uint8_t* row_in = data_in + (4 * dim_x * y); + uint8_t* row_out = data_out + (4 * dim_x * y); + + for (int x = 0; x < dim_x; x++) + { + const uint8_t* pixel_in = row_in + 4 * x; + uint8_t* pixel_out = row_out + 4 * x; + + float r_src = static_cast(pixel_in[0]) / 255.0f; + float g_src = static_cast(pixel_in[1]) / 255.0f; + float b_src = static_cast(pixel_in[2]) / 255.0f; + float a_src = static_cast(pixel_in[3]) / 255.0f; + + if (use_linear == false) + { + r_src = srgb_to_linear(r_src); + g_src = srgb_to_linear(g_src); + b_src = srgb_to_linear(b_src); + } + + float r_dst = 0.8f; + float g_dst = 1.0f; + float b_dst = 0.8f; + + float r_out; + float g_out; + float b_out; + float a_out; + + // Post-multiply blending + if (use_post_blend) + { + r_out = (r_dst * (1.0f - a_src)) + (r_src * a_src); + g_out = (g_dst * (1.0f - a_src)) + (g_src * a_src); + b_out = (b_dst * (1.0f - a_src)) + (b_src * a_src); + a_out = 1.0f; + } + // Pre-multiply blending + else + { + r_out = (r_dst * (1.0f - a_src)) + (r_src * 1.0f); + g_out = (g_dst * (1.0f - a_src)) + (g_src * 1.0f); + b_out = (b_dst * (1.0f - a_src)) + (b_src * 1.0f); + a_out = 1.0f; + } + + // Clamp color between 0 and 1.0f + r_out = astc::min(r_out, 1.0f); + g_out = astc::min(g_out, 1.0f); + b_out = astc::min(b_out, 1.0f); + + if (use_linear == false) + { + r_out = linear_to_srgb(r_out); + g_out = linear_to_srgb(g_out); + b_out = linear_to_srgb(b_out); + } + + pixel_out[0] = (uint8_t)(r_out * 255.0f); + pixel_out[1] = (uint8_t)(g_out * 255.0f); + pixel_out[2] = (uint8_t)(b_out * 255.0f); + pixel_out[3] = (uint8_t)(a_out * 255.0f); + } + } + } + else + { + for (int y = 0; y < dim_y - 1; y++) + { + const uint8_t* row_in_0 = data_in + (4 * dim_x * y); + const uint8_t* row_in_1 = data_in + (4 * dim_x * (y + 1)); + + uint8_t* row_out = data_out + (4 * (dim_x - 1) * y); + + for (int x = 0; x < dim_x - 1; x++) + { + const uint8_t* pixel_in_00 = row_in_0 + 4 * x; + const uint8_t* pixel_in_01 = row_in_0 + 4 * (x + 1); + const uint8_t* pixel_in_10 = row_in_1 + 4 * x; + const uint8_t* pixel_in_11 = row_in_1 + 4 * (x + 1); + + uint8_t* pixel_out = row_out + 4 * x; + + // Bilinear filter with a half-pixel offset + float r_src = static_cast(pixel_in_00[0] + pixel_in_01[0] + pixel_in_10[0] + pixel_in_11[0]) / (255.0f * 4.0f); + float g_src = static_cast(pixel_in_00[1] + pixel_in_01[1] + pixel_in_10[1] + pixel_in_11[1]) / (255.0f * 4.0f); + float b_src = static_cast(pixel_in_00[2] + pixel_in_01[2] + pixel_in_10[2] + pixel_in_11[2]) / (255.0f * 4.0f); + float a_src = static_cast(pixel_in_00[3] + pixel_in_01[3] + pixel_in_10[3] + pixel_in_11[3]) / (255.0f * 4.0f); + + if (use_linear == false) + { + r_src = srgb_to_linear(r_src); + g_src = srgb_to_linear(g_src); + b_src = srgb_to_linear(b_src); + } + + float r_dst = 0.8f; + float g_dst = 1.0f; + float b_dst = 0.8f; + + float r_out; + float g_out; + float b_out; + float a_out; + + // Post-multiply blending + if (use_post_blend) + { + r_out = (r_dst * (1.0f - a_src)) + (r_src * a_src); + g_out = (g_dst * (1.0f - a_src)) + (g_src * a_src); + b_out = (b_dst * (1.0f - a_src)) + (b_src * a_src); + a_out = 1.0f; + } + // Pre-multiply blending + else + { + r_out = (r_dst * (1.0f - a_src)) + (r_src * 1.0f); + g_out = (g_dst * (1.0f - a_src)) + (g_src * 1.0f); + b_out = (b_dst * (1.0f - a_src)) + (b_src * 1.0f); + a_out = 1.0f; + } + + // Clamp color between 0 and 1.0f + r_out = astc::min(r_out, 1.0f); + g_out = astc::min(g_out, 1.0f); + b_out = astc::min(b_out, 1.0f); + + if (use_linear == false) + { + r_out = linear_to_srgb(r_out); + g_out = linear_to_srgb(g_out); + b_out = linear_to_srgb(b_out); + } + + pixel_out[0] = (uint8_t)(r_out * 255.0f); + pixel_out[1] = (uint8_t)(g_out * 255.0f); + pixel_out[2] = (uint8_t)(b_out * 255.0f); + pixel_out[3] = (uint8_t)(a_out * 255.0f); + } + } + } + + // Write out the result + if (!use_filter) + { + stbi_write_png(dst_file, dim_x, dim_y, 4, data_out, 4 * dim_x); + } + else + { + stbi_write_png(dst_file, dim_x - 1, dim_y - 1, 4, data_out, 4 * (dim_x - 1)); + } + + + return 0; +} diff --git a/Utils/astc_quant_generator.cpp b/Utils/astc_quant_generator.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ae9b4b0687d116301034754cbd07542adb27a19e --- /dev/null +++ b/Utils/astc_quant_generator.cpp @@ -0,0 +1,406 @@ +// SPDX-License-Identifier: Apache-2.0 +// ---------------------------------------------------------------------------- +// Copyright 2023 Arm Limited +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations +// under the License. +// ---------------------------------------------------------------------------- + +// This is a utility tool to generate quant tables +#include +#include +#include +#include + +/** + * @brief The ASTC quantization methods. + * + * Note, the values here are used directly in the encoding in the format so do not rearrange. + */ +enum quant_method +{ + QUANT_2 = 0, + QUANT_3 = 1, + QUANT_4 = 2, + QUANT_5 = 3, + QUANT_6 = 4, + QUANT_8 = 5, + QUANT_10 = 6, + QUANT_12 = 7, + QUANT_16 = 8, + QUANT_20 = 9, + QUANT_24 = 10, + QUANT_32 = 11, + QUANT_40 = 12, + QUANT_48 = 13, + QUANT_64 = 14, + QUANT_80 = 15, + QUANT_96 = 16, + QUANT_128 = 17, + QUANT_160 = 18, + QUANT_192 = 19, + QUANT_256 = 20 +}; + +static inline unsigned int get_quant_level(quant_method method) +{ + switch (method) + { + case QUANT_2: return 2; + case QUANT_3: return 3; + case QUANT_4: return 4; + case QUANT_5: return 5; + case QUANT_6: return 6; + case QUANT_8: return 8; + case QUANT_10: return 10; + case QUANT_12: return 12; + case QUANT_16: return 16; + case QUANT_20: return 20; + case QUANT_24: return 24; + case QUANT_32: return 32; + case QUANT_40: return 40; + case QUANT_48: return 48; + case QUANT_64: return 64; + case QUANT_80: return 80; + case QUANT_96: return 96; + case QUANT_128: return 128; + case QUANT_160: return 160; + case QUANT_192: return 192; + case QUANT_256: return 256; + } + + // Unreachable - the enum is fully described + return 0; +} + +struct quant_config { + quant_method quant; + unsigned int bits; + unsigned int trits; + unsigned int quints; + unsigned int C; + unsigned int masks[6]; +}; + +const std::array quant_configs {{ + { + QUANT_6, + 1, 1, 0, + 204, + { + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_8, + 3, 0, 0, + 0, + { 0 } + }, { + QUANT_10, + 1, 0, 1, + 113, + { + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_12, + 2, 1, 0, + 93, + { + 0b000000000, + 0b100010110, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_16, + 4, 0, 0, + 0, + { 0 } + }, { + QUANT_20, + 2, 0, 1, + 54, + { + 0b000000000, + 0b100001100, + 0b000000000, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_24, + 3, 1, 0, + 44, + { + 0b000000000, + 0b010000101, + 0b100001010, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_32, + 5, 0, 0, + 0, + { 0 } + }, + { + QUANT_40, + 3, 0, 1, + 26, + { + 0b000000000, + 0b010000010, + 0b100000101, + 0b000000000, + 0b000000000, + 0b000000000 + } + }, { + QUANT_48, + 4, 1, 0, + 22, + { + 0b000000000, + 0b001000001, + 0b010000010, + 0b100000100, + 0b000000000, + 0b000000000 + } + }, { + QUANT_64, + 6, 0, 0, + 0, + { 0 } + }, { + QUANT_80, + 4, 0, 1, + 13, + { + 0b000000000, + 0b001000000, + 0b010000001, + 0b100000010, + 0b000000000, + 0b000000000 + } + }, { + QUANT_96, + 5, 1, 0, + 11, + { + 0b000000000, + 0b000100000, + 0b001000000, + 0b010000001, + 0b100000010, + 0b000000000 + } + }, { + QUANT_128, + 7, 0, 0, + 0, + { 0 } + }, { + QUANT_160, + 5, 0, 1, + 6, + { + 0b000000000, + 0b000100000, + 0b001000000, + 0b010000000, + 0b100000001, + 0b000000000 + } + }, { + QUANT_192, + 6, 1, 0, + 5, + { + 0b000000000, + 0b000010000, + 0b000100000, + 0b001000000, + 0b010000000, + 0b100000001 + } + }, { + QUANT_256, + 8, 0, 0, + 0, + { 0 } + } +}}; + +void generate_unpacked_quant( + const quant_config& config, + std::set& set +) { + unsigned int levels = get_quant_level(config.quant); + unsigned int emitted = 0; + + // Value has 1 trit and N bits + if (config.trits) + { + for (unsigned int D = 0; D < 3; D++) + { + unsigned int max_bits = 1 << config.bits; + for (unsigned int bits = 0; bits < max_bits; bits++) + { + unsigned int A = (bits & 1) * 0b111111111; + unsigned int B = 0; + unsigned int bit = bits; + for (const auto& mask_n: config.masks) + { + unsigned int bit_n = bit & 1; + bit >>= 1; + B += bit_n * mask_n; + } + + unsigned int T = D * config.C + B; + T = T ^ A; + T = (A & 0x80) | (T >> 2); + set.insert(T); + } + } + } + // Value has 1 quint and N bits + else if (config.quints) + { + for (unsigned int D = 0; D < 5; D++) + { + unsigned int max_bits = 1 << config.bits; + for (unsigned int bits = 0; bits < max_bits; bits++) + { + unsigned int A = (bits & 1) * 0b111111111; + unsigned int B = 0; + unsigned int bit = bits; + for (const auto& mask_n: config.masks) + { + unsigned int bit_n = bit & 1; + bit >>= 1; + B += bit_n * mask_n; + } + + unsigned int T = D * config.C + B; + T = T ^ A; + T = (A & 0x80) | (T >> 2); + set.insert(T); + } + } + } + // Value has N bits + else + { + unsigned int max_bits = 1 << config.bits; + for (unsigned int bits = 0; bits < max_bits; bits++) + { + unsigned int T = bits << (8 - config.bits); + int bits_remaining = 8 - config.bits; + + while (bits_remaining > 0) + { + int shift = bits_remaining - config.bits; + bits_remaining -= config.bits; + if (shift > 0) + { + T |= bits << shift; + } + else + { + T |= bits >> -shift; + } + } + set.insert(T); + } + } +} + +void generate_unquant_to_unpacked_quant( + const quant_config& config, + const std::set& set +) { + for (unsigned int i = 0; i < 256; i++) + { + unsigned int min_dist = 256; + unsigned int val_lo = 256; + unsigned int val_hi = 0; + + for (const auto& val: set) + { + unsigned int dist = std::max(i, val) - std::min(i, val); + + if (dist < min_dist) + { + min_dist = dist; + val_lo = val; + val_hi = val; + } + else if (dist == min_dist) + { + val_lo = std::min(val_lo, val); + val_hi = std::max(val_hi, val); + } + } + + if ((i % 16) == 0) + { + printf("\t\t"); + } + + printf("%3u, %3u", val_lo, val_hi); + + if (i != 255) + { + printf(", "); + } + + if ((i % 16) == 15) + { + printf("\n"); + } + } +} + +int main(void) +{ + printf("const uint8_t color_unquant_to_uquant_tables[17][512] {\n"); + for (size_t i = 0; i < quant_configs.size(); i++) + { + const auto& config = quant_configs[i]; + std::set set; + + printf("\t{ // QUANT_%u\n", get_quant_level(config.quant)); + generate_unpacked_quant(config, set); + generate_unquant_to_unpacked_quant(config, set); + printf("\t},\n"); + } + printf("};\n"); + return 0; +} diff --git a/Utils/astcenc_u8_test_bench.cpp b/Utils/astcenc_u8_test_bench.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b44d6954ea524eed6177b3fefd28594cff3933a3 --- /dev/null +++ b/Utils/astcenc_u8_test_bench.cpp @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: Apache-2.0 +// ---------------------------------------------------------------------------- +// Copyright 2023 Arm Limited +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at: +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations +// under the License. +// ---------------------------------------------------------------------------- + +// astcenc doesn't use the top 8 integer bits directly for sRGB RGB components +// or when using the decode_unorm8 decode mode. An alterantive is used which +// allows a common code path to be used. This test program shows that the two +// produce equivalent output once rounded to a decode_unorm8 output. + +// Compile with e.g. clang++ astcenc_u8_test_bench.cpp -o astcenc_u8_test_bench -mavx2 -mf16c + +#define ASTCENC_AVX 2 +#define ASTCENC_F16C 1 +#define ASTCENC_SSE 41 + +#include "../Source/astcenc_mathlib.cpp" +#include "../Source/astcenc_color_unquantize.cpp" +#include "../Source/astcenc_decompress_symbolic.cpp" + +int main() +{ + printf("Decode mode test bench\n"); + + for (int ep0 = 0; ep0 < 256; ep0++) + { + for (int ep1 = 0; ep1 < 256; ep1++) + { + for (int wt1 = 0; wt1 < 65; wt1++) + { + // Validate linear data with decode_unorm8 mode + { + // Expand 8 bit to 16 bit + vint4 weights(wt1); + int ep0_v0 = ep0 * 257; + int ep1_v0 = ep1 * 257; + + // Linear with decode_u8 handling + vmask4 decode_u8_v0(true, true, true, true); + vint4 ep0v0(ep0_v0, ep0_v0, ep0_v0, ep0_v0); + vint4 ep1v0(ep1_v0, ep1_v0, ep1_v0, ep1_v0); + + // Linear without decode_u8 handling + vmask4 decode_u8_v1(false, false, false, false); + vint4 ep0v1(ep0_v0, ep0_v0, ep0_v0, ep0_v0); + vint4 ep1v1(ep1_v0, ep1_v0, ep1_v0, ep1_v0); + + // Lerp both styles + vint4 colorv0 = lerp_color_int(decode_u8_v0, ep0v0, ep1v0, weights); + vint4 colorv1 = lerp_color_int(decode_u8_v1, ep0v1, ep1v1, weights); + + // Validate top 8 integer bits match in both cases + // - Shows that astcenc-style U8 doesn't differ from Khronos-style U8 + vint4 cs0 = lsr<8>(colorv0); + vint4 cs1 = lsr<8>(colorv1); + assert(cs0.lane<0>() == cs1.lane<0>()); + assert(cs0.lane<3>() == cs1.lane<3>()); + + // Validate that astcenc output matches the top 8 integer bits + vfloat4 colorv0f = decode_texel(colorv0, vmask4(false)); + vint4 colorv0_out = float_to_int_rtn(colorv0f * 255.0f); + assert(colorv0_out.lane<0>() == cs0.lane<0>()); + } + + // Validate sRGB data with decode_unorm8 mode + { + // Expand 8 bit to 16 bit + vint4 weights(wt1); + int ep0_v0s = (ep0 << 8) | 0x80; + int ep1_v0s = (ep1 << 8) | 0x80; + int ep0_v0 = ep0 * 257; + int ep1_v0 = ep1 * 257; + + // sRGB RGB and linear A with decode_u8 handling + vmask4 decode_u8_v0(true, true, true, true); + vint4 ep0v0(ep0_v0s, ep0_v0s, ep0_v0s, ep0_v0); + vint4 ep1v0(ep1_v0s, ep1_v0s, ep1_v0s, ep1_v0); + + // sRGB RGB and linear A without decode_u8 handling + vmask4 decode_u8_v1(false, false, false, false); + vint4 ep0v1(ep0_v0s, ep0_v0s, ep0_v0s, ep0_v0); + vint4 ep1v1(ep1_v0s, ep1_v0s, ep1_v0s, ep1_v0); + + // Lerp both styles + vint4 colorv0 = lerp_color_int(decode_u8_v0, ep0v0, ep1v0, weights); + vint4 colorv1 = lerp_color_int(decode_u8_v1, ep0v1, ep1v1, weights); + + // Validate top 8 integer bits match in both cases + // - Shows that astcenc-style U8 doesn't differ from Khronos-style U8 + vint4 cs0 = lsr<8>(colorv0); + vint4 cs1 = lsr<8>(colorv1); + assert(cs0.lane<0>() == cs1.lane<0>()); + assert(cs0.lane<3>() == cs1.lane<3>()); + + // Validate that astcenc output matches the top 8 integer bits + vfloat4 colorv0f = decode_texel(colorv0, vmask4(false)); + vint4 colorv0_out = float_to_int_rtn(colorv0f * 255.0f); + assert(colorv0_out.lane<0>() == cs0.lane<0>()); + } + } + } + } + + return 0; +} diff --git a/bundle.json b/bundle.json index 8d554820b11b9c23218afd495cd15de072508cb6..93db4fe372957c24e155a3aab0e92feae68d38bb 100644 --- a/bundle.json +++ b/bundle.json @@ -1,7 +1,7 @@ { "name": "@ohos/astc-encoder", "description": "This is the official repository for Arm ASTC encoders,which are texture compressors for adaptive extensible texture compression data formats.", - "version": "3.7", + "version": "4.7", "license": "Apache-2.0", "publishAs": "code-segment", "segment":{ diff --git a/jenkins/build-image.sh b/jenkins/build-image.sh index 88c7d2e51fd2304be5db49abe5c06e164a1ed768..5c08758096a5072d656eb6f0990d71028981d0d8 100755 --- a/jenkins/build-image.sh +++ b/jenkins/build-image.sh @@ -2,7 +2,7 @@ ARTIFACTORY_URL=eu-west-1.artifactory.aws.arm.com DOCKER_REGISTRY=mobile-studio--docker.${ARTIFACTORY_URL} IMAGE_NAME=astcenc -IMAGE_VERSION=3.1.0 +IMAGE_VERSION=3.2.0 # Check Artifactory credentials are set if [[ -z "${ARTIFACTORY_CREDENTIALS}" ]] @@ -18,11 +18,12 @@ rm -fr tmp mkdir -p tmp echo "Get static analysis tools" -curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/cov-analysis-linux64-2020.12.sh --output tmp/coverity_install.sh -curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/license.dat --output tmp/coverity_license.dat +curl -L --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/cov-analysis-linux64-2023.3.0.sh --output tmp/coverity_install.sh +curl -L --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/license.dat --output tmp/coverity_license.dat echo "Building image" -docker build -f jenkins/build.Dockerfile \ +docker build --progress=plain \ + -f jenkins/build.Dockerfile \ -t $IMAGE_NAME:latest \ -t $IMAGE_NAME:$IMAGE_VERSION \ -t $DOCKER_REGISTRY/$IMAGE_NAME:latest \ diff --git a/jenkins/build.Dockerfile b/jenkins/build.Dockerfile index 165ac3ec2387980fd87fc46fb271f7b3a7b3e941..64793ae19540aa6ed7490de2284faaefa1ebe35a 100644 --- a/jenkins/build.Dockerfile +++ b/jenkins/build.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 RUN useradd -u 1000 -U -m -c Jenkins jenkins @@ -6,10 +6,10 @@ RUN apt update && apt -y upgrade \ && apt install -y \ software-properties-common \ clang \ - clang++-9 \ gcc \ g++ \ git \ + cmake \ imagemagick \ make \ python3 \ @@ -31,10 +31,3 @@ RUN chmod 555 /tmp/coverity_install.sh && \ /tmp/coverity_install.sh -q --license.region=6 --license.agreement=agree --license.cov.path=/tmp/coverity_license.dat -dir /usr/local/cov-analysis && \ rm /tmp/coverity_* ENV PATH="/usr/local/cov-analysis/bin:$PATH" - -# Install up-to-date CMake, as standard Ubuntu 18.04 package is too old -RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \ - | gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware.gpg -RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' -RUN apt-get update -RUN apt-get install -y cmake \ No newline at end of file diff --git a/jenkins/nightly.Jenkinsfile b/jenkins/nightly.Jenkinsfile index 4673591b56f93357a107811023492e9e645e8136..539cec1cc8ef87210ff5210655572d9b65f3ae3d 100644 --- a/jenkins/nightly.Jenkinsfile +++ b/jenkins/nightly.Jenkinsfile @@ -41,7 +41,7 @@ pipeline { - name: artifactory-ms-docker containers: - name: astcenc - image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0 + image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.2.0 command: - sleep args: @@ -67,22 +67,22 @@ pipeline { ''' } } - stage('Build R') { + stage('Build R x64') { steps { sh ''' mkdir build_rel cd build_rel - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON -DUNITTEST=ON -DPACKAGE=x64 .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_ISA_NONE=ON -DASTCENC_UNITTEST=ON -DASTCENC_PACKAGE=x64 .. make install package -j4 ''' } } - stage('Build D') { + stage('Build D x64') { steps { sh ''' mkdir build_dbg cd build_dbg - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_ISA_NONE=ON .. make -j4 ''' } @@ -101,6 +101,7 @@ pipeline { python3 ./Test/astc_test_functional.py --encoder=sse2 python3 ./Test/astc_test_functional.py --encoder=sse4.1 python3 ./Test/astc_test_functional.py --encoder=avx2 + python3 ./Test/astc_test_image.py --encoder=none --test-set Small --test-quality medium python3 ./Test/astc_test_image.py --encoder=all-x86 --test-set Small --test-quality medium ''' dir('build_rel') { @@ -121,24 +122,24 @@ pipeline { bat 'git clean -ffdx' } } - stage('Build R') { + stage('Build R x64') { steps { bat ''' - call c:\\progra~2\\micros~1\\2019\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat mkdir build_rel cd build_rel - cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DPACKAGE=x64-cl .. + cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=x64-cl .. nmake install package ''' } } - stage('Build D') { + stage('Build D x64') { steps { bat ''' - call c:\\progra~2\\micros~1\\2019\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat mkdir build_dbg cd build_dbg - cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Debug -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON .. + cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_ISA_NONE=ON .. nmake ''' } @@ -153,7 +154,7 @@ pipeline { stage('Test') { steps { bat ''' - set Path=c:\\Python38;c:\\Python38\\Scripts;%Path% + set Path=c:\\Python3;c:\\Python3\\Scripts;%Path% call python ./Test/astc_test_image.py --test-set Small --test-quality medium ''' } @@ -171,26 +172,50 @@ pipeline { bat 'git clean -ffdx' } } - stage('Build R') { + stage('Build R x64') { steps { bat ''' - call c:\\progra~2\\micros~1\\2019\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat mkdir build_rel cd build_rel - cmake -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DPACKAGE=x64-clangcl .. + cmake -G "Visual Studio 17 2022" -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=x64-clangcl .. msbuild astcencoder.sln -property:Configuration=Release msbuild PACKAGE.vcxproj -property:Configuration=Release msbuild INSTALL.vcxproj -property:Configuration=Release ''' } } - stage('Build D') { + stage('Build D x64') { steps { bat ''' - call c:\\progra~2\\micros~1\\2019\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat mkdir build_dbg cd build_dbg - cmake -G "Visual Studio 16 2019" -T ClangCL -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON .. + cmake -G "Visual Studio 17 2022" -T ClangCL -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON .. + msbuild astcencoder.sln -property:Configuration=Debug + ''' + } + } + stage('Build R Arm64') { + steps { + bat ''' + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64 + mkdir build_rel_arm64 + cd build_rel_arm64 + cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64-clangcl .. + msbuild astcencoder.sln -property:Configuration=Release + msbuild PACKAGE.vcxproj -property:Configuration=Release + msbuild INSTALL.vcxproj -property:Configuration=Release + ''' + } + } + stage('Build D Arm64') { + steps { + bat ''' + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64 + mkdir build_dbg_arm64 + cd build_dbg_arm64 + cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DASTCENC_ISA_NEON=ON .. msbuild astcencoder.sln -property:Configuration=Debug ''' } @@ -200,12 +225,15 @@ pipeline { dir('build_rel') { stash name: 'astcenc-windows-x64-clangcl', includes: '*.zip' } + dir('build_rel_arm64') { + stash name: 'astcenc-windows-arm64-clangcl', includes: '*.zip' + } } } stage('Test') { steps { bat ''' - set Path=c:\\Python38;c:\\Python38\\Scripts;%Path% + set Path=c:\\Python3;c:\\Python3\\Scripts;%Path% call python ./Test/astc_test_image.py --test-set Small --test-quality medium ''' } @@ -215,7 +243,7 @@ pipeline { /* Build for macOS on x86-64 using Clang */ stage('macOS') { agent { - label 'mac' + label 'mac && x86_64' } stages { stage('Clean') { @@ -228,7 +256,7 @@ pipeline { sh ''' mkdir build_rel cd build_rel - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DPACKAGE=x64 .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=x64 .. make install package -j4 ''' } @@ -238,7 +266,7 @@ pipeline { sh ''' mkdir build_dbg cd build_dbg - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_ISA_NONE=ON .. make -j4 ''' } @@ -304,6 +332,9 @@ spec: dir('upload/windows-x64-clangcl') { unstash 'astcenc-windows-x64-clangcl' } + dir('upload/windows-arm64-clangcl') { + unstash 'astcenc-windows-arm64-clangcl' + } dir('upload/macos-x64') { unstash 'astcenc-macos-x64' } diff --git a/jenkins/release.Jenkinsfile b/jenkins/release.Jenkinsfile index 8b815acfbea5e9d06831445187963f1971605dc1..253746920010a361f4a37c1940798f580b361a42 100644 --- a/jenkins/release.Jenkinsfile +++ b/jenkins/release.Jenkinsfile @@ -43,7 +43,7 @@ spec: - name: artifactory-ms-docker containers: - name: astcenc - image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0 + image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.2.0 command: - sleep args: @@ -73,7 +73,7 @@ spec: mkdir build_cov cd build_cov - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON .. cov-configure --config ${WORKSPACE}/coverity.conf --template --compiler cc --comptype gcc cov-configure --config ${WORKSPACE}/coverity.conf --template --compiler c++ --comptype g++ @@ -127,24 +127,24 @@ spec: sh 'git clean -ffdx' } } - stage('Build astcenc R') { + stage('Build astcenc R x64') { steps { sh ''' export CXX=clang++-9 mkdir build_rel cd build_rel - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON -DPACKAGE=x64 .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=x64 .. make install package -j4 ''' } } - stage('Build astcdec R') { + stage('Build astcdec R x64') { steps { sh ''' export CXX=clang++-9 mkdir build_reldec cd build_reldec - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON -DDECOMPRESSOR=ON .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_DECOMPRESSOR=ON .. make -j4 ''' } @@ -178,25 +178,63 @@ spec: bat 'git clean -ffdx' } } - stage('Build R') { + stage('Build R x64') { steps { bat ''' - call c:\\progra~2\\micros~1\\2019\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvars64.bat mkdir build_rel cd build_rel - cmake -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DPACKAGE=x64 .. + cmake -G "Visual Studio 17 2022" -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_AVX2=ON -DASTCENC_ISA_SSE41=ON -DASTCENC_ISA_SSE2=ON -DASTCENC_PACKAGE=x64 .. + msbuild astcencoder.sln -property:Configuration=Release + msbuild PACKAGE.vcxproj -property:Configuration=Release + msbuild INSTALL.vcxproj -property:Configuration=Release + ''' + } + } + stage('Build R Arm64') { + steps { + bat ''' + call c:\\progra~2\\micros~1\\2022\\buildtools\\vc\\auxiliary\\build\\vcvarsall.bat x64_arm64 + mkdir build_rel_arm64 + cd build_rel_arm64 + cmake -G "Visual Studio 17 2022" -A ARM64 -T ClangCL -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm64 .. msbuild astcencoder.sln -property:Configuration=Release msbuild PACKAGE.vcxproj -property:Configuration=Release msbuild INSTALL.vcxproj -property:Configuration=Release ''' } } + stage('Sign') { + steps { + dir('sign_tools') { + checkout changelog: false, + poll: false, + scm: [$class: 'GitSCM', + branches: [[name: '*/main']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[credentialsId: 'gerrit-jenkins-ssh', + url: 'ssh://mirror.eu-west-1.gerrit-eu01.aws.arm.com:29418/Hive/shared/signing']]] + } + withCredentials([usernamePassword(credentialsId: 'cepe-artifactory-jenkins', + usernameVariable: 'AF_USER', + passwordVariable: 'APIKEY')]) { + powershell 'C:\\Python311\\python.exe .\\sign_tools\\windows-client-wrapper.py -b $Env:BUILD_NUMBER -t $Env:APIKEY (Get-ChildItem -Filter build_rel\\*.zip)[0].FullName' + powershell 'C:\\Python311\\python.exe .\\sign_tools\\windows-client-wrapper.py -b $Env:BUILD_NUMBER -t $Env:APIKEY (Get-ChildItem -Filter build_rel_arm64\\*.zip)[0].FullName' + } + } + } stage('Stash') { steps { dir('build_rel') { stash name: 'astcenc-windows-x64', includes: '*.zip' stash name: 'astcenc-windows-x64-hash', includes: '*.zip.sha256' } + dir('build_rel_arm64') { + stash name: 'astcenc-windows-arm64', includes: '*.zip' + stash name: 'astcenc-windows-arm64-hash', includes: '*.zip.sha256' + } } } stage('Test') { @@ -212,7 +250,7 @@ spec: /* Build for macOS on x86-64 using Clang */ stage('macOS') { agent { - label 'mac && notarizer' + label 'mac && x86_64 && notarizer' } stages { stage('Clean') { @@ -225,7 +263,7 @@ spec: sh ''' mkdir build_rel cd build_rel - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DPACKAGE=x64 .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_PACKAGE=universal .. make install package -j4 ''' } @@ -249,8 +287,8 @@ spec: stage('Stash') { steps { dir('build_rel') { - stash name: 'astcenc-macos-x64', includes: '*.zip' - stash name: 'astcenc-macos-x64-hash', includes: '*.zip.sha256' + stash name: 'astcenc-macos-universal', includes: '*.zip' + stash name: 'astcenc-macos-universal-hash', includes: '*.zip.sha256' } } } @@ -258,58 +296,10 @@ spec: steps { sh ''' export PATH=/usr/local/bin:$PATH - python3 ./Test/astc_test_image.py --test-set Small - ''' - } - } - } - } - /* Build for macOS on x86-64 using Clang */ - stage('macOS arm64') { - agent { - label 'mac && notarizer' - } - stages { - stage('Clean') { - steps { - sh 'git clean -ffdx' - } - } - stage('Build R') { - steps { - sh ''' - mkdir build_rel - cd build_rel - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_NEON=ON -DPACKAGE=aarch64 .. - make install package -j4 + python3 ./Test/astc_test_image.py --test-set Small --encoder universal ''' } } - stage('Sign and notarize') { - environment { - NOTARIZATION_CREDS = credentials('notarization-account') - } - steps { - dir('build_rel') { - sh 'git clone ssh://eu-gerrit-1.euhpc.arm.com:29418/Hive/shared/signing' - withCredentials([usernamePassword(credentialsId: 'win-signing', - usernameVariable: 'USERNAME', - passwordVariable: 'PASSWORD')]) { - sh 'python3 ./signing/macos-client-wrapper.py ${USERNAME} *.zip' - sh 'rm -rf ./signing' - } - } - } - } - stage('Stash') { - steps { - dir('build_rel') { - stash name: 'astcenc-macos-aarch64', includes: '*.zip' - stash name: 'astcenc-macos-aarch64-hash', includes: '*.zip.sha256' - } - } - } - // TODO: Currently can't test automatically } } } @@ -348,37 +338,16 @@ spec: stage('Unstash') { steps { dir('upload') { + unstash 'astcenc-windows-x64-hash' + unstash 'astcenc-windows-arm64-hash' unstash 'astcenc-linux-x64-hash' - unstash 'astcenc-macos-x64-hash' - unstash 'astcenc-macos-aarch64-hash' + unstash 'astcenc-macos-universal-hash' - unstash 'astcenc-linux-x64' - unstash 'astcenc-macos-x64' - unstash 'astcenc-macos-aarch64' - } - dir('upload/windows-x64') { unstash 'astcenc-windows-x64' - dir('signing') { - checkout changelog: false, - poll: false, - scm: [$class: 'GitSCM', - branches: [[name: '*/master']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[credentialsId: 'gerrit-jenkins-ssh', - url: 'ssh://mirror.eu-west-1.gerrit-eu01.aws.arm.com:29418/Hive/shared/signing']]] - } - withCredentials([usernamePassword(credentialsId: 'win-signing', - usernameVariable: 'USERNAME', - passwordVariable: 'PASSWORD')]) { - sh 'python3 ./signing/windows-client-wrapper.py ${USERNAME} *.zip' - sh 'mv *.zip.sha256 ../' - sh 'mv *.zip ../' - } - } - dir('upload') { - sh 'rm -rf ./windows-x64' + unstash 'astcenc-windows-arm64' + unstash 'astcenc-linux-x64' + unstash 'astcenc-macos-universal' + sh 'cat *.sha256 > release-sha256.txt' sh 'rm *.sha256' } @@ -398,11 +367,4 @@ spec: } } } - post { - failure { - script { - slackSend channel: '#dsg-eng-astcenc', color: 'danger', message: "Build ${JOB_NAME} ${BUILD_NUMBER} failed. (<${BUILD_URL}|Open>)", teamDomain: 'arm-dsg', tokenCredentialId: 'jenkins-slack', username: 'jenkins' - } - } - } }