summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xGNUmakefile2
-rw-r--r--ppc_simd.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index e71e248a..1b5c4a00 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -648,7 +648,6 @@ ifeq ($(DETECT_FEATURES),1)
SHA_FLAG = $(POWER8_FLAG)
SHACAL2_FLAG = $(POWER8_FLAG)
SIMECK_FLAG = $(POWER8_FLAG)
- SIMON128_FLAG = $(POWER8_FLAG)
else
POWER8_FLAG =
endif
@@ -717,6 +716,7 @@ ifeq ($(DETECT_FEATURES),1)
SIMON64_FLAG = $(ALTIVEC_FLAG)
SPECK64_FLAG = $(ALTIVEC_FLAG)
SPECK128_FLAG = $(ALTIVEC_FLAG)
+ SIMON128_FLAG = $(ALTIVEC_FLAG)
endif
#####################################################################
diff --git a/ppc_simd.h b/ppc_simd.h
index 3897bd6a..12ddaceb 100644
--- a/ppc_simd.h
+++ b/ppc_simd.h
@@ -2079,6 +2079,8 @@ inline uint32x4_p VecRotateLeft64(const uint32x4_p val)
#endif
}
+// Disable during testing
+#if 0
/// \brief Rotate a vector left as if uint64x2_p
/// \param vec the vector
/// \returns vector
@@ -2099,6 +2101,7 @@ inline uint32x4_p VecRotateLeft64<8>(const uint32x4_p val)
return VecPermute(val, m);
#endif
}
+#endif
// 64-bit elements available at POWER7 with VSX, but vec_rl and vec_sl require POWER8
#if defined(_ARCH_PWR8) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
@@ -2167,6 +2170,8 @@ inline uint32x4_p VecRotateRight64(const uint32x4_p val)
#endif
}
+// Disable during testing
+#if 0
/// \brief Rotate a vector right as if uint64x2_p
/// \param vec the vector
/// \returns vector
@@ -2188,6 +2193,7 @@ inline uint32x4_p VecRotateRight64<8>(const uint32x4_p val)
return VecPermute(val, m);
#endif
}
+#endif
#if defined(__VSX__) || defined(_ARCH_PWR8) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
/// \brief Rotate a vector right as if uint64x2_p