graph: utils: pm: support non-binary commutative op

Author: ShanSimu

src/graph/utils/pm/nested_matcher.cpp

@@ -70,10 +70,10 @@ namespace pm {
 
 namespace {
 // check if an op's inputs are commutative
-bool has_commutative_inputs(op_t *op) {
+bool is_commutative_input(op_t *op, const std::set<size_t> &inputs) {
     const op_schema_t *opm
             = op_schema_registry_t::get_op_schema(op->get_kind());
-    return opm->get_commutative_inputs();
+    return opm->get_commutative_inputs(inputs);
 }
 
 // fill local context in map when optional exists
@@ -200,12 +200,16 @@ bool node_inputs_matcher_t::match_commutative_inputs() {
 
     for (size_t node_input_offset = 0; node_input_offset < node_inputs_.size();
             ++node_input_offset) {
+        if (!is_commutative_input(
+                    get_op(), {node_inputs_[node_input_offset].first}))
+            continue;
         if (verified_node_input_ports.find(
                     node_inputs_[node_input_offset].first)
                 != verified_node_input_ports.end())
             continue;
         for (size_t op_input_offset = 0; op_input_offset < op_->num_inputs();
                 ++op_input_offset) {
+            if (!is_commutative_input(get_op(), {op_input_offset})) continue;
             if (verified_op_input_ports.find(op_input_offset)
                             == verified_op_input_ports.end()
                     && match_input_by_offset(
@@ -252,7 +256,8 @@ bool match_node_inputs(const binding_t &b, match_context_t *ctx,
     if (node_inputs_matcher.get_node()->get_inputs().size()
             == VARIADIC_INPUT_NUM) {
         matching_status = node_inputs_matcher.match_variadic_inputs();
-    } else if (!has_commutative_inputs(node_inputs_matcher.get_op())) {
+    } else if (!is_commutative_input(node_inputs_matcher.get_op(),
+                       {b.bind_op_port, b.bind_port})) {
         matching_status = node_inputs_matcher.match_non_commutative_inputs();
     } else {
         matching_status = node_inputs_matcher.match_commutative_inputs();
@@ -552,7 +557,9 @@ bool match_node(const binding_t &b, match_context_t *ctx,
                 __FILE__, __LINE__);
         return false;
     }
-    if (!has_commutative_inputs(b.bind_op) && b.bind_op_port != b.bind_port) {
+    if (b.bind_op_port != b.bind_port
+            && !is_commutative_input(
+                    b.bind_op, {b.bind_op_port, b.bind_port})) {
         DEBUG(DEBUGINFO_PM,
                 "matching op & node: %s (%s) <=> %s, matching "
                 "failed \n",