Updating the IREE public dialect variable -> global ops.

iree/compiler/Dialect/Util/IR/UtilOps.td

diff --git a/iree/compiler/Dialect/Util/IR/UtilOps.td b/iree/compiler/Dialect/Util/IR/UtilOps.td
index 4c78361..2a7efd2 100644
--- a/iree/compiler/Dialect/Util/IR/UtilOps.td
+++ b/iree/compiler/Dialect/Util/IR/UtilOps.td
@@ -308,7 +308,9 @@
     AnyType:$result
   );
 
-  let assemblyFormat = "$global attr-dict `:` type($global) `->` type($result)";
+  let assemblyFormat = [{
+    $global attr-dict `:` type($global) `->` type($result)
+  }];
 
   let verifier = [{ return verifyGlobalLoadIndirectOp(*this); }];
 

llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEBase.td

diff --git a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEBase.td b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEBase.td
index 09e655e..3194b51 100644
--- a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEBase.td
+++ b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEBase.td
@@ -92,8 +92,8 @@
 def IREE_Shape : Variadic<IREE_Dim>;
 def IREE_ShapeDynamicDims : Variadic<IREE_Dim>;
 
-def IREE_VariableRefAttr : IREE_AliasedSymbolRefAttr;
-def IREE_VariablePtr : IREE_AnyPtrOf<[IREE_Tensor, IREE_PrimitiveType]>;
+def IREE_GlobalRefAttr : IREE_AliasedSymbolRefAttr;
+def IREE_AnyGlobalPtr : IREE_AnyPtrOf<[IREE_Tensor, IREE_PrimitiveType]>;
 
 class IREE_IndexAttrBase<string descr> :
     TypedAttrBase<

llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEOps.td

diff --git a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEOps.td b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEOps.td
index 608353b..41774ff 100644
--- a/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEOps.td
+++ b/llvm-external-projects/iree-dialects/include/iree-dialects/Dialect/IREE/IREEOps.td
@@ -62,108 +62,121 @@
 // Global variables
 //===----------------------------------------------------------------------===//
 
-def IREE_VariableOp : IREE_Op<"variable", [
+def IREE_GlobalOp : IREE_Op<"global", [
     Symbol,
   ]> {
-  let summary = [{stateful variable declaration}];
+  let summary = [{stateful global variable declaration}];
   let description = [{
-    Declares a persistent variable that maintains its value.
+    Declares a global variable that maintains its value across invocations.
+    The value is tied to the execution context of the module and different
+    contexts will have different global storage.
   }];
 
   let arguments = (ins
-    StrAttr:$sym_name,
+    OptionalAttr<StrAttr>:$sym_visibility,
+    SymbolNameAttr:$sym_name,
     TypeAttr:$type,
     UnitAttr:$is_mutable,
     OptionalAttr<FlatSymbolRefAttr>:$initializer,
     OptionalAttr<AnyAttr>:$initial_value
   );
 
-  let skipDefaultBuilders = 1;
-  let builders = [
-    OpBuilder<(ins "StringRef":$name, "bool":$isMutable,
-      "FuncOp":$initializer, CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>,
-    OpBuilder<(ins "StringRef":$name, "bool":$isMutable, "Type":$type,
-      "Attribute":$initialValue, CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>,
-    OpBuilder<(ins "StringRef":$name, "bool":$isMutable, "Type":$type,
-      CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>,
-  ];
+  // TODO(laurenzo): copy SymbolVisibility/TypeOrAttr from UtilOps.cpp.
+  // let assemblyFormat = [{
+  //   custom<SymbolVisibility>($sym_visibility)
+  //   (`mutable` $is_mutable^)?
+  //   $sym_name
+  //   attr-dict
+  //   (`initializer` `(` $initializer^ `)`):(``)?
+  //   custom<TypeOrAttr>($type, $initial_value)
+  // }];
 }
 
-def IREE_VariableAddressOp : IREE_PureOp<"variable.address"> {
-  let summary = [{returns an address reference to a variable}];
+def IREE_GlobalAddressOp : IREE_PureOp<"global.address"> {
+  let summary = [{returns an address reference to a global}];
   let description = [{
-    Returns the address of a variable as a typed reference. Can be used with the
-    variable load and store indirect ops.
+    Returns the address of a global as a typed reference. Can be used with the
+    global load and store indirect ops.
   }];
 
   let arguments = (ins
-    IREE_VariableRefAttr:$variable
+    IREE_GlobalRefAttr:$global
   );
   let results = (outs
-    IREE_VariablePtr:$result
+    IREE_AnyGlobalPtr:$result
   );
 
-  let assemblyFormat = "$variable attr-dict `:` type($result)";
+  let assemblyFormat = [{
+    $global attr-dict `:` type($result)
+  }];
 }
 
-def IREE_VariableLoadOp : IREE_Op<"variable.load"> {
+def IREE_GlobalLoadOp : IREE_Op<"global.load"> {
   let summary = [{loads a value from a global variable}];
   let description = [{
-    Returns a copy of the variable value.
+    Returns a copy of the global value.
   }];
 
   let arguments = (ins
-    IREE_VariableRefAttr:$variable
+    IREE_GlobalRefAttr:$global
   );
   let results = (outs
     AnyType:$result
   );
 
-  let assemblyFormat = "$variable attr-dict `:` type($result)";
+  let assemblyFormat = [{
+    $global attr-dict `:` type($result)
+  }];
 }
 
-def IREE_VariableLoadIndirectOp : IREE_Op<"variable.load.indirect"> {
+def IREE_GlobalLoadIndirectOp : IREE_Op<"global.load.indirect"> {
   let summary = [{loads a value from a global variable}];
   let description = [{
-    Returns a copy of the variable value.
+    Returns a copy of the global value.
   }];
 
   let arguments = (ins
-    IREE_VariablePtr:$variable
+    IREE_AnyGlobalPtr:$global
   );
   let results = (outs
     AnyType:$result
   );
 
-  let assemblyFormat = "$variable attr-dict `:` type($variable) `->` type($result)";
+  let assemblyFormat = [{
+    $global attr-dict `:` type($global) `->` type($result)
+  }];
 }
 
-def IREE_VariableStoreOp : IREE_Op<"variable.store"> {
+def IREE_GlobalStoreOp : IREE_Op<"global.store"> {
   let summary = [{stores a value into a global variable}];
   let description = [{
-    Stores a copy of the value into a variable.
+    Stores a copy of the value into a global.
   }];
 
   let arguments = (ins
     AnyType:$value,
-    IREE_VariableRefAttr:$variable
+    IREE_GlobalRefAttr:$global
   );
 
-  let assemblyFormat = "$value `,` $variable attr-dict `:` type($value)";
+  let assemblyFormat = [{
+    $value `,` $global attr-dict `:` type($value)
+  }];
 }
 
-def IREE_VariableStoreIndirectOp : IREE_Op<"variable.store.indirect"> {
+def IREE_GlobalStoreIndirectOp : IREE_Op<"global.store.indirect"> {
   let summary = [{stores a value into a global variable}];
   let description = [{
-    Stores a copy of the value into a variable.
+    Stores a copy of the value into a global.
   }];
 
   let arguments = (ins
     AnyType:$value,
-    IREE_VariablePtr:$variable
+    IREE_AnyGlobalPtr:$global
   );
 
-  let assemblyFormat = "$value `,` $variable attr-dict `:` type($value) `->` type($variable)";
+  let assemblyFormat = [{
+    $value `,` $global attr-dict `:` type($value) `->` type($global)
+  }];
 }
 
 //===----------------------------------------------------------------------===//