Skip to content
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

Jump to bottom

[Bugfix] Fixed bug where shifting by out-of-bounds value results in no compute code being emitted. #5115

Merged
merged 3 commits into from
Mar 23, 2020
Merged

[Bugfix] Fixed bug where shifting by out-of-bounds value results in no compute code being emitted. #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fad4ec6
Fixed bug where shifting by out-of-bounds RHS values results in LLVM …
dpankratz Mar 20, 2020
6fedc3f
Updated testcase to be more precise.
dpankratz Mar 20, 2020
fa0fa74
Fixed testcase
dpankratz Mar 20, 2020
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
6 changes: 6 additions & 0 deletions src/tir/ir/op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,9 @@ PrimExpr operator>>(PrimExpr a, PrimExpr b) {
BinaryOpMatchTypes(a, b);
TVM_INDEX_CONST_PROPAGATION({
const DataType& rtype = a.dtype();
if (pb) CHECK(pb->value >= 0 && pb->value < rtype.bits()) <<
"Shift amount must be non-negative and less than " << rtype.bits()
<< " for type " << rtype;
if (pa && pb) return IntImm(rtype, (pa->value >> pb->value));
if (pb) {
if (pb->value == 0) return a;
Expand All @@ -469,6 +472,9 @@ PrimExpr operator<<(PrimExpr a, PrimExpr b) {
BinaryOpMatchTypes(a, b);
TVM_INDEX_CONST_PROPAGATION({
const DataType& rtype = a.dtype();
if (pb) CHECK(pb->value >= 0 && pb->value < rtype.bits()) <<
"Shift amount must be non-negative and less than " << rtype.bits()
<< " for type " << rtype;
if (pa && pb) return IntImm(rtype, (pa->value << pb->value));
if (pb) {
if (pb->value == 0) return a;
Expand Down
18 changes: 18 additions & 0 deletions tests/python/unittest/test_tir_nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,23 @@ def test_float_bitwise():
pass


def test_shift_bounds():
x = te.var('x')
for test in [lambda lhs, rhs : lhs << rhs,
lambda lhs, rhs : lhs >> rhs]:
#negative case
for testcase in [(x,-1), (x,32)]:
try:
test(*testcase)
assert False
except tvm.TVMError:
pass

#positive case
for testcase in [(x,0), (x,16), (x,31)]:
test(*testcase)


def test_divide_by_zero():
for test in [lambda lhs, rhs : tvm.tir.floormod(lhs,rhs),
lambda lhs, rhs : tvm.tir.floordiv(lhs,rhs),
Expand Down Expand Up @@ -293,6 +310,7 @@ def test_vars():
test_all()
test_bitwise()
test_float_bitwise()
test_shift_bounds()
test_divide_by_zero()
test_isnan()
test_equality()
Expand Down