Skip to content

Commit deb2436

Browse files
committed
[KleidiAI] Always attempt activation packing
ghstack-source-id: 21394f8 ghstack-comment-id: 3169012590 Pull Request resolved: #13232
1 parent 07dcfa0 commit deb2436

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

backends/xnnpack/runtime/XNNCompiler.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,6 @@ bool isQP8(const fb_xnnpack::XNNGraph* graph, const NodePtr node) {
609609
auto cvt_output_id = graph_node->output_id();
610610

611611
auto check_dtype = [graph](uint32_t id, DataType dtype) -> bool {
612-
assert(
613-
dtype == DataType::xnn_datatype_qdint8 ||
614-
dtype == DataType::xnn_datatype_qbint4);
615612
for (auto value : *graph->xvalues()) {
616613
if (value->xvalue_union_type() !=
617614
fb_xnnpack::XValueUnion::XNNQuantizedTensorValue) {
@@ -631,16 +628,21 @@ bool isQP8(const fb_xnnpack::XNNGraph* graph, const NodePtr node) {
631628
return false;
632629
}
633630

631+
std::vector<DataType> supported_filter_dtypes{
632+
DataType::xnn_datatype_qcint8,
633+
DataType::xnn_datatype_qcint4,
634+
DataType::xnn_datatype_qbint4};
634635
// Find if the convert output is going to the right linear node.
635636
// Assuming if we can find one valid linear node, then we can use QP8
636637
// for all the linear nodes consuming this convert output.
637638
for (auto node : *graph->xnodes()) {
638639
if (node->xnode_union_type() == fb_xnnpack::XNodeUnion::XNNFullyConnected) {
639640
auto linear_node = node->xnode_union_as_XNNFullyConnected();
640641
if (linear_node->input1_id() == cvt_output_id) {
641-
if (check_dtype(
642-
linear_node->filter_id(), DataType::xnn_datatype_qbint4)) {
643-
return true;
642+
for (auto supported_filter : supported_filter_dtypes) {
643+
if (check_dtype(linear_node->filter_id(), supported_filter)) {
644+
return true;
645+
}
644646
}
645647
}
646648
}

0 commit comments

Comments
 (0)