diff --git a/bin/README.md b/bin/README.md index ed1560c..6cf5569 100644 --- a/bin/README.md +++ b/bin/README.md @@ -6,10 +6,10 @@ This directory contains all of the binaries required to run the benchmarking tes | Binary Name | Version | Compile Date | Architecture | OS | SHA-256 Hash
(VirusTotal Scan) | |:-:|:-:|:-:|:-:|:-:|:-:| -| fio_x64 | 3.38 | 14-DEC-2024 | x86_64 | 64-bit | [b802ea1](https://www.virustotal.com/gui/file/b802ea1460f8a0ab6a9d8a48d5d23dec8f68228293b88c2e4567424e6d2a7a47) | -| fio_x86 | 3.38 | 14-DEC-2024 | i686 | 32-bit | [8f06655](https://www.virustotal.com/gui/file/8f066550c35a8c6bbb53c80264ec0c1962128267562a785391fd3bb36ca489cb) | -| fio_aarch64 | 3.38 | 23-NOV-2024 | ARM (aarch64) | 64-bit | [ed703a8](https://www.virustotal.com/gui/file/ed703a87951992696a0870dfb3094956ebe0f5ea304918dc05a921d32aacb760) | -| fio_arm | 3.38 | 23-NOV-2024 | ARM | 32-bit | [b52a809](https://www.virustotal.com/gui/file/b52a809f748587909c429edc14e54299249aedb19b5db72a60affc0de4b5c608) | +| fio_x64 | 3.39 | 20-APR-2025 | x86_64 | 64-bit | [b511bda](https://www.virustotal.com/gui/file/b511bda3b26b6d840698f543d63e956d7466b8512c10ff0ada8292d556c33fb1) | +| fio_x86 | 3.39 | 20-APR-2025 | i686 | 32-bit | [42e2e0b](https://www.virustotal.com/gui/file/42e2e0b0370faeb8e53dcf48dfff15daa9baaadfd196d9bdda57af196bedf0b3) | +| fio_aarch64 | 3.39 | 20-APR-2025 | ARM (aarch64) | 64-bit | [e2942a2](https://www.virustotal.com/gui/file/e2942a26d4b249076486677c9c12cd7f1a572854a5e136597d1391e8ad75ffb0) | +| fio_arm | 3.39 | 20-APR-2025 | ARM | 32-bit | [3a96b1c](https://www.virustotal.com/gui/file/3a96b1cadfb51501b7fd54dc47a4dad666dc4382d4fe152116c62ae6a07485ea) | | iperf3_x64 | 3.18 | 14-DEC-2024 | x86_64 | 64-bit | [ef787ab](https://www.virustotal.com/gui/file/ef787abbe4b09c7958ed592df52dfe3a2848cbdee5b76738c757d7c51c348053) | | iperf3_x86 | 3.18 | 14-DEC-2024 | i686 | 32-bit | [655eb51](https://www.virustotal.com/gui/file/655eb51abc36ddaa624c1d0e98c6930e8b1e9d91c85e5a3443624355656be9b9) | | iperf3_aarch64 | 3.18 | 14-DEC-2024 | ARM (aarch64) | 64-bit | [92e5821](https://www.virustotal.com/gui/file/92e5821cfbaa1f8faf123b4d6773dc0f6efef221b9308668a21ddabc04a1de20) | diff --git a/bin/compile.sh b/bin/compile.sh index 9948309..2d2c173 100755 --- a/bin/compile.sh +++ b/bin/compile.sh @@ -36,7 +36,7 @@ source /hbb_exe/activate # download and compile fio cd ~ -curl -L https://github.com/axboe/fio/archive/fio-3.38.tar.gz -o "fio.tar.gz" +curl -L https://github.com/axboe/fio/archive/fio-3.39.tar.gz -o "fio.tar.gz" tar xf fio.tar.gz cd fio-fio* ./configure --disable-native diff --git a/bin/cross-compile.sh b/bin/cross-compile.sh index 2b16edc..c967d7e 100755 --- a/bin/cross-compile.sh +++ b/bin/cross-compile.sh @@ -30,7 +30,7 @@ source /hbb_exe/activate # download and compile fio cd ~ -curl -L https://github.com/axboe/fio/archive/fio-3.38.tar.gz -o "fio.tar.gz" +curl -L https://github.com/axboe/fio/archive/fio-3.39.tar.gz -o "fio.tar.gz" tar xf fio.tar.gz cd fio-fio* CC=/root/${CROSS}-cross/bin/${CROSS}-gcc ./configure --disable-native --build-static diff --git a/bin/fio/fio_aarch64 b/bin/fio/fio_aarch64 index e086a36..7d530b8 100755 Binary files a/bin/fio/fio_aarch64 and b/bin/fio/fio_aarch64 differ diff --git a/bin/fio/fio_arm b/bin/fio/fio_arm index a396b31..1c14cb8 100755 Binary files a/bin/fio/fio_arm and b/bin/fio/fio_arm differ diff --git a/bin/fio/fio_x64 b/bin/fio/fio_x64 index e869abd..6eb26f3 100755 Binary files a/bin/fio/fio_x64 and b/bin/fio/fio_x64 differ diff --git a/bin/fio/fio_x86 b/bin/fio/fio_x86 index ee6aed5..e32a832 100755 Binary files a/bin/fio/fio_x86 and b/bin/fio/fio_x86 differ diff --git a/yabs.sh b/yabs.sh index 9a38772..9d63c15 100644 --- a/yabs.sh +++ b/yabs.sh @@ -1,7 +1,7 @@ #!/bin/bash # Yet Another Bench Script by Mason Rowe -# Initial Oct 2019; Last update Jan 2025 +# Initial Oct 2019; Last update Apr 2025 # Disclaimer: This project is a work in progress. Any errors or suggestions should be # relayed to me via the GitHub project page linked below. @@ -12,7 +12,7 @@ # performance via fio. The script is designed to not require any dependencies # - either compiled or installed - nor admin privileges to run. -YABS_VERSION="v2025-01-01" +YABS_VERSION="v2025-04-20" echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# Yet-Another-Bench-Script #' @@ -69,7 +69,7 @@ while getopts 'bfdignhr4596jw:s:' flag; do f) SKIP_FIO="True" ;; d) SKIP_FIO="True" ;; i) SKIP_IPERF="True" ;; - g) SKIP_GEEKBENCH="True" ;; + g) SKIP_GEEKBENCH="True" && unset GEEKBENCH_6 ;; n) SKIP_NET="True" ;; h) PRINT_HELP="True" ;; r) REDUCE_NET="True" ;; @@ -163,11 +163,11 @@ if [ -n "$PRINT_HELP" ]; then [[ -n $GEEKBENCH_6 ]] && echo -e " running geekbench 6" echo -e echo -e "Local Binary Check:" - [[ -z $LOCAL_FIO ]] && echo -e " fio not detected, will download precompiled binary" || - [[ -z $PREFER_BIN ]] && echo -e " fio detected, using local package" || + ([[ -z $LOCAL_FIO ]] && echo -e " fio not detected, will download precompiled binary") || + ([[ -z $PREFER_BIN ]] && echo -e " fio detected, using local package") || echo -e " fio detected, but using precompiled binary instead" - [[ -z $LOCAL_IPERF ]] && echo -e " iperf3 not detected, will download precompiled binary" || - [[ -z $PREFER_BIN ]] && echo -e " iperf3 detected, using local package" || + ([[ -z $LOCAL_IPERF ]] && echo -e " iperf3 not detected, will download precompiled binary") || + ([[ -z $PREFER_BIN ]] && echo -e " iperf3 detected, using local package") || echo -e " iperf3 detected, but using precompiled binary instead" echo -e echo -e "Detected Connectivity:" @@ -904,8 +904,8 @@ function launch_geekbench { || GB_URL="https://cdn.geekbench.com/Geekbench-5.5.1-Linux.tar.gz" GB_CMD="geekbench5" else # Geekbench v6 - [[ $ARCH = *aarch64* || $ARCH = *arm* ]] && GB_URL="https://cdn.geekbench.com/Geekbench-6.3.0-LinuxARMPreview.tar.gz" \ - || GB_URL="https://cdn.geekbench.com/Geekbench-6.3.0-Linux.tar.gz" + [[ $ARCH = *aarch64* || $ARCH = *arm* ]] && GB_URL="https://cdn.geekbench.com/Geekbench-6.4.0-LinuxARMPreview.tar.gz" \ + || GB_URL="https://cdn.geekbench.com/Geekbench-6.4.0-Linux.tar.gz" GB_CMD="geekbench6" fi GB_RUN="True"