reintroduce simplification of conditionals

hog/operator_generation/optimizer.py

@@ -27,6 +27,7 @@ from pystencils.backend.ast.structural import PsAssignment, PsBlock, PsLoop
 from pystencils.backend.functions import MathFunctions, PsMathFunction
 from pystencils.backend.kernelcreation import KernelCreationContext
 from pystencils.backend.transformations import (
+    EliminateBranches,
     HoistLoopInvariantDeclarations,
     ReshapeLoops,
 )
@@ -178,9 +179,8 @@ class Optimizer:
                     new_loop, peeled_iters = reshape_loops.peel_loop_back(x_loop, 2)
                     y_loop.body = PsBlock([new_loop] + list(peeled_iters))
 
-            # TODO
-            # with TimedLogger("simplifying conditionals", logging.DEBUG):
-            #     simplify_conditionals(loop, loop_counter_simplification=True)
+            with TimedLogger("simplifying conditionals", logging.DEBUG):
+                loop = EliminateBranches(ctx)(loop)
 
         if self[Opts.MOVECONSTANTS]:
             with TimedLogger("moving constants out of loop", logging.DEBUG):

pyproject.toml

@@ -6,7 +6,7 @@ dependencies = [
   "numpy==1.24.3",
   "quadpy-gpl==0.16.10",
   "poly-cse-py",
-  "pystencils @ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@be07c320c7448629ac59a7068a71920dc870a2f2",
+  "pystencils @ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@d6621ef950a0f695ea32e8e715f2e64c468248bc",
   "pytest==7.3.1",
   "sympy==1.11.1",
   "tabulate==0.9.0",

requirements.txt

@@ -3,7 +3,7 @@
 islpy
 numpy==1.24.3
 poly-cse-py
-pystencils @ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@be07c320c7448629ac59a7068a71920dc870a2f2
+pystencils @ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@d6621ef950a0f695ea32e8e715f2e64c468248bc
 pytest==7.3.1
 sympy==1.11.1
 tabulate==0.9.0