Skip to content

[Codegen][OpenCL] fix amibiguous selection operator call #14833

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 6 commits into from
May 15, 2023
Merged

[Codegen][OpenCL] fix amibiguous selection operator call #14833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8362b32
fix
spectrometerHBH May 12, 2023
539f72b
fix
spectrometerHBH May 14, 2023
e3d9c5c
Update test_target_codegen_opencl.py
tqchen May 14, 2023
5741a59
Update test_target_codegen_opencl.py
tqchen May 14, 2023
b76539c
Update test_target_codegen_opencl.py
tqchen May 14, 2023
9528148
Update codegen_opencl.cc
tqchen May 14, 2023
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: 1 addition & 5 deletions src/target/source/codegen_opencl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,7 @@ void CodeGenOpenCL::VisitExpr_(const SelectNode* op, std::ostream& os) {
os << ", ";
PrintExpr(op->condition, oss);
if (op->dtype.is_float()) {
if (op->condition.dtype().is_uint() || op->condition.dtype().is_int()) {
os << oss.str();
} else {
os << CastTo(oss.str(), DataType::Int(op->dtype.bits(), op->dtype.lanes()));
}
os << CastTo(oss.str(), DataType::Int(op->dtype.bits(), op->dtype.lanes()));
} else {
os << CastFromTo(oss.str(), op->condition.dtype(), op->dtype);
}
Expand Down
32 changes: 23 additions & 9 deletions tests/python/unittest/test_target_codegen_opencl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,34 @@ def check_type_casting(ctx, n, dtype):

c = tvm.nd.empty((n,), dtype, ctx)
assembly = fun.imported_modules[0].get_source()
false_branch = "((float4)(0.000000e+00f, 0.000000e+00f, 0.000000e+00f, 0.000000e+00f))"
true_branch = "((float4)(1.000000e+00f, 1.000000e+00f, 1.000000e+00f, 1.000000e+00f))"
lcond = "(convert_uint4(((uint4)((((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3)))))"
rcond = "(convert_uint4((((int4)((0)+(1*0), (0)+(1*1), (0)+(1*2), (0)+(1*3))) == ((int4)(3, 3, 3, 3)))))"
cond = "({} && {})".format(lcond, rcond)
select = "select({}, {}, {})".format(false_branch, true_branch, cond)
count = assembly.count(select)
assert count == 1

fun(c)
if dtype == "float32":
false_branch = "((float4)(0.000000e+00f, 0.000000e+00f, 0.000000e+00f, 0.000000e+00f))"
true_branch = "((float4)(1.000000e+00f, 1.000000e+00f, 1.000000e+00f, 1.000000e+00f))"
lcond = "convert_int4(((convert_uint4(((uint4)((((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3)))))"
rcond = "(convert_uint4((((int4)((0)+(1*0), (0)+(1*1), (0)+(1*2), (0)+(1*3))) == ((int4)(3, 3, 3, 3)))))"
cond = "({} && {})".format(lcond, rcond)
select = "select({}, {}, {})".format(false_branch, true_branch, cond)
count = assembly.count(select)
assert count == 1
fun(c)

elif dtype == "float16":
false_branch = "((half4)((half)0.000000e+00f, (half)0.000000e+00f, (half)0.000000e+00f, (half)0.000000e+00f))"
true_branch = "((half4)((half)1.000000e+00f, (half)1.000000e+00f, (half)1.000000e+00f, (half)1.000000e+00f))"
lcond = "convert_short4(((convert_uint4(((uint4)((((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3), (((int)get_local_id(0)) == 3)))))"
rcond = "(convert_uint4((((int4)((0)+(1*0), (0)+(1*1), (0)+(1*2), (0)+(1*3))) == ((int4)(3, 3, 3, 3)))))))"
cond = "({} && {})".format(lcond, rcond)
select = "select({}, {}, {})".format(false_branch, true_branch, cond)
count = assembly.count(select)
assert count == 1
fun(c)

dev = tvm.device(target, 0)

check_type_casting(dev, 16, "float32")
# fp16 is not yet supported in ci
# check_type_casting(dev, 16, "float16")


if __name__ == "__main__":
Expand Down