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

Add function optimization #7

Closed
wants to merge 6 commits into from
Closed

Add function optimization #7

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e34de1b
Added function optimization
ChickChicky Nov 6, 2024
93c9e09
Small improvements to optimizer
ChickChicky Nov 6, 2024
300e7d1
Tweaks to optimization
ChickChicky Nov 7, 2024
48af72e
Fix stoopid mistake with optimize_expr
ChickChicky Nov 7, 2024
960e2a1
Small fix to suppress warnings
ChickChicky Nov 7, 2024
a313e27
Refactored optimization
ChickChicky Nov 7, 2024
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
82 changes: 82 additions & 0 deletions randomart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Node *node_number_loc(const char *file, int line, Arena *arena, float number)
return node;
}
#define node_number(arena, number) node_number_loc(__FILE__, __LINE__, arena, number)
#define node_number_inline(value) (Node){ .kind = NK_NUMBER, .file = __FILE__, .line = __LINE__, .as.number = (value) }

Node *node_rule_loc(const char *file, int line, Arena *arena, int rule)
{
Expand All @@ -123,6 +124,7 @@ Node *node_boolean_loc(const char *file, int line, Arena *arena, bool boolean)
return node;
}
#define node_boolean(arena, boolean) node_boolean_loc(__FILE__, __LINE__, arena, boolean)
#define node_boolean_inline(value) (Node){ .kind = NK_BOOLEAN, .file = __FILE__, .line = __LINE__, .as.boolean = (value) }

#define node_x(arena) node_loc(__FILE__, __LINE__, arena, NK_X)
#define node_y(arena) node_loc(__FILE__, __LINE__, arena, NK_Y)
Expand Down Expand Up @@ -505,6 +507,85 @@ Node *gen_rule(Grammar grammar, Arena *arena, size_t rule, int depth)
return node;
}

bool get_number(Node *node, float *result)
{
if (node->kind != NK_NUMBER)
return false;
if (result)
*result = node->as.number;
return true;
}

bool get_boolean(Node *node, bool *result)
{
if (node->kind != NK_BOOLEAN)
return false;
if (result)
*result = node->as.boolean;
return true;
}

void optimize_expr(Node *expr)
{
float lhs, rhs;
switch (expr->kind) {
case NK_X:
case NK_Y:
case NK_BOOLEAN:
case NK_NUMBER:
case NK_RANDOM:
case NK_RULE:
break;
case NK_ADD: {
optimize_expr(expr->as.binop.lhs);
optimize_expr(expr->as.binop.rhs);
if (get_number(expr->as.binop.lhs, &lhs) && get_number(expr->as.binop.rhs, &rhs))
*expr = node_number_inline(lhs+rhs);
} break;
case NK_MULT: {
optimize_expr(expr->as.binop.lhs);
optimize_expr(expr->as.binop.rhs);
if (get_number(expr->as.binop.lhs, &lhs) && get_number(expr->as.binop.rhs, &rhs))
*expr = node_number_inline(lhs*rhs);
} break;
case NK_MOD: {
optimize_expr(expr->as.binop.lhs);
optimize_expr(expr->as.binop.rhs);
if (get_number(expr->as.binop.lhs, &lhs) && get_number(expr->as.binop.rhs, &rhs))
*expr = node_number_inline(fmodf(lhs,rhs));
} break;
case NK_GT: {
optimize_expr(expr->as.binop.lhs);
optimize_expr(expr->as.binop.rhs);
bool num_rhs = get_number(expr->as.binop.rhs, &rhs);
bool num_lhs = get_number(expr->as.binop.lhs, &lhs);
if (num_rhs && num_lhs)
*expr = node_boolean_inline(lhs>rhs);
// maybe too much of an edge case
else if ((expr->as.binop.lhs->kind == NK_X || expr->as.binop.lhs->kind == NK_Y) && num_rhs && rhs >= 1.f)
*expr = node_boolean_inline(false);
else if ((expr->as.binop.rhs->kind == NK_X || expr->as.binop.rhs->kind == NK_Y) && num_lhs && lhs <= -1.f)
*expr = node_boolean_inline(false);
} break;
case NK_TRIPLE: {
optimize_expr(expr->as.triple.first);
optimize_expr(expr->as.triple.second);
optimize_expr(expr->as.triple.third);
} break;
case NK_IF: {
optimize_expr(expr->as.iff.cond);
optimize_expr(expr->as.iff.then);
optimize_expr(expr->as.iff.elze);
bool cond;
if (get_boolean(expr->as.iff.cond, &cond))
*expr = cond ? *expr->as.iff.then : *expr->as.iff.elze;
} break;
case COUNT_NK:
default:
UNREACHABLE("optimize_expr");
}
}

size_t arch[] = {2, 28, 28, 9, 3};

int main()
Expand Down Expand Up @@ -561,6 +642,7 @@ int main()
fprintf(stderr, "ERROR: the crappy generation process could not terminate\n");
return 1;
}
optimize_expr(f);
node_print_ln(f);

// bool ok = render_pixels(node_triple(node_x(), node_x(), node_x()));
Expand Down