cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some optimizations for DSL compilation. Also a new feature: Inplace addition and subtraction += and -= are now allowed

Browse Source
This commit is contained in:
jpekkila
2019-10-07 16:33:24 +03:00
parent f7c079be2a
commit 0e1d1b9fb4
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acc/src/acc.l
View File

@@ -51,6 +51,8 @@ L [a-zA-Z_]
"++" { return INPLACE_INC; }
"--" { return INPLACE_DEC; }
"+=" { return INPLACE_ADD; }
"-=" { return INPLACE_SUB; }
[-+*/;=\[\]{}(),\.<>] { return yytext[0]; } /* Characters */

4
acc/src/acc.y
View File

@@ -21,7 +21,7 @@ int yyget_lineno();
%token IF ELSE FOR WHILE ELIF
%token LEQU LAND LOR LLEQU
%token KERNEL DEVICE PREPROCESSED
%token INPLACE_INC INPLACE_DEC
%token INPLACE_INC INPLACE_DEC INPLACE_ADD INPLACE_SUB
%%
@@ -188,6 +188,8 @@ binary_operator: '+'
| LAND { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); astnode_set_buffer(yytext, $$); }
| LOR { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); astnode_set_buffer(yytext, $$); }
| LLEQU { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); astnode_set_buffer(yytext, $$); }
| INPLACE_ADD { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); astnode_set_buffer(yytext, $$); }
| INPLACE_SUB { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); astnode_set_buffer(yytext, $$); }
;
unary_operator: '-' /* C-style casts are disallowed, would otherwise be defined here */ { $$ = astnode_create(NODE_UNKNOWN, NULL, NULL); $$->infix = yytext[0]; }

6
acc/src/code_generator.c
View File

@@ -66,7 +66,7 @@ static const char* translation_table[TRANSLATION_TABLE_SIZE] = {
[COMPLEX] = "acComplex",
// Type qualifiers
[KERNEL] = "template <int step_number> static __global__",
[DEVICE] = "static __device__",
[DEVICE] = "static __device__ __forceinline__",
[PREPROCESSED] = "static __device__ __forceinline__",
[CONSTANT] = "const",
[IN] = "in",
@@ -138,6 +138,9 @@ static size_t current_nest = 0;
static Symbol*
symboltable_lookup(const char* identifier)
{
// TODO assert tha symbol not function! cannot be since we allow overloads->conflicts if not
// explicit
if (!identifier)
return NULL;
@@ -379,6 +382,7 @@ traverse(const ASTNode* node)
tmp = tmp->parent;
assert(tmp->type = NODE_FUNCTION_DECLARATION);
// TODO FIX not to use symboltable_lookup
const Symbol* parent_function = symboltable_lookup(tmp->lhs->rhs->buffer);
assert(parent_function);

10
acc/stdlib/stdderiv.h
View File

@@ -27,7 +27,7 @@ first_derivative(Scalar pencil[], Scalar inv_ds)
Scalar res = 0;
for (int i = 1; i <= MID; ++i) {
res = res + coefficients[i] * (pencil[MID + i] - pencil[MID - i]);
res += coefficients[i] * (pencil[MID + i] - pencil[MID - i]);
}
return res * inv_ds;
@@ -50,7 +50,7 @@ second_derivative(Scalar pencil[], Scalar inv_ds)
Scalar res = coefficients[0] * pencil[MID];
for (int i = 1; i <= MID; ++i) {
res = res + coefficients[i] * (pencil[MID + i] + pencil[MID - i]);
res += coefficients[i] * (pencil[MID + i] + pencil[MID - i]);
}
return res * inv_ds * inv_ds;
@@ -76,8 +76,8 @@ cross_derivative(Scalar pencil_a[], Scalar pencil_b[], Scalar inv_ds_a, Scalar i
Scalar res = 0.0;
for (int i = 1; i <= MID; ++i) {
res = res + coefficients[i] * (pencil_a[MID + i] + pencil_a[MID - i] - pencil_b[MID + i] -
pencil_b[MID - i]);
res += coefficients[i] *
(pencil_a[MID + i] + pencil_a[MID - i] - pencil_b[MID + i] - pencil_b[MID - i]);
}
return res * inv_ds_a * inv_ds_b;
}
@@ -311,7 +311,7 @@ contract(const Matrix mat)
Scalar res = 0;
for (int i = 0; i < 3; ++i) {
res = res + dot(mat.row[i], mat.row[i]);
res += dot(mat.row[i], mat.row[i]);
}
return res;