diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-03-08 01:41:40 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-03-08 01:41:40 -0500 |
| commit | 1f5d2f42ef53cef209b26c98a2d4dd9ab565c25b (patch) | |
| tree | b75339fe0b83cf8b2f1c97d5be705d866264d090 /TestScripts/cryptest.sh | |
| parent | 6ba0dca414cc1ad28dd5a61bde8279e5fc868685 (diff) | |
| download | cryptopp-git-1f5d2f42ef53cef209b26c98a2d4dd9ab565c25b.tar.gz | |
Update messages in cryptest.sh
Diffstat (limited to 'TestScripts/cryptest.sh')
| -rwxr-xr-x | TestScripts/cryptest.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index 41e7f1ba..7f51195a 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -176,6 +176,12 @@ if [[ ("$IS_X86" -ne 0 || "$IS_X64" -ne 0) ]]; then elif [[ ("$IS_ARM32" -ne 0 || "$IS_ARM64" -ne 0) ]]; then if [[ ("$IS_DARWIN" -ne 0) ]]; then ARM_CPU_FLAGS="$(sysctl machdep.cpu.features 2>&1 | cut -f 2 -d ':')" + # Apple M1 workaround + if [[ -z "$ARM_CPU_FLAGS" ]]; then + if [[ $(sysctl -a | grep -i -E 'hw.optional.arm64: 1') ]]; then + ARM_CPU_FLAGS="armv8 asimd crc crypto" + fi + fi else ARM_CPU_FLAGS="$($AWK '{IGNORECASE=1}{if ($1 == "Features"){print;exit}}' < /proc/cpuinfo | cut -f 2 -d ':')" fi @@ -1547,7 +1553,7 @@ if [[ ("$HAVE_DISASS" -ne 0 && ("$IS_ARM32" -ne 0 || "$IS_ARM64" -ne 0)) ]]; the COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vshl') if [[ ("$COUNT" -lt 16) ]]; then FAILED=1 - echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS" + echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS" fi fi @@ -1556,14 +1562,14 @@ if [[ ("$HAVE_DISASS" -ne 0 && ("$IS_ARM32" -ne 0 || "$IS_ARM64" -ne 0)) ]]; the COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'shr[[:space:]]*v') if [[ ("$COUNT" -lt 16) ]]; then FAILED=1 - echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS" + echo "ERROR: failed to generate NEON shift right instructions" | tee -a "$TEST_RESULTS" fi else # ARIA::UncheckedKeySet: 17 vshr COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vshr') if [[ ("$COUNT" -lt 16) ]]; then FAILED=1 - echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS" + echo "ERROR: failed to generate NEON shift right instructions" | tee -a "$TEST_RESULTS" fi fi |