Miscellaneous code cleanups.

Including removal of old implicit args.

Author: abadams

Makefile

@@ -141,10 +141,10 @@ BIN_DIR = bin
 DISTRIB_DIR=distrib
 endif
 
-SOURCE_FILES = CodeGen.cpp CodeGen_Internal.cpp CodeGen_X86.cpp CodeGen_GPU_Host.cpp CodeGen_PTX_Dev.cpp CodeGen_OpenCL_Dev.cpp CodeGen_SPIR_Dev.cpp CodeGen_GPU_Dev.cpp CodeGen_Posix.cpp CodeGen_ARM.cpp IR.cpp IRMutator.cpp IRPrinter.cpp IRVisitor.cpp CodeGen_C.cpp Substitute.cpp ModulusRemainder.cpp Bounds.cpp Derivative.cpp OneToOne.cpp Func.cpp Simplify.cpp IREquality.cpp Util.cpp Function.cpp IROperator.cpp Lower.cpp Debug.cpp Parameter.cpp Reduction.cpp RDom.cpp Profiling.cpp Tracing.cpp StorageFlattening.cpp VectorizeLoops.cpp UnrollLoops.cpp BoundsInference.cpp IRMatch.cpp StmtCompiler.cpp integer_division_table.cpp SlidingWindow.cpp StorageFolding.cpp InlineReductions.cpp RemoveTrivialForLoops.cpp Deinterleave.cpp DebugToFile.cpp Type.cpp JITCompiledModule.cpp EarlyFree.cpp UniquifyVariableNames.cpp CSE.cpp Tuple.cpp Lerp.cpp Target.cpp SkipStages.cpp SpecializeClampedRamps.cpp RemoveUndef.cpp FastIntegerDivide.cpp AllocationBoundsInference.cpp Inline.cpp Qualify.cpp UnifyDuplicateLets.cpp CodeGen_PNaCl.cpp
+SOURCE_FILES = CodeGen.cpp CodeGen_Internal.cpp CodeGen_X86.cpp CodeGen_GPU_Host.cpp CodeGen_PTX_Dev.cpp CodeGen_OpenCL_Dev.cpp CodeGen_SPIR_Dev.cpp CodeGen_GPU_Dev.cpp CodeGen_Posix.cpp CodeGen_ARM.cpp IR.cpp IRMutator.cpp IRPrinter.cpp IRVisitor.cpp CodeGen_C.cpp Substitute.cpp ModulusRemainder.cpp Bounds.cpp Derivative.cpp OneToOne.cpp Func.cpp Simplify.cpp IREquality.cpp Util.cpp Function.cpp IROperator.cpp Lower.cpp Debug.cpp Parameter.cpp Reduction.cpp RDom.cpp Profiling.cpp Tracing.cpp StorageFlattening.cpp VectorizeLoops.cpp UnrollLoops.cpp BoundsInference.cpp IRMatch.cpp StmtCompiler.cpp IntegerDivisionTable.cpp SlidingWindow.cpp StorageFolding.cpp InlineReductions.cpp RemoveTrivialForLoops.cpp Deinterleave.cpp DebugToFile.cpp Type.cpp JITCompiledModule.cpp EarlyFree.cpp UniquifyVariableNames.cpp CSE.cpp Tuple.cpp Lerp.cpp Target.cpp SkipStages.cpp SpecializeClampedRamps.cpp RemoveUndef.cpp FastIntegerDivide.cpp AllocationBoundsInference.cpp Inline.cpp Qualify.cpp UnifyDuplicateLets.cpp CodeGen_PNaCl.cpp
 
 # The externally-visible header files that go into making Halide.h. Don't include anything here that includes llvm headers.
