Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: cleanup FFE code (contains parts of PR #2997) #3121

Merged
merged 8 commits into from
Dec 21, 2018
Merged

kernel: cleanup FFE code (contains parts of PR #2997) #3121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3714b53
kernel: move PolsFF to finfield_conway.h
fingolfin Dec 18, 2018
ef3ecff
Prepare etc/ffgen.c for printing to file instead of stdout
fingolfin Dec 18, 2018
7a16374
kernel: remove duplicate comment from finfield.c
fingolfin Dec 18, 2018
75a40ef
kernel: make TYPE_FF0?, TypeFF0? private
fingolfin Dec 18, 2018
063fdcd
kernel: define PROD_FFV before SUM_FFV
fingolfin Dec 18, 2018
720dc0c
kernel: turn FFE macros into functions
fingolfin Dec 18, 2018
adc8ce5
clang-format parts of src/finfield.c
fingolfin Dec 18, 2018
92bde48
kernel: add LookupPrimePower helper
fingolfin Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 46 additions & 44 deletions etc/ffgen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>


#define MAX_FF 65536

unsigned char is_prime[MAX_FF + 1];
Expand All @@ -15,7 +17,7 @@ unsigned num_ff;

void make_primes()
{
unsigned i, j;
unsigned long i, j;
for (i = 2; i <= MAX_FF; i++)
is_prime[i] = 1;
for (i = 2; i * i <= MAX_FF; i++) {
Expand All @@ -28,7 +30,7 @@ void make_primes()

void make_ff()
{
unsigned i, j, d;
unsigned long i, j, d;
for (i = 2; i <= MAX_FF; i++) {
if (is_prime[i]) {
for (j = i, d = 1; j <= MAX_FF; j *= i, d++) {
Expand All @@ -41,74 +43,74 @@ void make_ff()
}
}

void emit_code(int header)
void emit_code(FILE * dest, int header)
{
unsigned i, j;
if (header) {
printf("#ifndef GAP_FFDATA_H\n");
printf("#define GAP_FFDATA_H\n");
printf("\n");
printf("enum {\n");
printf(" NUM_SHORT_FINITE_FIELDS = %d\n", num_ff);
printf("};\n");
printf("\n");
printf("extern unsigned long SizeFF[NUM_SHORT_FINITE_FIELDS+1];\n");
printf("extern unsigned char DegrFF[NUM_SHORT_FINITE_FIELDS+1];\n");
printf("extern unsigned long CharFF[NUM_SHORT_FINITE_FIELDS+1];\n");
printf("\n");
printf("#endif // GAP_FFDATA_H\n");
fprintf(dest, "#ifndef GAP_FFDATA_H\n");
fprintf(dest, "#define GAP_FFDATA_H\n");
fprintf(dest, "\n");
fprintf(dest, "enum {\n");
fprintf(dest, " NUM_SHORT_FINITE_FIELDS = %d\n", num_ff);
fprintf(dest, "};\n");
fprintf(dest, "\n");
fprintf(dest, "extern unsigned long SizeFF[NUM_SHORT_FINITE_FIELDS+1];\n");
fprintf(dest, "extern unsigned char DegrFF[NUM_SHORT_FINITE_FIELDS+1];\n");
fprintf(dest, "extern unsigned long CharFF[NUM_SHORT_FINITE_FIELDS+1];\n");
fprintf(dest, "\n");
fprintf(dest, "#endif // GAP_FFDATA_H\n");
}
else {
printf("#include \"ffdata.h\"\n");
printf("\n");
printf("/* Entries are ordered by value of p^d; can use binary search\n");
printf(" * to find them. Indices start at 1.\n");
printf(" */\n");
printf("\n");
printf("unsigned char DegrFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
printf(" %3d,", 0);
fprintf(dest, "#include \"ffdata.h\"\n");
fprintf(dest, "\n");
fprintf(dest, "/* Entries are ordered by value of p^d; can use binary search\n");
fprintf(dest, " * to find them. Indices start at 1.\n");
fprintf(dest, " */\n");
fprintf(dest, "\n");
fprintf(dest, "unsigned char DegrFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
fprintf(dest, " %3d,", 0);
for (i = 0, j = 1; i <= MAX_FF; i++) {
if (is_ff[i]) {
printf("%3d,", deg[i]);
fprintf(dest, "%3d,", deg[i]);
j++;
j %= 16;
if (!j)
printf("\n ");
fprintf(dest, "\n ");
}
}
if (j)
printf("\n");
printf("};\n");
printf("\n");
printf("unsigned long CharFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
printf(" %6d,", 0);
fprintf(dest, "\n");
fprintf(dest, "};\n");
fprintf(dest, "\n");
fprintf(dest, "unsigned long CharFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
fprintf(dest, " %6d,", 0);
for (i = 0, j = 1; i <= MAX_FF; i++) {
if (is_ff[i]) {
printf("%6d,", ch[i]);
fprintf(dest, "%6d,", ch[i]);
j++;
j %= 8;
if (!j)
printf("\n ");
fprintf(dest, "\n ");
}
}
if (j)
printf("\n");
printf("};\n");
printf("\n");
printf("unsigned long SizeFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
printf(" %6d,", 0);
fprintf(dest, "\n");
fprintf(dest, "};\n");
fprintf(dest, "\n");
fprintf(dest, "unsigned long SizeFF[NUM_SHORT_FINITE_FIELDS+1] = {\n");
fprintf(dest, " %6d,", 0);
for (i = 0, j = 1; i <= MAX_FF; i++) {
if (is_ff[i]) {
printf("%6d,", i);
fprintf(dest, "%6d,", i);
j++;
j %= 8;
if (!j)
printf("\n ");
fprintf(dest, "\n ");
}
}
if (j)
printf("\n");
printf("};\n");
fprintf(dest, "\n");
fprintf(dest, "};\n");
}
}

Expand All @@ -118,11 +120,11 @@ int main(int argc, char * argv[])
make_primes();
make_ff();
if (!opt)
emit_code(0);
emit_code(stdout, 0);
else if (!strcmp(opt, "h") || !strcmp(opt, ".h") || !strcmp(opt, "-h"))
emit_code(1);
emit_code(stdout, 1);
else if (!strcmp(opt, "c") || !strcmp(opt, ".c") || !strcmp(opt, "-c"))
emit_code(0);
emit_code(stdout, 0);
else {
fprintf(stderr, "Usage: ffgen [-h|-c]\n");
fprintf(stderr, " -h for header file\n");
Expand Down
Loading