Skip to content

[ET-VK][ops] Add bitwise_or / logical_or operators #20382

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

Open
SS-JIA wants to merge 1 commit into
base: gh/SS-JIA/561/base
Choose a base branch
from
Open

[ET-VK][ops] Add bitwise_or / logical_or operators #20382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 10 additions & 22 deletions backends/vulkan/op_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,28 +294,16 @@ def register_comparison_ops():
# =============================================================================


@update_features(exir_ops.edge.aten.bitwise_and.Tensor)
def register_bitwise_and():
return OpFeatures(
inputs_storage=utils.ANY_STORAGE,
inputs_dtypes=utils.BOOL_T,
supports_resize=True,
supports_highdim=True,
)


@update_features(exir_ops.edge.aten.bitwise_not.default)
def register_bitwise_not():
return OpFeatures(
inputs_storage=utils.ANY_STORAGE,
inputs_dtypes=utils.BOOL_T,
supports_resize=True,
supports_highdim=True,
)


@update_features(exir_ops.edge.aten.logical_and.default)
def register_logical_and():
@update_features(
[
exir_ops.edge.aten.bitwise_and.Tensor,
exir_ops.edge.aten.bitwise_or.Tensor,
exir_ops.edge.aten.bitwise_not.default,
exir_ops.edge.aten.logical_and.default,
exir_ops.edge.aten.logical_or.default,
]
)
def register_bool_binary_ops():
return OpFeatures(
inputs_storage=utils.ANY_STORAGE,
inputs_dtypes=utils.BOOL_T,
Expand Down
5 changes: 5 additions & 0 deletions backends/vulkan/runtime/graph/ops/glsl/binary_op_buffer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@ binary_op_buffer:
generate_variant_forall:
DTYPE:
- VALUE: uint8
- NAME: binary_bitwise_or_buffer
OPERATOR: X | Y
generate_variant_forall:
DTYPE:
- VALUE: uint8
5 changes: 5 additions & 0 deletions backends/vulkan/runtime/graph/ops/glsl/binary_op_texture.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,8 @@ binary_op_texture:
generate_variant_forall:
DTYPE:
- VALUE: uint8
- NAME: binary_bitwise_or_texture3d
OPERATOR: X | Y
generate_variant_forall:
DTYPE:
- VALUE: uint8
3 changes: 3 additions & 0 deletions backends/vulkan/runtime/graph/ops/impl/BinaryOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ DEFINE_BINARY_OP_FN(le);
DEFINE_BINARY_OP_FN(gt);
DEFINE_BINARY_OP_FN(ge);
DEFINE_BINARY_OP_FN(bitwise_and);
DEFINE_BINARY_OP_FN(bitwise_or);

REGISTER_OPERATORS {
VK_REGISTER_OP(aten.add.Tensor, add);
Expand All @@ -159,6 +160,8 @@ REGISTER_OPERATORS {
VK_REGISTER_OP(aten.ge.Tensor, ge);
VK_REGISTER_OP(aten.bitwise_and.Tensor, bitwise_and);
VK_REGISTER_OP(aten.logical_and.default, bitwise_and);
VK_REGISTER_OP(aten.bitwise_or.Tensor, bitwise_or);
VK_REGISTER_OP(aten.logical_or.default, bitwise_or);
}

} // namespace vkcompute
23 changes: 23 additions & 0 deletions backends/vulkan/test/op_tests/cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2164,6 +2164,29 @@ def get_bitwise_and_inputs():
return test_suite


@register_test_suite("aten.bitwise_or.Tensor")
def get_bitwise_or_inputs():
test_suite = VkTestSuite(
[
((M1, M2), (M1, M2)),
((S, S1, S2), (S, S1, S2)),
((XS, S, S1, S2), (XS, S, S1, S2)),
((1, M1), (1, M1)),
]
)
test_suite.layouts = [
"utils::kWidthPacked",
"utils::kChannelsPacked",
]
test_suite.storage_types = [
"utils::kBuffer",
"utils::kTexture3D",
]
test_suite.dtypes = ["at::kBool"]
test_suite.data_gen = "make_seq_tensor"
return test_suite


@register_test_suite("aten.index.Tensor")
def get_index_tensor_inputs():
Test = namedtuple("IndexTensorTest", ["self", "indices"])
Expand Down
Loading