-HEADER_FILES = Util.h Type.h Argument.h Bounds.h BoundsInference.h Buffer.h buffer_t.h CodeGen_C.h CodeGen.h CodeGen_X86.h CodeGen_GPU_Host.h CodeGen_PTX_Dev.h CodeGen_OpenCL_Dev.h CodeGen_SPIR_Dev.h CodeGen_GPU_Dev.h Deinterleave.h Derivative.h OneToOne.h Extern.h Func.h Function.h Image.h InlineReductions.h integer_division_table.h IntrusivePtr.h IREquality.h IR.h IRMatch.h IRMutator.h IROperator.h IRPrinter.h IRVisitor.h JITCompiledModule.h Lambda.h Debug.h Lower.h MainPage.h ModulusRemainder.h Parameter.h Param.h RDom.h Reduction.h RemoveTrivialForLoops.h Schedule.h Scope.h Simplify.h SlidingWindow.h StmtCompiler.h StorageFlattening.h StorageFolding.h Substitute.h Profiling.h Tracing.h UnrollLoops.h Var.h VectorizeLoops.h CodeGen_Posix.h CodeGen_ARM.h DebugToFile.h EarlyFree.h UniquifyVariableNames.h CSE.h Tuple.h Lerp.h Target.h SkipStages.h SpecializeClampedRamps.h RemoveUndef.h FastIntegerDivide.h AllocationBoundsInference.h Inline.h Qualify.h UnifyDuplicateLets.h CodeGen_PNaCl.h
+HEADER_FILES = Util.h Type.h Argument.h Bounds.h BoundsInference.h Buffer.h buffer_t.h CodeGen_C.h CodeGen.h CodeGen_X86.h CodeGen_GPU_Host.h CodeGen_PTX_Dev.h CodeGen_OpenCL_Dev.h CodeGen_SPIR_Dev.h CodeGen_GPU_Dev.h Deinterleave.h Derivative.h OneToOne.h Extern.h Func.h Function.h Image.h InlineReductions.h IntegerDivisionTable.h IntrusivePtr.h IREquality.h IR.h IRMatch.h IRMutator.h IROperator.h IRPrinter.h IRVisitor.h JITCompiledModule.h Lambda.h Debug.h Lower.h MainPage.h ModulusRemainder.h Parameter.h Param.h RDom.h Reduction.h RemoveTrivialForLoops.h Schedule.h Scope.h Simplify.h SlidingWindow.h StmtCompiler.h StorageFlattening.h StorageFolding.h Substitute.h Profiling.h Tracing.h UnrollLoops.h Var.h VectorizeLoops.h CodeGen_Posix.h CodeGen_ARM.h DebugToFile.h EarlyFree.h UniquifyVariableNames.h CSE.h Tuple.h Lerp.h Target.h SkipStages.h SpecializeClampedRamps.h RemoveUndef.h FastIntegerDivide.h AllocationBoundsInference.h Inline.h Qualify.h UnifyDuplicateLets.h CodeGen_PNaCl.h
 
 SOURCES = $(SOURCE_FILES:%.cpp=src/%.cpp)
 OBJECTS = $(SOURCE_FILES:%.cpp=$(BUILD_DIR)/%.o)
@@ -176,7 +176,7 @@ include/HalideRuntime.h: src/runtime/HalideRuntime.h
 	mkdir -p include
 	cp src/runtime/HalideRuntime.h include/
 
-$(BIN_DIR)/build_halide_h: src/build_halide_h.cpp
+$(BIN_DIR)/build_halide_h: tools/build_halide_h.cpp
 	g++ $< -o $@
 
 msvc/initmod.cpp: $(INITIAL_MODULES)
@@ -207,7 +207,7 @@ $(BUILD_DIR)/initmod.%.cpp: $(BIN_DIR)/bitcode2cpp $(BUILD_DIR)/initmod.%.bc
 $(BUILD_DIR)/initmod_ptx.%_ll.cpp: $(BIN_DIR)/bitcode2cpp src/runtime/nvidia_libdevice_bitcode/libdevice.%.bc
 	./$(BIN_DIR)/bitcode2cpp ptx_$(basename $*)_ll < src/runtime/nvidia_libdevice_bitcode/libdevice.$*.bc > $@
 
-$(BIN_DIR)/bitcode2cpp: src/bitcode2cpp.cpp
+$(BIN_DIR)/bitcode2cpp: tools/bitcode2cpp.cpp
 	@-mkdir -p $(BIN_DIR)
 	$(CXX) $< -o $@
 

src/AllocationBoundsInference.h

@@ -1,5 +1,5 @@
-#ifndef ALLOCATION_BOUNDS_INFERENCE_H
-#define ALLOCATION_BOUNDS_INFERENCE_H
+#ifndef HALIDE_ALLOCATION_BOUNDS_INFERENCE_H
+#define HALIDE_ALLOCATION_BOUNDS_INFERENCE_H
 
 #include <map>
 #include <string>

src/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_executable(build_halide_h build_halide_h.cpp)
-add_executable(bitcode2cpp bitcode2cpp.cpp)
+add_executable(build_halide_h ../tools/build_halide_h.cpp)
+add_executable(bitcode2cpp ../tools/bitcode2cpp.cpp)
 
 
 if (MSVC)
