diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-09-02 06:18:08 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-09-02 06:18:08 -0400 |
| commit | a57cd5e1932443241f729e6c7e6b21869ae0dc48 (patch) | |
| tree | 73fb75d122e7ceca78c6ef08a23e59b935be3644 /cryptest.sh | |
| parent | 5b12be29e6732fe4f7c1a7f74b0bf2d75f720128 (diff) | |
| download | cryptopp-git-a57cd5e1932443241f729e6c7e6b21869ae0dc48.tar.gz | |
Update test script
Diffstat (limited to 'cryptest.sh')
| -rwxr-xr-x | cryptest.sh | 69 |
1 files changed, 48 insertions, 21 deletions
diff --git a/cryptest.sh b/cryptest.sh index 9037c920..d73e0a8f 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -1315,30 +1315,30 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ] DISASS_TEXT=$("$DISASS" "${DISASSARGS[@]}" "$OBJFILE" 2>/dev/null) if [[ ("$HAVE_ARMV8A" -ne "0") ]]; then - # ARIA::UncheckedKeySet: 8 vld1q.32 - COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vld') - if [[ ("$COUNT" -lt "8") ]]; then + # ARIA::UncheckedKeySet: 4 ldr q{N} + COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'ldr[[:space:]]*q') + if [[ ("$COUNT" -lt "4") ]]; then FAILED=1 echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS" fi else # ARMv7 - # ARIA::UncheckedKeySet: 6 vld1.32 {d1,d2} + # ARIA::UncheckedKeySet: 4 vld1.32 {d1,d2} COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vld1.32[[:space:]]*{') - if [[ ("$COUNT" -lt "6") ]]; then + if [[ ("$COUNT" -lt "4") ]]; then FAILED=1 echo "ERROR: failed to generate NEON load instructions" | tee -a "$TEST_RESULTS" fi fi if [[ ("$HAVE_ARMV8A" -ne "0") ]]; then - # ARIA::UncheckedKeySet: 20 vstr1q.32 - COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vst') - if [[ ("$COUNT" -lt "20") ]]; then + # ARIA::UncheckedKeySet: 17 str q{N} + COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'str[[:space:]]*q') + if [[ ("$COUNT" -lt "16") ]]; then FAILED=1 echo "ERROR: failed to generate NEON store instructions" | tee -a "$TEST_RESULTS" fi else - # ARIA::UncheckedKeySet: 16 vstr1.32 {d1,d2} + # ARIA::UncheckedKeySet: 17 vstr1.32 {d1,d2} COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'vst1.32[[:space:]]*{') if [[ ("$COUNT" -lt "16") ]]; then FAILED=1 @@ -1346,23 +1346,50 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ] fi fi - # ARIA::UncheckedKeySet: 17 vshl.32 - COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl') - if [[ ("$COUNT" -lt "17") ]]; then - FAILED=1 - echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS" + if [[ ("$HAVE_ARMV8A" -ne "0") ]]; then + # ARIA::UncheckedKeySet: 17 shl v{N} + COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'shl[[:space:]]*v') + if [[ ("$COUNT" -lt "16") ]]; then + FAILED=1 + echo "ERROR: failed to generate NEON shift left instructions" | tee -a "$TEST_RESULTS" + fi + else + # ARIA::UncheckedKeySet: 17 vshl + 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" + fi fi - # ARIA::UncheckedKeySet: 17 vshr.32 - COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c 'vshl') - if [[ ("$COUNT" -lt "17") ]]; then - FAILED=1 - echo "ERROR: failed to generate NEON shift right instructions" | tee -a "$TEST_RESULTS" + if [[ ("$HAVE_ARMV8A" -ne "0") ]]; then + # ARIA::UncheckedKeySet: 17 shr v{N} + 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" + 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" + fi + fi + + if [[ ("$HAVE_ARMV8A" -ne "0") ]]; then + # ARIA::UncheckedKeySet: 12 ext v{N} + COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'ext[[:space:]]*v') + if [[ ("$COUNT" -lt "12") ]]; then + FAILED=1 + echo "ERROR: failed to generate NEON extract instructions" | tee -a "$TEST_RESULTS" + fi fi - # ARIA::UncheckedKeySet: 34 veor + # ARIA::UncheckedKeySet: 17 veor COUNT=$(echo -n "$DISASS_TEXT" | "$GREP" -i -c -E 'eor.*v|veor') - if [[ ("$COUNT" -lt "34") ]]; then + if [[ ("$COUNT" -lt "16") ]]; then FAILED=1 echo "ERROR: failed to generate NEON xor instructions" | tee -a "$TEST_RESULTS" fi |