Merge remote-tracking branch 'origin/master' into llvm-ldflags

Author: Daniel Heck

apps/resize/resize.cpp

@@ -33,7 +33,7 @@ Expr kernel_box(Expr x) {
 
 Expr kernel_linear(Expr x) {
     Expr xx = abs(x);
-    return select(xx < 1.0f, xx, 0.0f);
+    return select(xx < 1.0f, 1.0f - xx, 0.0f);
 }
 
 Expr kernel_cubic(Expr x) {

src/AllocationBoundsInference.cpp

@@ -22,14 +22,15 @@ class AllocationInference : public IRMutator {
     using IRMutator::visit;
 
     const map<string, Function> &env;
+    const FuncValueBounds &func_bounds;
     set<string> touched_by_extern;
 
     void visit(const Realize *op) {
         map<string, Function>::const_iterator iter = env.find(op->name);
         assert (iter != env.end());
         Function f = iter->second;
 
-        Box b = box_touched(op->body, op->name);
+        Box b = box_touched(op->body, op->name, Scope<Interval>(), func_bounds);
 
         if (touched_by_extern.count(f.name())) {
             // The region touched is at least the region required at this
@@ -64,7 +65,8 @@ class AllocationInference : public IRMutator {
     }
 
 public:
-    AllocationInference(const map<string, Function> &e) : env(e) {
+    AllocationInference(const map<string, Function> &e, const FuncValueBounds &fb) :
+        env(e), func_bounds(fb) {
         // Figure out which buffers are touched by extern stages
         for (map<string, Function>::const_iterator iter = e.begin();
              iter != e.end(); ++iter) {
@@ -82,8 +84,10 @@ class AllocationInference : public IRMutator {
     }
 };
 
-Stmt allocation_bounds_inference(Stmt s, const map<string, Function> &env) {
-    AllocationInference inf(env);
+Stmt allocation_bounds_inference(Stmt s,
+                                 const map<string, Function> &env,
+                                 const FuncValueBounds &fb) {
+    AllocationInference inf(env, fb);
     s = inf.mutate(s);
     return s;
 }

src/AllocationBoundsInference.h

@@ -7,15 +7,18 @@
 
 #include <map>
 #include <string>
+
 #include "IR.h"
+#include "Bounds.h"
 
 namespace Halide {
 namespace Internal {
 
 /** Take a partially statement with Realize nodes in terms of
  * variables, and define values for those variables. */
-Stmt allocation_bounds_inference(Stmt s, const std::map<std::string, Function> &env);
-
+Stmt allocation_bounds_inference(Stmt s,
+                                 const std::map<std::string, Function> &env,
+                                 const std::map<std::pair<std::string, int>, Interval> &func_bounds);
 }
 }