Skip to content

Commit

Permalink
[Bugfix] Fixed bug where shifting by out-of-bounds value results in n…
Browse files Browse the repository at this point in the history
…o compute code being emitted. (apache#5115)

* Fixed bug where shifting by out-of-bounds RHS values results in LLVM to codegen nothing. Added regression testcase

* Updated testcase to be more precise.

* Fixed testcase
  • Loading branch information
dpankratz authored and Trevor Morris committed Apr 16, 2020
1 parent 46f03c6 commit e691ecf
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/tir/ir/op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,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 @@ -484,6 +487,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
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

0 comments on commit e691ecf

Please sign in to comment.