From 4396f58f666bd2cee01c5e97daf45d0b8b931724 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 24 Aug 2016 22:09:15 -0400 Subject: [PATCH] Account for Clang and use of ldp (load register pairs) --- cryptest.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index b6bef73d..f8812e19 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -1286,10 +1286,12 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ] FAILED=0 DISASS_TEXT=$("$DISASS" "${DISASSARGS[@]}" "$OBJFILE" 2>/dev/null) - # BLAKE2_NEON_Compress32: 40 each vld1q_u8 and vld1q_u64 + # BLAKE2_NEON_Compress32: 30 each vld1q_u8 and vld1q_u64 # BLAKE2_NEON_Compress64: 22 each vld1q_u8 and vld1q_u64 - COUNT=$(echo "$DISASS_TEXT" | "$EGREP" -i -c 'ldr.*q') - if [[ ("$COUNT" -lt "62") ]]; then + COUNT1=$(echo "$DISASS_TEXT" | "$EGREP" -i -c 'ldr.*q') + COUNT2=$(echo "$DISASS_TEXT" | "$EGREP" -i -c 'ldp.*q') + COUNT=$(($COUNT1 + $(($COUNT2 + $COUNT2)))) + if [[ ("$COUNT" -lt "25") ]]; then FAILED=1 echo "ERROR: failed to generate expected vector load instructions" | tee -a "$TEST_RESULTS" fi