arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update test script for AIX

pull/484/head
Jeffrey Walton 2017-08-31 08:05:48 -04:00
parent 0d6f349749
commit 6c35eaf737
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TestScripts/cryptest.sh
View File

@ -94,6 +94,7 @@ if [[ ! -z "$GMAKE" ]]; then
fi
THIS_SYSTEM=$(uname -s 2>&1)
IS_AIX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c aix)
IS_DARWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c darwin)
IS_LINUX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c linux)
IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c cygwin)
@ -707,6 +708,8 @@ elif [[ "$IS_SOLARIS" -ne "0" ]]; then
echo "IS_SOLARIS: $IS_SOLARIS" | tee -a "$TEST_RESULTS"
elif [[ "$IS_DARWIN" -ne "0" ]]; then
echo "IS_DARWIN: $IS_DARWIN" | tee -a "$TEST_RESULTS"
elif [[ "$IS_AIX" -ne "0" ]]; then
echo "IS_AIX: $IS_AIX" | tee -a "$TEST_RESULTS"
fi
if [[ "$IS_PPC" -ne "0" ]]; then
@ -816,6 +819,9 @@ elif [[ "$IS_DARWIN" -ne "0" ]]; then
elif [[ "$IS_SOLARIS" -ne "0" ]]; then
CPU_COUNT=$(psrinfo 2>/dev/null | wc -l | "$AWK" '{print $1}')
MEM_SIZE=$(prtconf 2>/dev/null | "$GREP" Memory | "$AWK" '{print $3}')
elif [[ "$IS_AIX" -ne "0" ]]; then
CPU_COUNT=$(bindprocessor -q 2>/dev/null | cut -f 2 -d ':' | wc -w | "$AWK" '{print $1}')
MEM_SIZE=$(prtconf -m 2>/dev/null | "$GREP" 'MB' | "$AWK" '{print $3; exit;}')
fi
# Benchmarks expect frequency in GiHz.
@ -833,6 +839,9 @@ elif [[ "$IS_DARWIN" -ne "0" ]]; then
elif [[ "$IS_SOLARIS" -ne "0" ]]; then
CPU_FREQ=$(psrinfo -v 2>/dev/null | "$GREP" 'MHz' | "$AWK" '{print $6; exit;}')
CPU_FREQ=$("$AWK" "BEGIN {print $CPU_FREQ/1024}")
elif [[ "$IS_AIX" -ne "0" ]]; then
CPU_FREQ=$(prtconf -s 2>/dev/null | "$GREP" 'MHz' | "$AWK" '{print $4; exit;}')
CPU_FREQ=$("$AWK" "BEGIN {print $CPU_FREQ/1024}")
fi
# Some ARM devboards cannot use 'make -j N', even with multiple cores and RAM

2
config.h
View File

@ -516,7 +516,7 @@ NAMESPACE_END
#define CRYPTOPP_AESNI_AVAILABLE 1
#endif
// Guessing at SHA for SunCC. Its not in Sun Studio 12.6. Also see
// Guessing at SHA for SunCC. Its not in Sun Studio 12.6. Also see
// http://stackoverflow.com/questions/45872180/which-xarch-for-sha-extensions-on-solaris
#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SHA) && \
(defined(__SHA__) || (CRYPTOPP_MSC_VERSION >= 1900) || (__SUNPRO_CC >= 0x5160) || \

9
cryptest.sh
View File

@ -94,6 +94,7 @@ if [[ ! -z "$GMAKE" ]]; then
fi
THIS_SYSTEM=$(uname -s 2>&1)
IS_AIX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c aix)
IS_DARWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c darwin)
IS_LINUX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c linux)
IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c cygwin)
@ -707,6 +708,8 @@ elif [[ "$IS_SOLARIS" -ne "0" ]]; then
echo "IS_SOLARIS: $IS_SOLARIS" | tee -a "$TEST_RESULTS"
elif [[ "$IS_DARWIN" -ne "0" ]]; then
echo "IS_DARWIN: $IS_DARWIN" | tee -a "$TEST_RESULTS"
elif [[ "$IS_AIX" -ne "0" ]]; then
echo "IS_AIX: $IS_AIX" | tee -a "$TEST_RESULTS"
fi
if [[ "$IS_PPC" -ne "0" ]]; then
@ -816,6 +819,9 @@ elif [[ "$IS_DARWIN" -ne "0" ]]; then
elif [[ "$IS_SOLARIS" -ne "0" ]]; then
CPU_COUNT=$(psrinfo 2>/dev/null | wc -l | "$AWK" '{print $1}')
MEM_SIZE=$(prtconf 2>/dev/null | "$GREP" Memory | "$AWK" '{print $3}')
elif [[ "$IS_AIX" -ne "0" ]]; then
CPU_COUNT=$(bindprocessor -q 2>/dev/null | cut -f 2 -d ':' | wc -w | "$AWK" '{print $1}')
MEM_SIZE=$(prtconf -m 2>/dev/null | "$GREP" 'MB' | "$AWK" '{print $3; exit;}')
fi
# Benchmarks expect frequency in GiHz.
@ -833,6 +839,9 @@ elif [[ "$IS_DARWIN" -ne "0" ]]; then
elif [[ "$IS_SOLARIS" -ne "0" ]]; then
CPU_FREQ=$(psrinfo -v 2>/dev/null | "$GREP" 'MHz' | "$AWK" '{print $6; exit;}')
CPU_FREQ=$("$AWK" "BEGIN {print $CPU_FREQ/1024}")
elif [[ "$IS_AIX" -ne "0" ]]; then
CPU_FREQ=$(prtconf -s 2>/dev/null | "$GREP" 'MHz' | "$AWK" '{print $4; exit;}')
CPU_FREQ=$("$AWK" "BEGIN {print $CPU_FREQ/1024}")
fi
# Some ARM devboards cannot use 'make -j N', even with multiple cores and RAM