Skip to content

P
peephole
Commit ceb2f51c authored by Jayke Meijer's avatar Jayke Meijer
Browse files
Options

Fixed merge conflict.

parent 140259b0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
report/report.tex
View file @ ceb2f51c
...@@ -303,7 +303,7 @@ Benchmark & Original & Optimized & Original & Optimized & Performance \\ ...@@ -303,7 +303,7 @@ Benchmark & Original & Optimized & Original & Optimized & Performance \\
pi & 94 & & 1714468 & & \\ pi & 94 & & 1714468 & & \\
acron & 361 & & 4435687 & & \\ acron & 361 & & 4435687 & & \\
dhrystone & 752 & & 2887710 & & \\ dhrystone & 752 & & 2887710 & & \\
whet & 935 & & & & \\ whet & 935 & & 2864526 & & \\
slalom & 4177 & & 2879140 & & \\ slalom & 4177 & & 2879140 & & \\
clinpack & 3523 & & & & \\ clinpack & 3523 & & & & \\
\hline \hline
......
src/optimize/__init__.py
View file @ ceb2f51c
...@@ -15,14 +15,12 @@ def optimize(program, verbose=0): ...@@ -15,14 +15,12 @@ def optimize(program, verbose=0):
iterations = 0 iterations = 0
while changed: while changed:
<<<<<<< HEAD
iterations += 1 iterations += 1
if verbose > 1: if verbose > 1:
print 'main iteration %d', iterations print 'main iteration %d', iterations
=======
>>>>>>> 98c43ff02c474a62e42ac89ba9fe20be98f9eccd
changed = False changed = False
# Optimize on a global level # Optimize on a global level
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment