From 6c28dec4a111ad73f8ac17c89305a951371f765d Mon Sep 17 00:00:00 2001
From: Sebastiano Tronto <sebastiano.tronto@gmail.com>
Date: Fri, 10 Dec 2021 18:15:20 +0100
Subject: Added gen command and modified installation instructions for tables

---
 src/commands.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pruning.c  | 15 +++++++++++++++
 src/pruning.h  |  4 ++++
 3 files changed, 74 insertions(+)

(limited to 'src')

diff --git a/src/commands.c b/src/commands.c
index 5e01e67..287ee67 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -3,12 +3,14 @@
 /* Arg parsing functions *****************************************************/
 
 CommandArgs *           solve_parse_args(int c, char **v);
+CommandArgs *           gen_parse_args(int c, char **v);
 CommandArgs *           help_parse_args(int c, char **v);
 CommandArgs *           print_parse_args(int c, char **v);
 CommandArgs *           parse_no_arg(int c, char **v);
 
 /* Exec functions ************************************************************/
 
+static void             gen_exec(CommandArgs *args);
 static void             solve_exec(CommandArgs *args);
 static void             steps_exec(CommandArgs *args);
 static void             commands_exec(CommandArgs *args);
@@ -33,6 +35,15 @@ solve_cmd = {
 	.exec        = solve_exec
 };
 
+Command
+gen_cmd = {
+	.name        = "gen",
+	.usage       = "gen [-t N]",
+	.description = "Generate all tables [using N threads]",
+	.parse_args  = gen_parse_args,
+	.exec        = gen_exec
+};
+
 Command
 steps_cmd = {
 	.name        = "steps",
@@ -89,6 +100,7 @@ version_cmd = {
 
 Command *commands[NCOMMANDS] = {
 	&commands_cmd,
+	&gen_cmd,
 	&help_cmd,
 	&print_cmd,
 	&quit_cmd,
@@ -172,6 +184,34 @@ solve_parse_args(int c, char **v)
 	return a;
 }
 
+CommandArgs *
+gen_parse_args(int c, char **v)
+{
+	int val;
+	CommandArgs *a = new_args();
+
+	a->opts->nthreads = 1;
+	a->success  = false;
+
+	if (c == 0) {
+		a->success = true;
+	} else {
+		if (!strcmp(v[0], "-t") && c > 1) {
+			val = strtol(v[1], NULL, 10);
+			if (val < 1 || val > 64) {
+				fprintf(stderr,
+					"Invalid number of threads."
+					"1 <= t <= 64\n");
+				return a;
+			}
+			a->opts->nthreads = val;
+			a->success = true;
+		}
+	}
+	
+	return a;
+}
+
 CommandArgs *
 help_parse_args(int c, char **v)
 {
@@ -228,6 +268,21 @@ solve_exec(CommandArgs *args)
 	free_alglist(sols);
 }
 
+static void
+gen_exec(CommandArgs *args)
+{
+	int i;
+
+	fprintf(stderr, "Generating coordinates...\n");
+	init_symcoord();
+
+	fprintf(stderr, "Generating pruning tables...\n");
+	for (i = 0; i < NPTABLES && allpd[i] != NULL; i++)
+		genptable(allpd[i], args->opts->nthreads);
+
+	fprintf(stderr, "Done!\n");
+}
+
 static void
 steps_exec(CommandArgs *args)
 {
diff --git a/src/pruning.c b/src/pruning.c
index 8cfa582..b305a89 100644
--- a/src/pruning.c
+++ b/src/pruning.c
@@ -84,6 +84,21 @@ pd_khuge_HTM = {
 	.moveset  = moveset_HTM,
 };
 
+PruneData * allpd[NPTABLES] = {
+	&pd_eofb_HTM,
+	&pd_coud_HTM,
+	&pd_cornershtr_HTM,
+	&pd_corners_HTM,
+	&pd_drud_sym16_HTM,
+	&pd_drud_eofb,
+	&pd_drudfin_noE_sym16_drud,
+	&pd_htr_drud,
+	&pd_htrfin_htr,
+	&pd_khuge_HTM,
+};
+
+/* Functions *****************************************************************/
+
 int
 findchunk(PruneData *pd, int nchunks, uint64_t i)
 {
diff --git a/src/pruning.h b/src/pruning.h
index d337fd8..da9e58a 100644
--- a/src/pruning.h
+++ b/src/pruning.h
@@ -3,6 +3,8 @@
 
 #include "symcoord.h"
 
+#define NPTABLES 20
+
 extern PruneData        pd_eofb_HTM;
 extern PruneData        pd_coud_HTM;
 extern PruneData        pd_corners_HTM;
@@ -14,6 +16,8 @@ extern PruneData        pd_htr_drud;
 extern PruneData        pd_htrfin_htr;
 extern PruneData        pd_khuge_HTM;
 
+extern PruneData *      allpd[NPTABLES];
+
 void        genptable(PruneData *pd, int nthreads);
 void        print_ptable(PruneData *pd);
 uint64_t    ptablesize(PruneData *pd);
-- 
cgit v1.3