Address code review comments

Author: asavonic

mlir/include/mlir/Dialect/DXSA/IR/DXSAOps.td

@@ -777,22 +777,22 @@ def DXSA_DclInterface : DXSA_Op<"dcl_interface"> {
   let summary = "declares function table pointers (interfaces)";
   let description = [{
     Declare an `array_length` of function table pointers (interfaces). Each
-    table can be bound at runtime, and it should contain `table_length` function
-    bodies.
+    table can be bound at runtime, and it should contain `num_call_sites`
+    function bodies.
 
     Example:
     ```mlir
     dxsa.dcl_function_body 0
     dxsa.dcl_function_body 1
     dxsa.dcl_function_table 0, <functions = [0, 1]>
-    dxsa.dcl_interface 1, <access = dynamic, array_length = 1, table_length = 2, tables = [0]>
+    dxsa.dcl_interface 1, <access = dynamic, array_length = 1, num_call_sites = 2, tables = [0]>
     ```
   }];
-  let arguments = (ins I32Attr:$index, DXSA_InterfaceAccessAttr:$access, I32Attr:$array_length, I32Attr:$table_length, DenseI32ArrayAttr:$tables);
+  let arguments = (ins I32Attr:$index, DXSA_InterfaceAccessAttr:$access, I32Attr:$array_length, I32Attr:$num_call_sites, DenseI32ArrayAttr:$tables);
   let assemblyFormat = [{ $index `,` `<`
     `access` `=` $access `,`
     `array_length` `=` $array_length `,`
-    `table_length` `=` $table_length `,`
+    `num_call_sites` `=` $num_call_sites `,`
     `tables` `=` $tables `>` attr-dict
   }];
 }

mlir/lib/Target/DXSA/BinaryParser.cpp

@@ -647,11 +647,11 @@ class DXBuilder {
   }
 
   Instruction buildDclInterface(uint32_t index, dxsa::InterfaceAccess access,
-                                uint32_t arrayLength, uint32_t tableLength,
+                                uint32_t arrayLength, uint32_t numCallSites,
                                 ArrayRef<int32_t> tables, Location loc) {
     auto *ctx = builder.getContext();
     return dxsa::DclInterface::create(builder, loc, index, access, arrayLength,
-                                      tableLength,
+                                      numCallSites,
                                       DenseI32ArrayAttr::get(ctx, tables));
   }
 
@@ -1220,37 +1220,35 @@ class Parser {
 
   FailureOr<Instruction> parseDclInterface(uint32_t opcodeToken, Location loc) {
     bool isDynamic = DECODE_D3D11_SB_INTERFACE_INDEXED_BIT(opcodeToken);
-    auto access = dxsa::symbolizeInterfaceAccess(isDynamic);
-    assert(access && "unhandled interface access kind"); // access kind is 1 bit
+    auto access = isDynamic ? dxsa::InterfaceAccess::dynamic
+                            : dxsa::InterfaceAccess::immediate;
 
     // Index of the interface (start index for an array).
     auto index = parseToken();
     FAILURE_IF_FAILED(index);
 
     // Number of call sites (number of bodies in each table).
-    auto tableLength = parseToken();
-    FAILURE_IF_FAILED(tableLength);
+    auto numCallSites = parseToken();
+    FAILURE_IF_FAILED(numCallSites);
 
-    auto interfaceArrayLength = parseToken();
-    FAILURE_IF_FAILED(interfaceArrayLength);
+    auto packedLenghts = parseToken();
+    FAILURE_IF_FAILED(packedLenghts);
 
     // Number of tables (variants).
-    uint32_t interfaceLength =
-        DECODE_D3D11_SB_INTERFACE_TABLE_LENGTH(*interfaceArrayLength);
+    auto tableLength = DECODE_D3D11_SB_INTERFACE_TABLE_LENGTH(*packedLenghts);
 
     // Number of slots to be defined at runtime.
-    uint32_t arrayLength =
-        DECODE_D3D11_SB_INTERFACE_ARRAY_LENGTH(*interfaceArrayLength);
+    auto arrayLength = DECODE_D3D11_SB_INTERFACE_ARRAY_LENGTH(*packedLenghts);
 
     SmallVector<int32_t, 16> tables;
-    tables.resize(interfaceLength);
-    for (uint32_t i = 0; i < interfaceLength; ++i) {
+    tables.resize(tableLength);
+    for (uint32_t i = 0; i < tableLength; ++i) {
       auto tableIndex = parseToken();
       FAILURE_IF_FAILED(tableIndex);
       tables[i] = *tableIndex;
     }
 
-    return builder.buildDclInterface(*index, *access, arrayLength, *tableLength,
+    return builder.buildDclInterface(*index, access, arrayLength, *numCallSites,
                                      tables, loc);
   }
 

mlir/test/Target/DXSA/dcl_interface.mlir

@@ -2,5 +2,5 @@
 
 // CHECK-LABEL: module
 
-// CHECK-NEXT: dxsa.dcl_interface 0, <access = dynamic, array_length = 253, table_length = 1, tables = [0, 1]>
-// CHECK-NEXT: dxsa.dcl_interface 0, <access = immediate, array_length = 253, table_length = 1, tables = [0, 1]>
+// CHECK-NEXT: dxsa.dcl_interface 0, <access = dynamic, array_length = 253, num_call_sites = 1, tables = [0, 1]>
+// CHECK-NEXT: dxsa.dcl_interface 0, <access = immediate, array_length = 253, num_call_sites = 1, tables = [0, 1]>