Skip to content

[SCHEDULE] Fix boundary check #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tqchen merged 2 commits into from
Nov 18, 2018
Merged

[SCHEDULE] Fix boundary check #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4203dc6
Fix boundary check
junrushao Nov 18, 2018
15cb9ab
Add unittest
junrushao Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/schedule/message_passing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,11 +491,12 @@ std::vector<Expr> MakeBoundCheck(
IntSet s = EvalSet(value, iset_dmap);
Expr vmin = s.min();
Expr vmax = s.max();
if (vmin.type() != value.type() || !can_prove(vmin >= iv->dom->min)) {
// The range of `value` resides in [vmin, vmax]
if (vmin.type() != value.type() || !can_prove(vmin >= 0)) {
preds.emplace_back(value >= 0);
}
if (vmax.type() != value.type() || !can_prove(vmax < iv->dom->extent)) {
preds.emplace_back(value < (iv->dom->extent - iv->dom->min));
preds.emplace_back(value < iv->dom->extent);
}
}
}
Expand Down
10 changes: 8 additions & 2 deletions tests/python/unittest/test_schedule_schedule_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def test_schedule0():
assert isinstance(bounds, tvm.container.Map)
stmt = tvm.schedule.ScheduleOps(s, bounds)


def test_schedule1():
m = tvm.var('m')
l = tvm.var('l')
Expand Down Expand Up @@ -53,10 +54,13 @@ def test_schedule_scan():
assert tuple(res.shape) == (m, n)
s = tvm.create_schedule(res.op)
s = s.normalize()
ir = tvm.lower(s, [s_state], simple_mode=True)
assert not hasattr(ir.body.body.body.body.rest.body.body.rest.body, "condition")
bounds = tvm.schedule.InferBound(s)
assert(bounds[res.op.scan_axis].min.value == 1)
stmt = tvm.schedule.ScheduleOps(s, bounds)


def test_inline_multi_reduce():
def argmax_comp(x, y):
idx = tvm.select((x[1] >= y[1]), x[0], y[0])
Expand All @@ -80,7 +84,6 @@ def argmax_init(idx_typ, val_typ):
stmt = tvm.schedule.ScheduleOps(s, bounds)



def test_auto_inline():
m = tvm.var('m')
n = tvm.var('n')
Expand All @@ -96,6 +99,7 @@ def test_auto_inline():
bounds = tvm.schedule.InferBound(s)
stmt = tvm.schedule.ScheduleOps(s, bounds)


def test_schedule_const_bound():
n = 128
A = tvm.placeholder((n,), name='A')
Expand Down Expand Up @@ -146,6 +150,7 @@ def test_scan_inline1():
s[s_x1].compute_inline()
stmt = tvm.lower(s, [x, res1, res2])


def test_scan_inline2():
m = tvm.var("m")
n = tvm.var("n")
Expand Down Expand Up @@ -183,6 +188,7 @@ def test_schedule_cache():
bounds = tvm.schedule.InferBound(s)
stmt = tvm.schedule.ScheduleOps(s, bounds)


def test_schedule_middle_cache():
m = tvm.var('m')
n = tvm.var('n')
Expand All @@ -202,7 +208,6 @@ def test_schedule_middle_cache():
stmt = tvm.schedule.ScheduleOps(s, bounds)



def test_schedule_cache_relayout1():
m = tvm.var('m')
n = tvm.var('n')
Expand Down Expand Up @@ -249,6 +254,7 @@ def test_schedule_cache_relayout3():
bounds = tvm.schedule.InferBound(s)
stmt = tvm.schedule.ScheduleOps(s, bounds)


def test_schedule_cache_relayout4():
def _compute(*indice):
return A(*indice) + 1, B(*indice) / 2
Expand Down