[mlir][spirv] Refactor vendor op definitions

Use dedicated vendor op classes/categories. This is so that we can later
change the mnemonics of all vendor ops by changing the base class: `SPV_VendorOp`.

Issue: llvm/llvm-project#56863

Author: kuhar

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

@@ -262,7 +262,7 @@ def SPV_AtomicExchangeOp : SPV_Op<"AtomicExchange", []> {
 
 // -----
 
-def SPV_AtomicFAddEXTOp : SPV_Op<"AtomicFAddEXT", []> {
+def SPV_EXTAtomicFAddOp : SPV_ExtVendorOp<"AtomicFAdd", []> {
   let summary = "TBD";
 
   let description = [{
@@ -279,7 +279,7 @@ def SPV_AtomicFAddEXTOp : SPV_Op<"AtomicFAddEXT", []> {
 
     3) store the New Value back through Pointer.
 
-    The instruction’s result is the Original Value.
+    The instruction's result is the Original Value.
 
     Result Type must be a floating-point type scalar.
 

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

@@ -15,7 +15,7 @@
 
 // -----
 
-def SPV_CooperativeMatrixLengthNVOp : SPV_Op<"CooperativeMatrixLengthNV",
+def SPV_NVCooperativeMatrixLengthOp : SPV_NvVendorOp<"CooperativeMatrixLength",
   [NoSideEffect]> {
   let summary = "See extension SPV_NV_cooperative_matrix";
 
@@ -60,7 +60,7 @@ def SPV_CooperativeMatrixLengthNVOp : SPV_Op<"CooperativeMatrixLengthNV",
 
 // -----
 
-def SPV_CooperativeMatrixLoadNVOp : SPV_Op<"CooperativeMatrixLoadNV", []> {
+def SPV_NVCooperativeMatrixLoadOp : SPV_NvVendorOp<"CooperativeMatrixLoad", []> {
   let summary = "See extension SPV_NV_cooperative_matrix";
 
   let description = [{
@@ -136,7 +136,7 @@ def SPV_CooperativeMatrixLoadNVOp : SPV_Op<"CooperativeMatrixLoadNV", []> {
 
 // -----
 
-def SPV_CooperativeMatrixMulAddNVOp : SPV_Op<"CooperativeMatrixMulAddNV",
+def SPV_NVCooperativeMatrixMulAddOp : SPV_NvVendorOp<"CooperativeMatrixMulAdd",
   [NoSideEffect, AllTypesMatch<["c", "result"]>]> {
   let summary = "See extension SPV_NV_cooperative_matrix";
 
@@ -210,7 +210,7 @@ def SPV_CooperativeMatrixMulAddNVOp : SPV_Op<"CooperativeMatrixMulAddNV",
 
 // -----
 
-def SPV_CooperativeMatrixStoreNVOp : SPV_Op<"CooperativeMatrixStoreNV", []> {
+def SPV_NVCooperativeMatrixStoreOp : SPV_NvVendorOp<"CooperativeMatrixStore", []> {
   let summary = "See extension SPV_NV_cooperative_matrix";
 
   let description = [{

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

@@ -92,7 +92,7 @@ def SPV_GroupBroadcastOp : SPV_Op<"GroupBroadcast",
 
 // -----
 
-def SPV_SubgroupBallotKHROp : SPV_Op<"SubgroupBallotKHR", []> {
+def SPV_KHRSubgroupBallotOp : SPV_KhrVendorOp<"SubgroupBallot", []> {
   let summary = "See extension SPV_KHR_shader_ballot";
 
   let description = [{
@@ -146,7 +146,7 @@ def SPV_SubgroupBallotKHROp : SPV_Op<"SubgroupBallotKHR", []> {
 
 // -----
 
-def SPV_SubgroupBlockReadINTELOp : SPV_Op<"SubgroupBlockReadINTEL", []> {
+def SPV_INTELSubgroupBlockReadOp : SPV_IntelVendorOp<"SubgroupBlockRead", []> {
   let summary = "See extension SPV_INTEL_subgroups";
 
   let description = [{
@@ -197,7 +197,7 @@ def SPV_SubgroupBlockReadINTELOp : SPV_Op<"SubgroupBlockReadINTEL", []> {
 
 // -----
 
-def SPV_SubgroupBlockWriteINTELOp : SPV_Op<"SubgroupBlockWriteINTEL", []> {
+def SPV_INTELSubgroupBlockWriteOp : SPV_IntelVendorOp<"SubgroupBlockWrite", []> {
   let summary = "See extension SPV_INTEL_subgroups";
 
   let description = [{

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

@@ -15,12 +15,12 @@
 
 // -----
 
-def SPV_JointMatrixWorkItemLengthINTELOp : SPV_Op<"JointMatrixWorkItemLengthINTEL",
+def SPV_INTELJointMatrixWorkItemLengthOp : SPV_IntelVendorOp<"JointMatrixWorkItemLength",
   [NoSideEffect]> {
   let summary = "See extension SPV_INTEL_joint_matrix";
 
   let description = [{
-    Return number of components owned by the current work-item in 
+    Return number of components owned by the current work-item in
     a joint matrix.
 
     Result Type must be an 32-bit unsigned integer type scalar.
@@ -60,34 +60,34 @@ def SPV_JointMatrixWorkItemLengthINTELOp : SPV_Op<"JointMatrixWorkItemLengthINTE
 
 // -----
 
-def SPV_JointMatrixLoadINTELOp : SPV_Op<"JointMatrixLoadINTEL", []> {
+def SPV_INTELJointMatrixLoadOp : SPV_IntelVendorOp<"JointMatrixLoad", []> {
   let summary = "See extension SPV_INTEL_joint_matrix";
 
   let description = [{
     Load a matrix through a pointer.
 
     Result Type is the type of the loaded matrix. It must be OpTypeJointMatrixINTEL.
 
-    Pointer is the pointer to load through. It specifies start of memory region where 
+    Pointer is the pointer to load through. It specifies start of memory region where
     elements of the matrix are stored and arranged according to Layout.
 
-    Stride is the number of elements in memory between beginnings of successive rows, 
+    Stride is the number of elements in memory between beginnings of successive rows,
     columns (or words) in the result. It must be a scalar integer type.
 
-    Layout indicates how the values loaded from memory are arranged. It must be the 
+    Layout indicates how the values loaded from memory are arranged. It must be the
     result of a constant instruction.
 
-    Scope is syncronization scope for operation on the matrix. It must be the result 
+    Scope is syncronization scope for operation on the matrix. It must be the result
     of a constant instruction with scalar integer type.
 
-    If present, any Memory Operands must begin with a memory operand literal. If not 
+    If present, any Memory Operands must begin with a memory operand literal. If not
     present, it is the same as specifying the memory operand None.
 
     #### Example:
     ```mlir
-    %0 = spv.JointMatrixLoadINTEL <Subgroup> <RowMajor> %ptr, %stride 
-         {memory_access = #spv.memory_access<Volatile>} : 
-         (!spv.ptr<i32, CrossWorkgroup>, i32) -> 
+    %0 = spv.JointMatrixLoadINTEL <Subgroup> <RowMajor> %ptr, %stride
+         {memory_access = #spv.memory_access<Volatile>} :
+         (!spv.ptr<i32, CrossWorkgroup>, i32) ->
          !spv.jointmatrix<8x16xi32, ColumnMajor, Subgroup>
     ```
   }];
@@ -119,39 +119,39 @@ def SPV_JointMatrixLoadINTELOp : SPV_Op<"JointMatrixLoadINTEL", []> {
 
 // -----
 
-def SPV_JointMatrixMadINTELOp : SPV_Op<"JointMatrixMadINTEL",
+def SPV_INTELJointMatrixMadOp : SPV_IntelVendorOp<"JointMatrixMad",
   [NoSideEffect, AllTypesMatch<["c", "result"]>]> {
   let summary = "See extension SPV_INTEL_joint_matrix";
 
   let description = [{
-    Multiply matrix A by matrix B and add matrix C to the result 
-    of the multiplication: A*B+C. Here A is a M x K matrix, B is 
+    Multiply matrix A by matrix B and add matrix C to the result
+    of the multiplication: A*B+C. Here A is a M x K matrix, B is
     a K x N matrix and C is a M x N matrix.
 
-    Behavior is undefined if sizes of operands do not meet the 
-    conditions above. All operands and the Result Type must be 
+    Behavior is undefined if sizes of operands do not meet the
+    conditions above. All operands and the Result Type must be
     OpTypeJointMatrixINTEL.
 
-    A must be a OpTypeJointMatrixINTEL whose Component Type is a 
-    signed numerical type, Row Count equals to M and Column Count 
+    A must be a OpTypeJointMatrixINTEL whose Component Type is a
+    signed numerical type, Row Count equals to M and Column Count
     equals to K
 
-    B must be a OpTypeJointMatrixINTEL whose Component Type is a 
-    signed numerical type, Row Count equals to K and Column Count 
+    B must be a OpTypeJointMatrixINTEL whose Component Type is a
+    signed numerical type, Row Count equals to K and Column Count
     equals to N
 
-    C and Result Type must be a OpTypeJointMatrixINTEL with Row 
+    C and Result Type must be a OpTypeJointMatrixINTEL with Row
     Count equals to M and Column Count equals to N
 
-    Scope is syncronization scope for operation on the matrix. 
-    It must be the result of a constant instruction with scalar 
+    Scope is syncronization scope for operation on the matrix.
+    It must be the result of a constant instruction with scalar
     integer type.
 
     #### Example:
     ```mlir
-    %r = spv.JointMatrixMadINTEL <Subgroup> %a, %b, %c : 
-         !spv.jointmatrix<8x32xi8, RowMajor, Subgroup>, 
-         !spv.jointmatrix<32x8xi8, ColumnMajor, Subgroup> 
+    %r = spv.JointMatrixMadINTEL <Subgroup> %a, %b, %c :
+         !spv.jointmatrix<8x32xi8, RowMajor, Subgroup>,
+         !spv.jointmatrix<32x8xi8, ColumnMajor, Subgroup>
          -> !spv.jointmatrix<8x8xi32,  RowMajor, Subgroup>
     ```
 
@@ -182,38 +182,38 @@ def SPV_JointMatrixMadINTELOp : SPV_Op<"JointMatrixMadINTEL",
 
 // -----
 
-def SPV_JointMatrixStoreINTELOp : SPV_Op<"JointMatrixStoreINTEL", []> {
+def SPV_INTELJointMatrixStoreOp : SPV_IntelVendorOp<"JointMatrixStore", []> {
   let summary = "See extension SPV_INTEL_joint_matrix";
 
   let description = [{
     Store a matrix through a pointer.
 
-    Pointer is the pointer to store through. It specifies 
-    start of memory region where elements of the matrix must 
+    Pointer is the pointer to store through. It specifies
+    start of memory region where elements of the matrix must
     be stored and arranged according to Layout.
 
-    Object is the matrix to store. It must be 
+    Object is the matrix to store. It must be
     OpTypeJointMatrixINTEL.
 
-    Stride is the number of elements in memory between beginnings 
-    of successive rows, columns (or words) of the Object. It must 
+    Stride is the number of elements in memory between beginnings
+    of successive rows, columns (or words) of the Object. It must
     be a scalar integer type.
 
-    Layout indicates how the values stored to memory are arranged. 
+    Layout indicates how the values stored to memory are arranged.
     It must be the result of a constant instruction.
 
-    Scope is syncronization scope for operation on the matrix. 
-    It must be the result of a constant instruction with scalar 
+    Scope is syncronization scope for operation on the matrix.
+    It must be the result of a constant instruction with scalar
     integer type.
 
-    If present, any Memory Operands must begin with a memory operand 
-    literal. If not present, it is the same as specifying the memory 
+    If present, any Memory Operands must begin with a memory operand
+    literal. If not present, it is the same as specifying the memory
     operand None.
 
     #### Example:
     ```mlir
-    spv.JointMatrixStoreINTEL <Subgroup> <ColumnMajor> %ptr, %m, %stride 
-    {memory_access = #spv.memory_access<Volatile>} : (!spv.ptr<i32, Workgroup>, 
+    spv.JointMatrixStoreINTEL <Subgroup> <ColumnMajor> %ptr, %m, %stride
+    {memory_access = #spv.memory_access<Volatile>} : (!spv.ptr<i32, Workgroup>,
     !spv.jointmatrix<8x16xi32, RowMajor, Subgroup>, i32)
     ```
 

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

@@ -18,7 +18,7 @@ include "mlir/Dialect/SPIRV/IR/SPIRVBase.td"
 
 // -----
 
-def SPV_AssumeTrueKHROp : SPV_Op<"AssumeTrueKHR", []> {
+def SPV_KHRAssumeTrueOp : SPV_KhrVendorOp<"AssumeTrue", []> {
   let summary = "TBD";
 
   let description = [{