[Gmp-commit] /var/hg/gmp-6.2: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp-6.2/rev/a5f584369d25
changeset: 18061:a5f584369d25
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Thu Jun 18 17:20:56 2020 +0200
description:
Revert accidental change.

details:   /var/hg/gmp-6.2/rev/70bad7fb963a
changeset: 18062:70bad7fb963a
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Thu Jun 18 17:21:38 2020 +0200
description:
Provide missing patch of: Provide test for add_ssaaaa and sub_ddmmss.

diffstat:

 .bootstrap                        |    7 --
 tests/devel/gen-test-longlong_h.c |  122 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 7 deletions(-)

diffs (143 lines):

diff -r dc336881f34b -r 70bad7fb963a .bootstrap
--- a/.bootstrap	Thu Jun 18 17:13:44 2020 +0200
+++ b/.bootstrap	Thu Jun 18 17:21:38 2020 +0200
@@ -7,13 +7,6 @@
 autoreconf -i -s
 # aclocal && libtoolize && autoconf && autoheader && automake -a
 
-cp -L ltmain.sh foo;  rm ltmain.sh;  mv foo ltmain.sh
-cp -L ylwrap foo;     rm ylwrap;     mv foo ylwrap
-cp -L install-sh foo; rm install-sh; mv foo install-sh
-cp -L missing foo;    rm missing;    mv foo missing
-cp -L test-driver foo;rm test-driver;mv foo test-driver
-rm -rf autom4te.cache
-
 cat >doc/version.texi <<EOF
 @set UPDATED 19 January 2038
 @set UPDATED-MONTH January 2038
diff -r dc336881f34b -r 70bad7fb963a tests/devel/gen-test-longlong_h.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/devel/gen-test-longlong_h.c	Thu Jun 18 17:21:38 2020 +0200
@@ -0,0 +1,122 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+typedef unsigned long mp_limb_t; /* neat */
+
+void
+one (const char *op, size_t ind, mp_limb_t m0, mp_limb_t s0)
+{
+  printf ("static void f%zu(mp_limb_t*r1p,mp_limb_t*r0p){", ind);
+  printf ("mp_limb_t r1,r0;");
+  printf ("%s(r1,r0,0,%ld,0,%ld);", op, (long) m0, (long) s0);
+  printf ("*r1p=r1;*r0p=r0;");
+  printf ("}\n");
+}
+
+mp_limb_t ops[1000];
+
+enum what_t {ADD, SUB};
+
+int
+main (int argc, char **argv)
+{
+  size_t n_operands = 0;
+  size_t n_functions = 0;
+  const char *op;
+  enum what_t what;
+
+  if (argc == 2 && strcmp (argv[1], "add") == 0)
+    {
+      op = "add_ssaaaa";
+      what = ADD;
+    }
+  else if (argc == 2 && strcmp (argv[1], "sub") == 0)
+    {
+      op = "sub_ddmmss";
+      what = SUB;
+    }
+  else
+    {
+      fprintf (stderr, "what do yuo want me to do?\n");
+      exit (1);
+    }
+
+  for (int i = 0; i < 16; i++)
+    {
+      ops[n_operands++] = 1 << i;
+      ops[n_operands++] = -(1 << i);
+      ops[n_operands++] = (1 << i) - 1;
+      ops[n_operands++] = -(1 << i) - 1;
+    }
+
+  printf ("#include <stdlib.h>\n");
+  printf ("#include <stdio.h>\n");
+  printf ("#include \"gmp-impl.h\"\n");
+  printf ("#include \"longlong.h\"\n");
+
+  /* Print out ops[] definition.  */
+  printf ("static const int ops[%zu] = {\n", n_operands);
+  for (int i = 0; i < n_operands; i++)
+    {
+      printf ("%ld,", (long) ops[i]);
+      if ((i + 1) % 4 == 0)
+	puts ("");
+    }
+  printf ("};\n");
+
+  /* Generate functions and print them.  */
+  for (int i = 0; i < n_operands; i++)
+    {
+      for (int j = 0; j < n_operands; j++)
+	{
+	  one (op, n_functions++, ops[i], ops[j]);
+	}
+    }
+
+  /* Print out function pointer table.  */
+  printf ("typedef void (*func_t) (mp_limb_t*, mp_limb_t*);\n");
+  printf ("static const func_t funcs[%zu] = {\n", n_functions);
+  for (size_t i = 0; i < n_functions; i++)
+    {
+      printf ("f%zu,", i);
+      if ((i + 1) % 16 == 0)
+	puts ("");
+    }
+  printf ("};\n");
+
+  /* Print out table of reference results.  */
+  printf ("static const int ref[%zu][2] = {\n", n_functions);
+  for (int i = 0; i < n_operands; i++)
+    {
+      for (int j = 0; j < n_operands; j++)
+	{
+	  if (what == ADD)
+	    printf ("{%6ld,%2ld},", (long) ( ops[i] + ops[j]), (long) ((mp_limb_t) ((ops[i] + ops[j]) < ops[i])));
+	  else     /* SUB */
+	    printf ("{%6ld,%2ld},", (long) ( ops[i] - ops[j]), (long) (-(mp_limb_t) (ops[i] < ops[j])));
+	  if ((i * n_operands + j) % 8 == 0)
+	    puts ("");
+	}
+    }
+  printf ("};\n");
+
+  printf ("int main ()\n{\n");
+  printf ("  mp_limb_t r1, r0;\n");
+  printf ("  int err = 0;\n");
+  printf ("  size_t ind = 0;\n");
+  printf ("  for (size_t i = 0; i < %zu; i++)\n", n_functions);
+  printf ("    {\n");
+  printf ("      int ii = i / %zu, jj = i %% %zu;\n", n_operands, n_operands);
+  printf ("      funcs[i](&r1, &r0);\n");
+  printf ("      if (r0 != (mp_limb_signed_t) ref[ind][0] || r1 != (mp_limb_signed_t) ref[ind][1]) {\n");
+  printf ("         printf (\"error for f%%zu(%%d,%%d): want (%%d,%%d) got (%%d,%%d)\\n\", i, (int) ops[ii], (int) ops[jj], ref[ind][1], ref[ind][0], (int) r1, (int) r0);\n");
+  printf ("         err++;\n");
+  printf ("       }\n");
+  printf ("      ind++;\n");
+  printf ("    }\n");
+
+  printf ("  return err != 0;\n");
+  printf ("}\n");
+  return 0;
+}