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

Fixed a bug in the Astaroth compiler: the boilerplate code for kernels was generated for all nested compound statements instead of just the top-level one

Browse Source
This commit is contained in:
jpekkila
2019-06-19 16:10:29 +03:00
parent e580f6f5d7
commit 6da061b854
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acc/src/code_generator.c
View File

@@ -282,6 +282,8 @@ static int scope_start = 0;
* ============================================================================= * =============================================================================
*/ */
static int compound_statement_nests = 0;
static void static void
traverse(const ASTNode* node) traverse(const ASTNode* node)
{ {
@@ -296,6 +298,9 @@ traverse(const ASTNode* node)
if (!inside_declaration && translate(node->prefix)) if (!inside_declaration && translate(node->prefix))
printf("%s", translate(node->prefix)); printf("%s", translate(node->prefix));
if (node->type == NODE_COMPOUND_STATEMENT)
++compound_statement_nests;
// BOILERPLATE START//////////////////////////////////////////////////////// // BOILERPLATE START////////////////////////////////////////////////////////
if (node->type == NODE_TYPE_QUALIFIER && node->token == KERNEL) if (node->type == NODE_TYPE_QUALIFIER && node->token == KERNEL)
inside_kernel = true; inside_kernel = true;
@@ -309,7 +314,7 @@ traverse(const ASTNode* node)
// indices) // indices)
const char* kernel_builtin_variables_boilerplate = "GEN_KERNEL_BUILTIN_VARIABLES_" const char* kernel_builtin_variables_boilerplate = "GEN_KERNEL_BUILTIN_VARIABLES_"
"BOILERPLATE();"; "BOILERPLATE();";
if (inside_kernel && node->type == NODE_COMPOUND_STATEMENT) { if (inside_kernel && node->type == NODE_COMPOUND_STATEMENT && compound_statement_nests == 1) {
printf("%s ", kernel_builtin_variables_boilerplate); printf("%s ", kernel_builtin_variables_boilerplate);
for (int i = 0; i < num_symbols; ++i) { for (int i = 0; i < num_symbols; ++i) {
@@ -399,7 +404,7 @@ traverse(const ASTNode* node)
printf(")"); // Closing bracket of IDX() printf(")"); // Closing bracket of IDX()
// Generate writeback boilerplate for OUT fields // Generate writeback boilerplate for OUT fields
if (inside_kernel && node->type == NODE_COMPOUND_STATEMENT) { if (inside_kernel && node->type == NODE_COMPOUND_STATEMENT && compound_statement_nests == 1) {
for (int i = 0; i < num_symbols; ++i) { for (int i = 0; i < num_symbols; ++i) {
if (symbol_table[i].type_qualifier == OUT) { if (symbol_table[i].type_qualifier == OUT) {
printf("WRITE_OUT(%s%s, %s);\n", inout_name_prefix, symbol_table[i].identifier, printf("WRITE_OUT(%s%s, %s);\n", inout_name_prefix, symbol_table[i].identifier,
@@ -454,6 +459,9 @@ traverse(const ASTNode* node)
} }
} }
if (node->type == NODE_COMPOUND_STATEMENT)
--compound_statement_nests;
if (node->type == NODE_FUNCTION_PARAMETER_DECLARATION) if (node->type == NODE_FUNCTION_PARAMETER_DECLARATION)
inside_function_parameter_declaration = false; inside_function_parameter_declaration = false;