[mlir][tosa] Align Variable ops to match with TOSA v1.0 spec

* updated $name to $uid
* updated AnyType:$value to Tosa_Tensor:$input1 and Tosa_Tensor:$output1 for VariableWrite and VriableRead Operators
* updated description discrepancies
* note: in the TOSA spec, we had var_shape attr, but it's already included
  in the TypeAttr:$type in MLIR

Signed-off-by: Jerry Ge <[email protected]>
Change-Id: I4cd0348cd4e306dbc2e0e53a89a9404d91fb44d4

Author: Jerry-Ge

mlir/include/mlir/Dialect/Tosa/IR/TosaUtilOps.td

@@ -86,12 +86,13 @@ def Tosa_VariableOp : Tosa_Op<"variable", []> {
   let summary = "Defines a variable";
 
   let description = [{
-    Defines a new TOSA variable. This is a mutable value.
+    Defines a new TOSA variable.
+    This is a persistent mutable value across multiple TOSA graph invocations.
     Modifications are expressed using read/write semantics.
   }];
 
   let arguments = (ins
-    SymbolNameAttr:$name,
+    SymbolNameAttr:$uid,
     TypeAttr:$type,
     OptionalAttr<AnyAttr>:$initial_value
   );
@@ -102,7 +103,7 @@ def Tosa_VariableOp : Tosa_Op<"variable", []> {
   ];
 
   let assemblyFormat = [{
-    $name
+    $uid
     attr-dict
     custom<TypeOrAttr>($type, $initial_value)
   }];
@@ -115,12 +116,12 @@ def Tosa_VariableWriteOp : Tosa_Op<"variable.write", []> {
   let summary = "write_buffer operator";
 
   let description = [{
-    Assigns a value to pseudo-buffer resource holding a mutable tensor.
+    Assigns a value to the pseudo-buffer resource holding a persistent mutable tensor.
   }];
 
   let arguments = (ins
-    SymbolNameAttr:$name,
-    AnyType:$value
+    SymbolNameAttr:$uid,
+    Tosa_Tensor:$input1
   );
 
   list<Availability> availability = [
@@ -129,7 +130,7 @@ def Tosa_VariableWriteOp : Tosa_Op<"variable.write", []> {
   ];
 
   let assemblyFormat = [{
-    $name attr-dict `,` $value `:` type($value)
+    $uid attr-dict `,` $input1 `:` type($input1)
   }];
 }
 
@@ -140,15 +141,15 @@ def Tosa_VariableReadOp : Tosa_Op<"variable.read", []> {
   let summary = "read_buffer operator";
 
   let description = [{
-    Reads the value from a pseudo-buffer resource holding a mutable tensor.
+    Reads the value from a pseudo-buffer resource holding a persistent mutable tensor.
   }];
 
   let arguments = (ins
-    SymbolNameAttr:$name
+    SymbolNameAttr:$uid
   );
 
   let results = (outs
-    AnyType:$value
+    Tosa_Tensor:$output1
   );
 
   list<Availability> availability = [
@@ -157,7 +158,7 @@ def Tosa_VariableReadOp : Tosa_Op<"variable.read", []> {
   ];
 
   let assemblyFormat = [{
-    $name attr-dict `:` type($value)
+    $uid attr-dict `:` type($output1)
   }];
 }
 

mlir/lib/Conversion/TosaToMLProgram/TosaToMLProgram.cpp

@@ -27,7 +27,7 @@ class VariableOpConverter : public OpRewritePattern<tosa::VariableOp> {
   LogicalResult matchAndRewrite(tosa::VariableOp op,
                                 PatternRewriter &rewriter) const final {
     auto newVariable = rewriter.create<mlir::ml_program::GlobalOp>(
-        op.getLoc(), op.getName(), op.getType(), /*is_mutable=*/true,
+        op.getLoc(), op.getUid(), op.getType(), /*is_mutable=*/true,
         op.getInitialValueAttr(), /*sym_visibility=*/nullptr);
     newVariable.setPrivate();
     rewriter.replaceOp(op, newVariable);
@@ -43,9 +43,9 @@ class VariableWriteOpConverter
   LogicalResult matchAndRewrite(tosa::VariableWriteOp op,
                                 PatternRewriter &rewriter) const final {
     auto globalSymbolRef =
-        SymbolRefAttr::get(rewriter.getContext(), op.getName());
+        SymbolRefAttr::get(rewriter.getContext(), op.getUid());
     auto newVariableWrite = rewriter.create<ml_program::GlobalStoreOp>(
-        op.getLoc(), globalSymbolRef, op.getValue());
+        op.getLoc(), globalSymbolRef, op.getInput1());
     rewriter.replaceOp(op, newVariableWrite);
     return success();
   }
@@ -58,7 +58,7 @@ class VariableReadOpConverter : public OpRewritePattern<tosa::VariableReadOp> {
   LogicalResult matchAndRewrite(tosa::VariableReadOp op,
                                 PatternRewriter &rewriter) const final {
     auto globalSymbolRef =
-        SymbolRefAttr::get(rewriter.getContext(), op.getName());
+        SymbolRefAttr::get(rewriter.getContext(), op.getUid());
     auto newVariableRead = rewriter.create<ml_program::GlobalLoadOp>(
         op.getLoc(), op.getType(), globalSymbolRef);
     rewriter.replaceOp(op, newVariableRead);

mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp

@@ -677,17 +677,17 @@ inline bool CompatibleTypes(const mlir::Type &type,
 
 bool TosaValidation::CheckVariable(Operation *op) {
   if (isa<mlir::tosa::VariableOp>(op)) {
-    auto nameAttr = cast<mlir::StringAttr>(op->getAttr("name"));
+    mlir::StringAttr uidAttr = cast<mlir::StringAttr>(op->getAttr("uid"));
 
-    if (variablesMap.count(nameAttr)) {
+    if (variablesMap.count(uidAttr)) {
       op->emitOpError() << "name has already been declared";
       return false;
     }
 
     auto typeAttr = cast<mlir::TypeAttr>(op->getAttr("type"));
     mlir::Type type = typeAttr.getValue();
 
-    variablesMap[nameAttr] = type;
+    variablesMap[uidAttr] = type;
   }
 
   return true;
@@ -696,14 +696,13 @@ bool TosaValidation::CheckVariable(Operation *op) {
 bool TosaValidation::CheckVariableReadOrWrite(Operation *op) {
   if (isa<mlir::tosa::VariableReadOp>(op) ||
       isa<mlir::tosa::VariableWriteOp>(op)) {
-    auto nameAttr = cast<mlir::StringAttr>(op->getAttr("name"));
-
-    if (!variablesMap.count(nameAttr)) {
+    mlir::StringAttr uidAttr = cast<mlir::StringAttr>(op->getAttr("uid"));
+    if (!variablesMap.count(uidAttr)) {
       op->emitOpError() << "name has not been declared";
       return false;
     }
 
-    auto varType = variablesMap[nameAttr];
+    auto varType = variablesMap[uidAttr];
 
     for (auto v : op->getOperands()) {
       auto type = v.getType();