diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index 729a0af3..73bf6f5a 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -1867,6 +1867,9 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_PPC32" -ne "0" || "$IS_PPC64" -ne "0")) ] fi fi + ############################################ + # Power8 VMULL + PPC_VMULL=0 if [[ ("$PPC_VMULL" -eq "0") ]]; then "$CXX" -DCRYPTOPP_ADHOC_MAIN -mcpu=power8 adhoc.cpp -o "$TMPDIR/adhoc.exe" > /dev/null 2>&1 @@ -1886,10 +1889,10 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_PPC32" -ne "0" || "$IS_PPC64" -ne "0")) ] if [[ ("$PPC_VMULL" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Power8 Polynomial Multiply generation" | tee -a "$TEST_RESULTS" + echo "Testing: Power8 carryless multiply generation" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Power8 Polynomial Multiply generation") + TEST_LIST+=("Power8 carryless multiply generation") OBJFILE=gcm-simd.o; rm -f "$OBJFILE" 2>/dev/null CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS $PPC_VMULL_FLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS" diff --git a/cryptest.sh b/cryptest.sh index 729a0af3..73bf6f5a 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -1867,6 +1867,9 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_PPC32" -ne "0" || "$IS_PPC64" -ne "0")) ] fi fi + ############################################ + # Power8 VMULL + PPC_VMULL=0 if [[ ("$PPC_VMULL" -eq "0") ]]; then "$CXX" -DCRYPTOPP_ADHOC_MAIN -mcpu=power8 adhoc.cpp -o "$TMPDIR/adhoc.exe" > /dev/null 2>&1 @@ -1886,10 +1889,10 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_PPC32" -ne "0" || "$IS_PPC64" -ne "0")) ] if [[ ("$PPC_VMULL" -ne "0") ]]; then echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Power8 Polynomial Multiply generation" | tee -a "$TEST_RESULTS" + echo "Testing: Power8 carryless multiply generation" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Power8 Polynomial Multiply generation") + TEST_LIST+=("Power8 carryless multiply generation") OBJFILE=gcm-simd.o; rm -f "$OBJFILE" 2>/dev/null CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS $PPC_VMULL_FLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"