[mlir][spirv] Switch to kEmitAccessorPrefix_Both

[kuhar]

Summary

Prepare for switching to prefixed accessors.

Issue: https://github.com/llvm/llvm-project/issues/57887.

[rriddle]

Sweet! Thanks for doing this!

mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td

let extraClassDeclaration = [{
     /// Dialect attribute parsing hook.
     Attribute parseAttribute(
         DialectAsmParser &parser, Type type) const override;
     /// Dialect attribute printing hook.
     void printAttribute(
         Attribute attr, DialectAsmPrinter &printer) const override;
   }];
 
-  // TODO: This has overlapping accessors with generated when switched to
-  // prefixed. Fix and update to _Both & then _Prefixed.
-  let emitAccessorPrefix = kEmitAccessorPrefix_Raw;
+  // TODO(https://github.com/llvm/llvm-project/issues/57887): Switch to
+  // _Prefixed accessors.
+  let emitAccessorPrefix = kEmitAccessorPrefix_Both;
 }
 
 //===----------------------------------------------------------------------===//
 // Utility definitions
 //===----------------------------------------------------------------------===//
 
 // Wrapper over base BitEnumAttr to set common fields.
 class SPV_BitEnum<string name, string description,

mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td

[{
       $_state.addSuccessors(successor);
       $_state.addOperands(arguments);
     }]>
   ];
 
   let skipDefaultBuilders = 1;
 
   let extraClassDeclaration = [{
-    /// Returns the branch target block.
-    Block *getTarget() { return target(); }
-
     /// Returns the block arguments.
     operand_range getBlockArguments() { return targetOperands(); }
   }];
 
   let autogenSerialization = 0;
 
   let assemblyFormat = [{
     $target (`(` $targetOperands^ `:` type($targetOperands) `)`)? attr-dict
def SPV_FunctionCallOp : SPV_Op<"FunctionCall", [
   }];
 
   let arguments = (ins
     FlatSymbolRefAttr:$callee,
     Variadic<SPV_Type>:$arguments
   );
 
   let results = (outs
-    Optional<SPV_Type>:$result
+    Optional<SPV_Type>:$return_value
   );
 
   let autogenSerialization = 0;
 
   let assemblyFormat = [{
     $callee `(` $arguments `)` attr-dict `:`
       functional-type($arguments, results)
   }];
 }
 
 // -----
 
 def SPV_LoopOp : SPV_Op<"mlir.loop", [InFunctionScope]> {
   let summary = "Define a structured loop.";
 

mlir/include/mlir/Dialect/SPIRV/IR/SPIRVCooperativeMatrixOps.td

let description = [{
 
     For example:
 
     ```
     %0 = spv.NV.CooperativeMatrixLength : !spv.coopmatrix<Subgroup, i32, 8, 16>
     ```
   }];
 
-  let assemblyFormat = "attr-dict `:` $type";
+  let assemblyFormat = "attr-dict `:` $cooperative_matrix_type";
 
   let availability = [
     MinVersion<SPV_V_1_0>,
     MaxVersion<SPV_V_1_6>,
     Extension<[SPV_NV_cooperative_matrix]>,
     Capability<[SPV_C_CooperativeMatrixNV]>
   ];
 
   let arguments = (ins
-    TypeAttr:$type
+    TypeAttr:$cooperative_matrix_type
   );
 
   let results = (outs
     SPV_Int32:$result
   );
   let hasVerifier = 0;
 }
 

mlir/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td

let description = [{
 
     For example:
 
     ```
     %0 = spv.INTEL.JointMatrixWorkItemLength : !spv.jointmatrix<Subgroup, i32, 8, 16>
     ```
   }];
 
-  let assemblyFormat = "attr-dict `:` $type";
+  let assemblyFormat = "attr-dict `:` $joint_matrix_type";
 
   let availability = [
     MinVersion<SPV_V_1_0>,
     MaxVersion<SPV_V_1_6>,
     Extension<[SPV_INTEL_joint_matrix]>,
     Capability<[SPV_C_JointMatrixINTEL]>
   ];
 
   let arguments = (ins
-    TypeAttr:$type
+    TypeAttr:$joint_matrix_type
   );
 
   let results = (outs
     SPV_Int32:$result
   );
   let hasVerifier = 0;
 }
 

mlir/include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td

OpBuilder<(ins "StringRef":$name, "FunctionType":$type,
       CArg<"spirv::FunctionControl", "spirv::FunctionControl::None">:$control,
       CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs)>];
 
   let hasOpcode = 0;
 
   let autogenSerialization = 0;
 
   let extraClassDeclaration = [{
-    /// Returns the type of this function.
-    /// FIXME: Remove when SPIRV uses prefixed accessors.
-    FunctionType getFunctionType() { return function_type(); }
-
     /// Returns the argument types of this function.
     ArrayRef<Type> getArgumentTypes() { return getFunctionType().getInputs(); }
 
     /// Returns the result types of this function.
     ArrayRef<Type> getResultTypes() { return getFunctionType().getResults(); }
 
     /// Hook for FunctionOpInterface, called after verifying that the 'type'
     /// attribute is present and checks if it holds a function type. Ensures