Respect MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX

justsmth · Aug 23, 2024 · 7316076 · 7316076
1 parent 91be6cf
commit 7316076
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/crypto/fipsmodule/bn/bn_test.cc b/crypto/fipsmodule/bn/bn_test.cc
@@ -2844,12 +2844,14 @@ TEST_F(BNTest, BNMulMontABI) {
     b[0] = 42;
 
 #if defined(OPENSSL_X86_64)
+#if !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
     if (bn_mulx4x_mont_capable(words)) {
       CHECK_ABI(bn_mulx4x_mont, r.data(), a.data(), b.data(), mont->N.d,
                 mont->n0, words);
       CHECK_ABI(bn_mulx4x_mont, r.data(), a.data(), a.data(), mont->N.d,
                 mont->n0, words);
     }
+#endif // !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
     if (bn_mul4x_mont_capable(words)) {
       CHECK_ABI(bn_mul4x_mont, r.data(), a.data(), b.data(), mont->N.d,
                 mont->n0, words);
@@ -2860,10 +2862,12 @@ TEST_F(BNTest, BNMulMontABI) {
               mont->n0, words);
     CHECK_ABI(bn_mul_mont_nohw, r.data(), a.data(), a.data(), mont->N.d,
               mont->n0, words);
+#if !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
     if (bn_sqr8x_mont_capable(words)) {
       CHECK_ABI(bn_sqr8x_mont, r.data(), a.data(), a.data(), mont->N.d,
                 mont->n0, words);
     }
+#endif // !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
 #else
     CHECK_ABI(bn_mul_mont, r.data(), a.data(), b.data(), mont->N.d, mont->n0,
               words);

diff --git a/crypto/fipsmodule/bn/internal.h b/crypto/fipsmodule/bn/internal.h
@@ -414,6 +414,7 @@ OPENSSL_INLINE int bn_mul4x_mont_capable(size_t num) {
 }
 int bn_mul4x_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
                   const BN_ULONG *np, const BN_ULONG *n0, size_t num);
+#if !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
 OPENSSL_INLINE int bn_mulx4x_mont_capable(size_t num) {
   // MULX is in BMI2.
   return bn_mul4x_mont_capable(num) && CRYPTO_is_BMI2_capable() &&
@@ -426,6 +427,7 @@ OPENSSL_INLINE int bn_sqr8x_mont_capable(size_t num) {
 }
 int bn_sqr8x_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *unused_bp,
                   const BN_ULONG *np, const BN_ULONG *n0, size_t num);
+#endif // !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
 #endif // defined(OPENSSL_X86_64)
 
 #endif

diff --git a/crypto/fipsmodule/bn/montgomery.c b/crypto/fipsmodule/bn/montgomery.c
@@ -637,12 +637,14 @@ void bn_mod_mul_montgomery_small(BN_ULONG *r, const BN_ULONG *a,
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
                 const BN_ULONG *np, const BN_ULONG *n0, size_t num)
 {
+#if !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
   if (ap == bp && bn_sqr8x_mont_capable(num)) {
     return bn_sqr8x_mont(rp, ap, bp, np, n0, num);
   }
   if (bn_mulx4x_mont_capable(num)) {
     return bn_mulx4x_mont(rp, ap, bp, np, n0, num);
   }
+#endif // !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX)
   if (bn_mul4x_mont_capable(num)) {
     return bn_mul4x_mont(rp, ap, bp, np, n0, num);
   }