Merge pull request #41 from valtron/master

Updated names of passes in Kaleidoscope tutorial

www/web/kaleidoscope/PythonLangImpl4.html

@@ -196,13 +196,13 @@ def main():
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
   # Eliminate Common SubExpressions.
   g_llvm_pass_manager.add(PASS_GVN)
   # Simplify the control flow graph (deleting unreachable blocks, etc).
-  g_llvm_pass_manager.add(PASS_CFG_SIMPLIFICATION)
+  g_llvm_pass_manager.add(PASS_SIMPLIFYCFG)
 
   g_llvm_pass_manager.initialize()
 </pre>
@@ -503,10 +503,10 @@ import re
 from llvm.core import Module, Constant, Type, Function, Builder, FCMP_ULT
 from llvm.ee import ExecutionEngine, TargetData
 from llvm.passes import FunctionPassManager
-from llvm.passes import (PASS_INSTRUCTION_COMBINING,
+from llvm.passes import (PASS_INSTCOMBINE,
                          PASS_REASSOCIATE,
                          PASS_GVN,
-                         PASS_CFG_SIMPLIFICATION)
+                         PASS_SIMPLIFYCFG)
 
 ################################################################################
 ## Globals
@@ -932,13 +932,13 @@ def main():
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
   # Eliminate Common SubExpressions.
   g_llvm_pass_manager.add(PASS_GVN)
   # Simplify the control flow graph (deleting unreachable blocks, etc).
-  g_llvm_pass_manager.add(PASS_CFG_SIMPLIFICATION)
+  g_llvm_pass_manager.add(PASS_SIMPLIFYCFG)
 
   g_llvm_pass_manager.initialize()
 

www/web/kaleidoscope/PythonLangImpl5.html

@@ -897,10 +897,10 @@ from llvm.ee import ExecutionEngine, TargetData
 from llvm.passes import FunctionPassManager
 
 from llvm.core import FCMP_ULT, FCMP_ONE
-from llvm.passes import (PASS_INSTRUCTION_COMBINING,
+from llvm.passes import (PASS_INSTCOMBINE,
                          PASS_REASSOCIATE,
                          PASS_GVN,
-                         PASS_CFG_SIMPLIFICATION)
+                         PASS_SIMPLIFYCFG)
 
 ################################################################################
 ## Globals
@@ -1540,13 +1540,13 @@ def main():
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
   # Eliminate Common SubExpressions.
   g_llvm_pass_manager.add(PASS_GVN)
   # Simplify the control flow graph (deleting unreachable blocks, etc).
-  g_llvm_pass_manager.add(PASS_CFG_SIMPLIFICATION)
+  g_llvm_pass_manager.add(PASS_SIMPLIFYCFG)
 
   g_llvm_pass_manager.initialize()
 

www/web/kaleidoscope/PythonLangImpl6.html

@@ -817,10 +817,10 @@ from llvm.ee import ExecutionEngine, TargetData
 from llvm.passes import FunctionPassManager
 
 from llvm.core import FCMP_ULT, FCMP_ONE
-from llvm.passes import (PASS_INSTRUCTION_COMBINING,
+from llvm.passes import (PASS_INSTCOMBINE,
                          PASS_REASSOCIATE,
                          PASS_GVN,
-                         PASS_CFG_SIMPLIFICATION)
+                         PASS_SIMPLIFYCFG)
 
 ################################################################################
 ## Globals
@@ -1539,13 +1539,13 @@ def main():
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
   # Eliminate Common SubExpressions.
   g_llvm_pass_manager.add(PASS_GVN)
   # Simplify the control flow graph (deleting unreachable blocks, etc).
-  g_llvm_pass_manager.add(PASS_CFG_SIMPLIFICATION)
+  g_llvm_pass_manager.add(PASS_SIMPLIFYCFG)
 
   g_llvm_pass_manager.initialize()
 

www/web/kaleidoscope/PythonLangImpl7.html

@@ -520,20 +520,20 @@ good codegen once again:</p>
 
 <div class="doc_code">
 <pre>
-from llvm.passes import (<b>PASS_PROMOTE_MEMORY_TO_REGISTER</b>,
-                         PASS_INSTRUCTION_COMBINING,
+from llvm.passes import (<b>PASS_MEM2REG</b>,
+                         PASS_INSTCOMBINE,
                          PASS_REASSOCIATE,
                          PASS_GVN,
-                         PASS_CFG_SIMPLIFICATION)
+                         PASS_SIMPLIFYCFG)
 ...
 def main():
   # Set up the optimizer pipeline. Start with registering info about how the
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   <b># Promote allocas to registers.
-  g_llvm_pass_manager.add(PASS_PROMOTE_MEMORY_TO_REGISTER)</b>
+  g_llvm_pass_manager.add(PASS_MEM2REG)</b>
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
 </pre>
@@ -981,11 +981,11 @@ from llvm.ee import ExecutionEngine, TargetData
 from llvm.passes import FunctionPassManager
 
 from llvm.core import FCMP_ULT, FCMP_ONE
-from llvm.passes import (PASS_PROMOTE_MEMORY_TO_REGISTER,
-                         PASS_INSTRUCTION_COMBINING,
+from llvm.passes import (PASS_MEM2REG,
+                         PASS_INSTCOMBINE,
                          PASS_REASSOCIATE,
                          PASS_GVN,
-                         PASS_CFG_SIMPLIFICATION)
+                         PASS_SIMPLIFYCFG)
 
 ################################################################################
 ## Globals
@@ -1836,15 +1836,15 @@ def main():
   # target lays out data structures.
   g_llvm_pass_manager.add(g_llvm_executor.target_data)
   # Promote allocas to registers.
-  g_llvm_pass_manager.add(PASS_PROMOTE_MEMORY_TO_REGISTER)
+  g_llvm_pass_manager.add(PASS_MEM2REG)
   # Do simple "peephole" optimizations and bit-twiddling optzns.
-  g_llvm_pass_manager.add(PASS_INSTRUCTION_COMBINING)
+  g_llvm_pass_manager.add(PASS_INSTCOMBINE)
   # Reassociate expressions.
   g_llvm_pass_manager.add(PASS_REASSOCIATE)
   # Eliminate Common SubExpressions.
   g_llvm_pass_manager.add(PASS_GVN)
   # Simplify the control flow graph (deleting unreachable blocks, etc).
-  g_llvm_pass_manager.add(PASS_CFG_SIMPLIFICATION)
+  g_llvm_pass_manager.add(PASS_SIMPLIFYCFG)
 
   g_llvm_pass_manager.initialize()