[Gmp-commit] /var/hg/gmp: 2 new changesets
mercurial at gmplib.org
mercurial at gmplib.org
Mon Sep 30 21:06:19 UTC 2019
details: /var/hg/gmp/rev/8071da8b428e
changeset: 17928:8071da8b428e
user: Niels M?ller <nisse at lysator.liu.se>
date: Mon Sep 30 22:59:54 2019 +0200
description:
Unit test for mpn_gcdext_1.
details: /var/hg/gmp/rev/397b0a8e50de
changeset: 17929:397b0a8e50de
user: Niels M?ller <nisse at lysator.liu.se>
date: Mon Sep 30 23:05:52 2019 +0200
description:
mini-gmp: Stricter validity checks for gcdext corner cases.
diffstat:
ChangeLog | 4 +
mini-gmp/ChangeLog | 5 +
mini-gmp/tests/t-gcd.c | 10 ++-
tests/mpn/Makefile.am | 2 +-
tests/mpn/t-gcdext_1.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 147 insertions(+), 5 deletions(-)
diffs (193 lines):
diff -r 44543bbf85d6 -r 397b0a8e50de ChangeLog
--- a/ChangeLog Sun Sep 29 22:48:44 2019 +0200
+++ b/ChangeLog Mon Sep 30 23:05:52 2019 +0200
@@ -1,3 +1,7 @@
+2019-09-30 Niels Möller <nisse at lysator.liu.se>
+
+ * tests/mpn/t-gcdext_1.c: New test.
+
2019-09-23 Niels Möller <nisse at lysator.liu.se>
* gmp-impl.h (hgcd2_func_t) [TUNE_PROGRAM_BUILD]: New typedef.
diff -r 44543bbf85d6 -r 397b0a8e50de mini-gmp/ChangeLog
--- a/mini-gmp/ChangeLog Sun Sep 29 22:48:44 2019 +0200
+++ b/mini-gmp/ChangeLog Mon Sep 30 23:05:52 2019 +0200
@@ -1,3 +1,8 @@
+2019-09-30 Niels Möller <nisse at lysator.liu.se>
+
+ * tests/t-gcd.c (gcdext_valid_p): Stricter checks for gcdext
+ corner cases.
+
2018-11-07 Marco Bodrato <bodrato at mail.dm.unipi.it>
* mini-gmp/mini-gmp.c: Silence a couple of warnings.
diff -r 44543bbf85d6 -r 397b0a8e50de mini-gmp/tests/t-gcd.c
--- a/mini-gmp/tests/t-gcd.c Sun Sep 29 22:48:44 2019 +0200
+++ b/mini-gmp/tests/t-gcd.c Mon Sep 30 23:05:52 2019 +0200
@@ -41,13 +41,15 @@
if (mpz_sgn (a) == 0)
{
/* Must have g == abs (b). Any value for s is in some sense "correct",
- but it makes sense to require that s == 0. */
- return mpz_cmpabs (g, b) == 0 && mpz_sgn (s) == 0;
+ but it makes sense to require that s == 0, t = sgn (b)*/
+ return mpz_cmpabs (g, b) == 0
+ && mpz_sgn (s) == 0 && mpz_cmp_si (t, mpz_sgn (b)) == 0;
}
else if (mpz_sgn (b) == 0)
{
- /* Must have g == abs (a), s == sign (a) */
- return mpz_cmpabs (g, a) == 0 && mpz_cmp_si (s, mpz_sgn (a)) == 0;
+ /* Must have g == abs (a), s == sign (a), t = 0 */
+ return mpz_cmpabs (g, a) == 0
+ && mpz_cmp_si (s, mpz_sgn (a)) == 0 && mpz_sgn (t) == 0;
}
if (mpz_sgn (g) <= 0)
diff -r 44543bbf85d6 -r 397b0a8e50de tests/mpn/Makefile.am
--- a/tests/mpn/Makefile.am Sun Sep 29 22:48:44 2019 +0200
+++ b/tests/mpn/Makefile.am Mon Sep 30 23:05:52 2019 +0200
@@ -29,7 +29,7 @@
t-toom2-sqr t-toom3-sqr t-toom4-sqr t-toom6-sqr t-toom8-sqr \
t-div t-mul t-mullo t-sqrlo t-mulmod_bnm1 t-sqrmod_bnm1 t-mulmid \
t-hgcd t-hgcd_appr t-matrix22 t-invert t-bdiv t-fib2m \
- t-broot t-brootinv t-minvert t-sizeinbase t-gcd_11 t-gcd_22
+ t-broot t-brootinv t-minvert t-sizeinbase t-gcd_11 t-gcd_22 t-gcdext_1
EXTRA_DIST = toom-shared.h toom-sqr-shared.h
diff -r 44543bbf85d6 -r 397b0a8e50de tests/mpn/t-gcdext_1.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-gcdext_1.c Mon Sep 30 23:05:52 2019 +0200
@@ -0,0 +1,131 @@
+/* Test mpn_gcdext_1.
+
+Copyright 2019 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library test suite.
+
+The GNU MP Library test suite is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version.
+
+The GNU MP Library test suite is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+the GNU MP Library test suite. If not, see https://www.gnu.org/licenses/. */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "gmp-impl.h"
+#include "tests.h"
+
+#ifndef COUNT
+#define COUNT 10000
+#endif
+
+static void
+set_signed_limb (mpz_t r, mp_limb_signed_t x)
+{
+ mpz_t t;
+ mp_limb_t abs_x = ABS_CAST(mp_limb_t, x);
+ mpz_set (r, mpz_roinit_n (t, &abs_x, 1));
+ if (x < 0)
+ mpz_neg (r, r);
+}
+
+static void
+one_test (mp_limb_t a, mp_limb_t b)
+{
+ mp_limb_signed_t s, t;
+ mp_limb_t g;
+
+ g = mpn_gcdext_1 (&s, &t, a, b);
+
+ if (g > 0)
+ {
+ mpz_t d, sz, tz, tmp;
+
+ mpz_init (d);
+ mpz_init (sz);
+ mpz_init (tz);
+
+ set_signed_limb (sz, s);
+ set_signed_limb (tz, t);
+
+ mpz_mul (d, mpz_roinit_n (tmp, &a, 1), sz);
+ mpz_addmul (d, mpz_roinit_n (tmp, &b, 1), tz);
+
+ if (mpz_cmp (d, mpz_roinit_n (tmp, &g, 1)) == 0
+ && a % g == 0 && b % g == 0)
+ {
+ mp_limb_t a_div_g = a / g;
+ mp_limb_t b_div_g = b / g;
+ mp_limb_t abs_s = ABS_CAST(mp_limb_t, s);
+ mp_limb_t abs_t = ABS_CAST(mp_limb_t, t);
+ mpz_mul_ui (sz, sz, 2);
+ mpz_mul_ui (tz, tz, 2);
+ if ((abs_s == 1 || mpz_cmpabs_ui (sz, b_div_g) < 0)
+ && (abs_t == 1 || mpz_cmpabs_ui (tz, a_div_g) < 0))
+ {
+ mpz_clear (d);
+ mpz_clear (sz);
+ mpz_clear (tz);
+
+ return;
+ }
+ }
+ }
+ gmp_fprintf (stderr,
+ "gcdext_1 (0x%Mx, 0x%Mx) failed, got: g = 0x%Mx, s = %s0x%Mx, t = %s0x%Mx\n",
+ a, b, g,
+ s < 0 ? "-" : "", ABS_CAST(mp_limb_t, s),
+ t < 0 ? "-" : "", ABS_CAST(mp_limb_t, t));
+ abort();
+}
+
+int
+main (int argc, char **argv)
+{
+ mpz_t a, b;
+ int count = COUNT;
+ int test;
+ gmp_randstate_ptr rands;
+
+ TESTS_REPS (count, argv, argc);
+
+ tests_start ();
+ rands = RANDS;
+
+ mpz_init (a);
+ mpz_init (b);
+ for (test = 0; test < count; test++)
+ {
+ mp_limb_t al, bl;
+ mp_bitcnt_t asize = 1 + gmp_urandomm_ui(rands, GMP_NUMB_BITS);
+ mp_bitcnt_t bsize = 1 + gmp_urandomm_ui(rands, GMP_NUMB_BITS);
+ if (test & 1)
+ {
+ mpz_urandomb (a, rands, asize);
+ mpz_urandomb (b, rands, bsize);
+ }
+ else
+ {
+ mpz_rrandomb (a, rands, asize);
+ mpz_rrandomb (b, rands, bsize);
+ }
+
+ al = mpz_getlimbn (a, 0);
+ bl = mpz_getlimbn (b, 0);
+ al += (al == 0);
+ bl += (bl == 0);
+
+ one_test (al, bl);
+ }
+
+ mpz_clear (a);
+ mpz_clear (b);
+}
More information about the gmp-commit
mailing list