Skip to content

Add baseline tests for constant folding applied before subexpression optimization #264

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

Merged
1 commit merged into from
Mar 5, 2024
Merged

Add baseline tests for constant folding applied before subexpression optimization #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 44 additions & 5 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void allOptimizers_producesSameEvaluationResult(
CEL.createProgram(ast)
.eval(ImmutableMap.of("msg", TEST_ALL_TYPES_INPUT, "x", 5L, "opt_x", Optional.of(5L)));

CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.celOptimizer.optimize(ast);
CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.cseOptimizer.optimize(ast);

Object optimizedEvalResult =
CEL.createProgram(optimizedAst)
Expand All @@ -119,7 +119,39 @@ public void subexpression_unparsed() throws Exception {
boolean resultPrinted = false;
for (CseTestOptimizer cseTestOptimizer : CseTestOptimizer.values()) {
String optimizerName = cseTestOptimizer.name();
CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.celOptimizer.optimize(ast);
CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.cseOptimizer.optimize(ast);
if (!resultPrinted) {
Object optimizedEvalResult =
CEL.createProgram(optimizedAst)
.eval(
ImmutableMap.of(
"msg", TEST_ALL_TYPES_INPUT, "x", 5L, "opt_x", Optional.of(5L)));
testOutput().println("Result: " + optimizedEvalResult);
resultPrinted = true;
}
try {
testOutput().printf("[%s]: %s", optimizerName, CEL_UNPARSER.unparse(optimizedAst));
} catch (RuntimeException e) {
testOutput().printf("[%s]: Unparse Error: %s", optimizerName, e);
}
testOutput().println();
}
testOutput().println();
}
}

@Test
public void constfold_before_subexpression_unparsed() throws Exception {
for (CseTestCase cseTestCase : CseTestCase.values()) {
testOutput().println("Test case: " + cseTestCase.name());
testOutput().println("Source: " + cseTestCase.source);
testOutput().println("=====>");
CelAbstractSyntaxTree ast = CEL.compile(cseTestCase.source).getAst();
boolean resultPrinted = false;
for (CseTestOptimizer cseTestOptimizer : CseTestOptimizer.values()) {
String optimizerName = cseTestOptimizer.name();
CelAbstractSyntaxTree optimizedAst =
cseTestOptimizer.cseWithConstFoldingOptimizer.optimize(ast);
if (!resultPrinted) {
Object optimizedEvalResult =
CEL.createProgram(optimizedAst)
Expand Down Expand Up @@ -149,7 +181,7 @@ public void subexpression_ast(@TestParameter CseTestOptimizer cseTestOptimizer)
testOutput().println("Source: " + cseTestCase.source);
testOutput().println("=====>");
CelAbstractSyntaxTree ast = CEL.compile(cseTestCase.source).getAst();
CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.celOptimizer.optimize(ast);
CelAbstractSyntaxTree optimizedAst = cseTestOptimizer.cseOptimizer.optimize(ast);
testOutput().println(optimizedAst.getExpr());
}
}
Expand Down Expand Up @@ -339,10 +371,17 @@ private enum CseTestOptimizer {
BLOCK_RECURSION_DEPTH_9(
OPTIMIZER_COMMON_OPTIONS.toBuilder().subexpressionMaxRecursionDepth(9).build());

private final CelOptimizer celOptimizer;
private final CelOptimizer cseOptimizer;
private final CelOptimizer cseWithConstFoldingOptimizer;

CseTestOptimizer(SubexpressionOptimizerOptions option) {
this.celOptimizer = newCseOptimizer(CEL, option);
this.cseOptimizer = newCseOptimizer(CEL, option);
this.cseWithConstFoldingOptimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(CEL)
.addAstOptimizers(
ConstantFoldingOptimizer.getInstance(),
SubexpressionOptimizer.newInstance(option))
.build();
}
}

Expand Down
Loading