[Gmp-commit] /var/hg/gmp: New tests for Toom squaring.
mercurial at gmplib.org
mercurial at gmplib.org
Sat Apr 14 17:56:09 CEST 2012
details: /var/hg/gmp/rev/166319d51ee5
changeset: 14821:166319d51ee5
user: Marco Bodrato <bodrato at mail.dm.unipi.it>
date: Sat Apr 14 17:55:54 2012 +0200
description:
New tests for Toom squaring.
diffstat:
ChangeLog | 8 ++
tests/mpn/Makefile.am | 1 +
tests/mpn/t-toom2-sqr.c | 5 +
tests/mpn/t-toom3-sqr.c | 5 +
tests/mpn/t-toom4-sqr.c | 5 +
tests/mpn/t-toom6-sqr.c | 5 +
tests/mpn/t-toom8-sqr.c | 5 +
tests/mpn/toom-sqr-shared.h | 140 ++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 174 insertions(+), 0 deletions(-)
diffs (218 lines):
diff -r c2340eeb9a3c -r 166319d51ee5 ChangeLog
--- a/ChangeLog Sat Apr 14 11:56:42 2012 +0200
+++ b/ChangeLog Sat Apr 14 17:55:54 2012 +0200
@@ -15,6 +15,14 @@
* mpz/mul_i.h: Small clean-up.
+ * tests/mpn/toom-sqr-shared.h: New file.
+ * tests/mpn/t-toom2-sqr.c: New file.
+ * tests/mpn/t-toom3-sqr.c: New file.
+ * tests/mpn/t-toom4-sqr.c: New file.
+ * tests/mpn/t-toom6-sqr.c: New file.
+ * tests/mpn/t-toom8-sqr.c: New file.
+ * tests/mpn/Makefile.am (check_PROGRAMS): Add new tests.
+
2012-04-12 Torbjorn Granlund <tege at gmplib.org>
* mpn/x86_64/fastsse/lshift-movdqu2.asm: New file.
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/Makefile.am
--- a/tests/mpn/Makefile.am Sat Apr 14 11:56:42 2012 +0200
+++ b/tests/mpn/Makefile.am Sat Apr 14 17:55:54 2012 +0200
@@ -26,6 +26,7 @@
t-instrument t-iord_u t-mp_bases t-perfsqr t-scan logic \
t-toom22 t-toom32 t-toom33 t-toom42 t-toom43 t-toom44 \
t-toom52 t-toom53 t-toom54 t-toom62 t-toom63 t-toom6h t-toom8h \
+ t-toom2-sqr t-toom3-sqr t-toom4-sqr t-toom6-sqr t-toom8-sqr \
t-mul t-mullo t-mulmod_bnm1 t-sqrmod_bnm1 t-mulmid \
t-hgcd t-hgcd_appr t-matrix22 t-invert t-div t-bdiv
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/t-toom2-sqr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-toom2-sqr.c Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,5 @@
+#define mpn_toomN_sqr mpn_toom2_sqr
+#define mpn_toomN_sqr_itch mpn_toom2_sqr_itch
+#define MIN_AN MPN_TOOM2_SQR_MINSIZE
+
+#include "toom-sqr-shared.h"
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/t-toom3-sqr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-toom3-sqr.c Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,5 @@
+#define mpn_toomN_sqr mpn_toom3_sqr
+#define mpn_toomN_sqr_itch mpn_toom3_sqr_itch
+#define MIN_AN MAX(SQR_TOOM3_THRESHOLD,MPN_TOOM3_SQR_MINSIZE)
+
+#include "toom-sqr-shared.h"
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/t-toom4-sqr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-toom4-sqr.c Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,5 @@
+#define mpn_toomN_sqr mpn_toom4_sqr
+#define mpn_toomN_sqr_itch mpn_toom4_sqr_itch
+#define MIN_AN MAX(SQR_TOOM4_THRESHOLD,MPN_TOOM4_SQR_MINSIZE)
+
+#include "toom-sqr-shared.h"
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/t-toom6-sqr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-toom6-sqr.c Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,5 @@
+#define mpn_toomN_sqr mpn_toom6_sqr
+#define mpn_toomN_sqr_itch mpn_toom6_sqr_itch
+#define MIN_AN MAX(SQR_TOOM6_THRESHOLD,MPN_TOOM6_SQR_MINSIZE)
+
+#include "toom-sqr-shared.h"
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/t-toom8-sqr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/t-toom8-sqr.c Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,5 @@
+#define mpn_toomN_sqr mpn_toom8_sqr
+#define mpn_toomN_sqr_itch mpn_toom8_sqr_itch
+#define MIN_AN MAX(SQR_TOOM8_THRESHOLD,MPN_TOOM8_SQR_MINSIZE)
+
+#include "toom-sqr-shared.h"
diff -r c2340eeb9a3c -r 166319d51ee5 tests/mpn/toom-sqr-shared.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mpn/toom-sqr-shared.h Sat Apr 14 17:55:54 2012 +0200
@@ -0,0 +1,140 @@
+/* Test for various Toom squaring functions.
+
+Copyright 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser 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 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 Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "gmp.h"
+#include "gmp-impl.h"
+#include "tests.h"
+
+/* Main file is expected to define mpn_toomN_mul, mpn_toomN_sqr_itch,
+ * MIN_AN and then include this file. */
+
+/* Sizes are up to 2^SIZE_LOG limbs */
+#ifndef SIZE_LOG
+#define SIZE_LOG 10
+#endif
+
+#ifndef COUNT
+#define COUNT 500
+#endif
+
+#define MAX_AN (1L << SIZE_LOG)
+
+int
+main (int argc, char **argv)
+{
+ mp_ptr ap, refp, pp, scratch;
+ int count = COUNT;
+ int test;
+ gmp_randstate_ptr rands;
+ TMP_DECL;
+ TMP_MARK;
+
+ if (argc > 1)
+ {
+ char *end;
+ count = strtol (argv[1], &end, 0);
+ if (*end || count <= 0)
+ {
+ fprintf (stderr, "Invalid test count: %s.\n", argv[1]);
+ return 1;
+ }
+ }
+
+ tests_start ();
+ rands = RANDS;
+
+ ap = TMP_ALLOC_LIMBS (MAX_AN);
+ refp = TMP_ALLOC_LIMBS (MAX_AN * 2);
+ pp = 1 + TMP_ALLOC_LIMBS (MAX_AN * 2 + 2);
+ scratch
+ = 1+TMP_ALLOC_LIMBS (mpn_toomN_sqr_itch (MAX_AN) + 2);
+
+ for (test = 0; test < count; test++)
+ {
+ unsigned size_min;
+ unsigned size_range;
+ mp_size_t an;
+ mp_size_t itch;
+ mp_limb_t p_before, p_after, s_before, s_after;
+
+ for (size_min = 1; (1L << size_min) < MIN_AN; size_min++)
+ ;
+
+ /* We generate an in the MIN_AN <= an <= (1 << size_range). */
+ size_range = size_min
+ + gmp_urandomm_ui (rands, SIZE_LOG + 1 - size_min);
+
+ an = MIN_AN
+ + gmp_urandomm_ui (rands, (1L << size_range) + 1 - MIN_AN);
+
+ mpn_random2 (ap, an);
+ mpn_random2 (pp-1, an * 2 + 2);
+ p_before = pp[-1];
+ p_after = pp[an * 2];
+
+ itch = mpn_toomN_sqr_itch (an);
+ ASSERT_ALWAYS (itch <= mpn_toomN_sqr_itch (MAX_AN));
+ mpn_random2 (scratch-1, itch+2);
+ s_before = scratch[-1];
+ s_after = scratch[itch];
+
+ mpn_toomN_sqr (pp, ap, an, scratch);
+ refmpn_mul (refp, ap, an, ap, an);
+ if (pp[-1] != p_before || pp[an * 2] != p_after
+ || scratch[-1] != s_before || scratch[itch] != s_after
+ || mpn_cmp (refp, pp, an * 2) != 0)
+ {
+ printf ("ERROR in test %d, an = %d\n",
+ test, (int) an);
+ if (pp[-1] != p_before)
+ {
+ printf ("before pp:"); mpn_dump (pp -1, 1);
+ printf ("keep: "); mpn_dump (&p_before, 1);
+ }
+ if (pp[an * 2] != p_after)
+ {
+ printf ("after pp:"); mpn_dump (pp + an * 2, 1);
+ printf ("keep: "); mpn_dump (&p_after, 1);
+ }
+ if (scratch[-1] != s_before)
+ {
+ printf ("before scratch:"); mpn_dump (scratch-1, 1);
+ printf ("keep: "); mpn_dump (&s_before, 1);
+ }
+ if (scratch[itch] != s_after)
+ {
+ printf ("after scratch:"); mpn_dump (scratch + itch, 1);
+ printf ("keep: "); mpn_dump (&s_after, 1);
+ }
+ mpn_dump (ap, an);
+ mpn_dump (pp, an * 2);
+ mpn_dump (refp, an * 2);
+
+ abort();
+ }
+ }
+ TMP_FREE;
+
+ tests_end ();
+ return 0;
+}
More information about the gmp-commit
mailing list