Merge pull request #98 from Xilinx/corentin.kernel_unnamed_str_params

[FXML-5060] Kernel op: Amend instantiation args parser to support unnamed strings
Xilinx · Oct 7, 2024 · 780aeae · 780aeae
2 parents 8f42383 + 94d1a00
commit 780aeae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Dialect/XTenNN/IR/XTenNNOps.cpp b/lib/Dialect/XTenNN/IR/XTenNNOps.cpp
@@ -233,9 +233,12 @@ static ParseResult parseKernelInstantiationArgs(OpAsmParser &p,
   if (failed(p.parseCommaSeparatedList([&p, &names, &values]() {
         std::string name;
         if (succeeded(p.parseOptionalString(&name))) {
+          if (failed(p.parseOptionalEqual())) {
+            // This is an unnamed string parameter (e.g. class name).
+            values.push_back(StringAttr::get(p.getContext(), name));
+            return success();
+          }
           names.push_back(StringAttr::get(p.getContext(), name));
-          if (failed(p.parseEqual()))
-            return failure();
         }
         Attribute attr;
         auto res = p.parseOptionalAttribute(attr);

diff --git a/test/Dialect/XTenNN/ops.mlir b/test/Dialect/XTenNN/ops.mlir
@@ -40,6 +40,10 @@ func.func @kernel(%arg0: tensor<2xi64>, %arg1 : tensor<4xi64>) {
     // CHECK: xten_nn.kernel "matmul" (%arg0 : tensor<2xi64>) instantiation_args [42 : i32, 56 : index] {attr = 4 : i32} -> tensor<2xi64>
     %g = xten_nn.kernel "matmul" (%arg0 : tensor<2xi64>) instantiation_args [42, 56, 1.0] {attr = 4 : i32} -> tensor<2xi64>
     // CHECK: xten_nn.kernel "matmul" (%arg0 : tensor<2xi64>) instantiation_args [42 : i64, 56 : i64, 1.000000e+00 : f64] {attr = 4 : i32} -> tensor<2xi64>
+    %h = xten_nn.kernel "readInput" (%arg0 : tensor<2xi64>) instantiation_args ["type" = "double", "length" = 42 : i64] {attr = 4 : i32} -> tensor<2xi64>
+    // CHECK: xten_nn.kernel "readInput" (%arg0 : tensor<2xi64>) instantiation_args ["type" = "double", "length" = 42 : i64] {attr = 4 : i32} -> tensor<2xi64>
+    %i = xten_nn.kernel "readInput" (%arg0 : tensor<2xi64>) instantiation_args ["double", 42 : i64] {attr = 4 : i32} -> tensor<2xi64>
+    // CHECK: xten_nn.kernel "readInput" (%arg0 : tensor<2xi64>) instantiation_args ["double", 42 : i64] {attr = 4 : i32} -> tensor<2xi64>
     return
 }