@@ -180,7 +180,7 @@ set(HEADER_FILES
   Function.h
   Image.h
   InlineReductions.h
-  integer_division_table.h
+  IntegerDivisionTable.h
   IntrusivePtr.h
   IREquality.h
   IR.h
@@ -281,7 +281,7 @@ add_library(Halide ${HALIDE_LIBRARY_TYPE}
   BoundsInference.cpp
   IRMatch.cpp
   StmtCompiler.cpp
-  integer_division_table.cpp
+  IntegerDivisionTable.cpp
   SlidingWindow.cpp
   StorageFolding.cpp
   InlineReductions.cpp

src/CodeGen_ARM.cpp

@@ -10,7 +10,7 @@
 #include "Var.h"
 #include "Param.h"
 #include "Simplify.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 #include "LLVM_Headers.h"
 
 // Native client llvm relies on global flags to control sandboxing on

src/CodeGen_GPU_Host.cpp

@@ -10,7 +10,7 @@
 #include "Debug.h"
 #include "Var.h"
 #include "Param.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 #include "CodeGen_Internal.h"
 #include "Util.h"
 #include "Bounds.h"

src/CodeGen_PTX_Dev.cpp

@@ -9,7 +9,7 @@
 #include "Var.h"
 #include "Param.h"
 #include "Target.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 #include "LLVM_Headers.h"
 
 // This is declared in NVPTX.h, which is not exported. Ugly, but seems better than

src/CodeGen_Posix.cpp

@@ -9,7 +9,7 @@
 #include "Util.h"
 #include "Var.h"
 #include "Param.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 
 
 

src/CodeGen_SPIR_Dev.cpp

@@ -9,7 +9,7 @@
 #include "Var.h"
 #include "Param.h"
 #include "Target.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 #include "LLVM_Headers.h"
 
 namespace Halide {
@@ -65,14 +65,14 @@ void CodeGen_SPIR_Dev::add_kernel(Stmt stmt, std::string name, const std::vector
     // Make the initial basic block
     entry_block = BasicBlock::Create(*context, "entry", function);
     builder->SetInsertPoint(entry_block);
-    
+
     vector<Value *> kernel_arg_address_space = init_kernel_metadata(*context, "kernel_arg_addr_space");
     vector<Value *> kernel_arg_access_qual = init_kernel_metadata(*context, "kernel_arg_access_qual");
     vector<Value *> kernel_arg_type = init_kernel_metadata(*context, "kernel_arg_type");
     vector<Value *> kernel_arg_base_type = init_kernel_metadata(*context, "kernel_arg_base_type");
     vector<Value *> kernel_arg_type_qual = init_kernel_metadata(*context, "kernel_arg_type_qual");
     vector<Value *> kernel_arg_name = init_kernel_metadata(*context, "kernel_arg_name");
-    
+
     // Put the arguments in the symbol table
     {
         llvm::Function::arg_iterator arg = function->arg_begin();
@@ -84,7 +84,7 @@ void CodeGen_SPIR_Dev::add_kernel(Stmt stmt, std::string name, const std::vector
                 // address 'foo.host', so we store the device pointer
                 // as foo.host in this scope.
                 sym_push(iter->name + ".host", arg);
-                
+
                 kernel_arg_address_space.push_back(ConstantInt::get(i32, 1));
             } else {
                 sym_push(iter->name, arg);
@@ -133,11 +133,11 @@ void CodeGen_SPIR_Dev::add_kernel(Stmt stmt, std::string name, const std::vector
     // Add the nvvm annotation that it is a kernel function.
     Value *kernel_metadata[] =
     {
-        function, 
-        MDNode::get(*context, kernel_arg_address_space), 
-        MDNode::get(*context, kernel_arg_access_qual), 
-        MDNode::get(*context, kernel_arg_type), 
-        MDNode::get(*context, kernel_arg_type_qual), 
+        function,
+        MDNode::get(*context, kernel_arg_address_space),
+        MDNode::get(*context, kernel_arg_access_qual),
+        MDNode::get(*context, kernel_arg_type),
+        MDNode::get(*context, kernel_arg_type_qual),
         MDNode::get(*context, kernel_arg_name)
     };
     MDNode *mdNode = MDNode::get(*context, kernel_metadata);
@@ -295,7 +295,7 @@ bool CodeGen_SPIR_Dev::use_soft_float_abi() const {
 }
 
 vector<char> CodeGen_SPIR_Dev::compile_to_src() {
-    
+
     optimize_module();
 
     SmallVector<char, 1024> buffer;

src/CodeGen_X86.cpp

@@ -9,7 +9,7 @@
 #include "Util.h"
 #include "Var.h"
 #include "Param.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 #include "IRPrinter.h"
 #include "LLVM_Headers.h"
 

src/Derivative.cpp

@@ -247,6 +247,7 @@ class Monotonic : public IRVisitor {
     }
 
     void visit(const Select *op) {
+        // TODO: This is a bug! What if the condition depends on the var.
         op->true_value.accept(this);
         MonotonicResult ra = result;
         op->false_value.accept(this);

src/FastIntegerDivide.cpp

@@ -1,5 +1,5 @@
 #include "FastIntegerDivide.h"
-#include "integer_division_table.h"
+#include "IntegerDivisionTable.h"
 
 namespace Halide {
 

src/Func.cpp

@@ -294,25 +294,6 @@ int Func::add_implicit_vars(vector<Var> &args) const {
             iter++;
         }
     }
-#if HALIDE_WARNINGS_FOR_OLD_IMPLICITS
-    else {
-        // The placeholder_pos is used in lhs context. This line fakes an _ at the end of
-        // the provided arguments.
-        placeholder_pos = args.size();
-        if ((int)args.size() < dimensions()) {
-            std::cerr << "Implicit arguments without placeholders are deprecated. Adding " <<
-              dimensions() - args.size() << " arguments to Func " << name() << std::endl;
-
-            int i = 0;
-            placeholder_pos = args.size();
-            while ((int)args.size() < dimensions()) {
-                Internal::debug(2) << "Adding implicit var " << i << " to call to " << name() << "\n";
-                args.push_back(Var::implicit(i++));
-
-            }
-        }
-    }
-#endif
 
     return placeholder_pos;
 }
@@ -336,25 +317,6 @@ int Func::add_implicit_vars(vector<Expr> &args) const {
             iter++;
         }
     }
-#if HALIDE_WARNINGS_FOR_OLD_IMPLICITS
-    else {
-        // The placeholder_pos is used in lhs context. This line fakes an _ at the end of
-        // the provided arguments.
-        placeholder_pos = args.size();
-        if ((int)args.size() < dimensions()) {
-            std::cerr << "Implicit arguments without placeholders are deprecated. Adding " <<
-              dimensions() - args.size() << " arguments to Func " << name() << std::endl;
-
-            int i = 0;
-            placeholder_pos = args.size();
-            while ((int)args.size() < dimensions()) {
-                Internal::debug(2) << "Adding implicit var " << i << " to call to " << name() << "\n";
-                args.push_back(Var::implicit(i++));
-
-            }
-        }
-    }
-#endif
 
     return placeholder_pos;
 }

src/integer_division_table.cpp renamed to src/IntegerDivisionTable.cpp

@@ -1,8 +1,9 @@
+#ifndef HALIDE_INTEGER_DIVISION_TABLE_H
+#define HALIDE_INTEGER_DIVISION_TABLE_H
+
 /** \file
- * Tables telling us how to do integer division
- * via fixed-point multiplication for various small
- * constants. This file is automatically generated
- * by find_inverse.c
+ * Tables telling us how to do integer division via fixed-point
+ * multiplication for various small constants.
  */
 namespace Halide {
 namespace Internal {
@@ -25,3 +26,5 @@ extern int64_t table_runtime_s32[256][4];
 }
 }
 }
+
+#endif

src/integer_division_table.h renamed to src/IntegerDivisionTable.h

@@ -139,20 +139,6 @@ class OutputImageParam {
             args.push_back(last_arg);
         }
 
-#if HALIDE_WARNINGS_FOR_OLD_IMPLICITS
-        if (!is_placeholder && !(*placeholder_seen) &&
-            (int)args.size() == total_args &&
-            (int)args.size() < dims) {
-            std::cout << "Implicit arguments without placeholders ('_') are deprecated."
-                      << " Adding " << dims - args.size()
-                      << " arguments to ImageParam " << name() << '\n';
-            int i = 0;
-            while ((int)args.size() < dims) {
-                args.push_back(Var::implicit(i++));
-
-            }
-        }
-#endif
 
     }
 

src/Param.h

@@ -1,5 +1,5 @@
-#ifndef QUALIFY_H
-#define QUALIFY_H
+#ifndef HALIDE_QUALIFY_H
+#define HALIDE_QUALIFY_H
 
 #include "IR.h"
 

src/Qualify.h

@@ -1,5 +1,5 @@
-#ifndef UNIQUIFY_VARIABLE_NAMES
-#define UNIQUIFY_VARIABLE_NAMES
+#ifndef HALIDE_UNIQUIFY_VARIABLE_NAMES
+#define HALIDE_UNIQUIFY_VARIABLE_NAMES
 
 /** \file
  * Defines the lowering pass that renames all variables to have unique names.

src/UniquifyVariableNames.h

@@ -18,35 +18,10 @@ int main(int argc, char **argv) {
     assert(im2.dimensions() == 2);
     assert(im2(4, 6) == 10);
     // im2 is a 2d image
-      
-#if HALIDE_WARNINGS_FOR_OLD_IMPLICITS
-    // This syntax is deprecated, should produce a warning. DO NOT USE IN NEW CODE.
-    Func f_old;
-    f_old(x) = im1 + im2(x) + im2;
-    // Equivalent to 
-    // f(x, i, j, k) = im1(i, j, k) + im2(x, i) + im2(i, j);
-    // f(x, i, j, k) = i*j*k + x+i + i+j;
-
-    Image<int> result1_old = f_old.realize(2, 2, 2, 2);
-    for (int k = 0; k < 2; k++) {
-        for (int j = 0; j < 2; j++) {
-            for (int i = 0; i < 2; i++) {
-                for (int x = 0; x < 2; x++) {
-                    int correct = i*j*k + x+i + i+j;
-                    if (result1_old(x, i, j, k) != correct) {
-                        printf("result1_old(%d, %d, %d, %d) = %d instead of %d\n",
-                               x, i, j, k, result1_old(x, i, j, k), correct);
-                        return -1;
-                    }
-                }
-            }
-        }
-    }
-#endif
 
     Func f;
     f(x, _) = im1 + im2(x, _) + im2;
-    // Equivalent to 
+    // Equivalent to
     // f(x, i, j, k) = im1(i, j, k) + im2(x, i) + im2(i, j);
     // f(x, i, j, k) = i*j*k + x+i + i+j;
 
@@ -70,9 +45,9 @@ int main(int argc, char **argv) {
     assert(f.dimensions() == 4);
 
     Func g;
-    g(_) = f(2, 2, _) + im2(Expr(1), _); 
+    g(_) = f(2, 2, _) + im2(Expr(1), _);
     f.compute_root();
-    // Equivalent to 
+    // Equivalent to
     // g(i, j) = f(2, 2, i, j) + im2(1, i);
     // g(i, j) = 2*i*j + 2+2 + 2+i + 1+i
 
@@ -83,7 +58,7 @@ int main(int argc, char **argv) {
         for (int i = 0; i < 10; i++) {
             int correct = 2*i*j + 2+2 + 2+i + 1+i;
             if (result2(i, j) != correct) {
-                printf("result2(%d, %d) = %d instead of %d\n", 
+                printf("result2(%d, %d) = %d instead of %d\n",
                        i, j, result2(i, j), correct);
                 return -1;
             }
@@ -105,7 +80,7 @@ int main(int argc, char **argv) {
                  for (int l = 0; l < 10; l++) {
                    int correct = (i<<24)|(j<<16)|(l<<8)|k;
                    if (transposed(i, j, k, l) != correct) {
-                         printf("transposed(%d, %d, %d, %d) = %d instead of %d\n", 
+                         printf("transposed(%d, %d, %d, %d) = %d instead of %d\n",
                                 i, j, k, l, transposed(i, j, k, l), correct);
                          return -1;
                      }
@@ -129,7 +104,7 @@ int main(int argc, char **argv) {
                    int correct2 = (l<<24)|(k<<16)|(i<<8)|j;
                    int correct = correct1 + correct2;
                    if (hairy_transposed(i, j, k, l) != correct) {
-                         printf("hairy_transposed(%d, %d, %d, %d) = %d instead of %d\n", 
+                         printf("hairy_transposed(%d, %d, %d, %d) = %d instead of %d\n",
                                 i, j, k, l, hairy_transposed(i, j, k, l), correct);
                          return -1;
                      }
@@ -153,7 +128,7 @@ int main(int argc, char **argv) {
                    int correct2 = (l<<24)|(l<<16)|(i<<8)|j;
                    int correct = correct1 + correct2;
                    if (hairy_transposed2(i, j, k, l) != correct) {
-                         printf("hairy_transposed2(%d, %d, %d, %d) = %d instead of %d\n", 
+                         printf("hairy_transposed2(%d, %d, %d, %d) = %d instead of %d\n",
                                 i, j, k, l, hairy_transposed2(i, j, k, l), correct);
                          return -1;
                      }