[mlir][Python] Make DenseElementsAttr loading be int size agnostic.

[stellaraccident]

Summary

• I had missed the note about "Standard size" in the docs. On Windows, the 'l' types are 32bit.
• This fixes the only failing MLIR-Python test on Windows.

[stellaraccident]

Gentle ping - fixes the Windows build and working to get the bot up.

[ftynse]

Thanks for fixing!

mlir/lib/Bindings/Python/IRModules.cpp

if (PyObject_GetBuffer(array.ptr(), view, flags) != 0) {
       delete view;
       throw py::error_already_set();
     }
     py::buffer_info arrayInfo(view);
 
     MlirContext context = contextWrapper->get();
     // Switch on the types that can be bulk loaded between the Python and
     // MLIR-C APIs.
+    // See: https://docs.python.org/3/library/struct.html#format-characters
     if (arrayInfo.format == "f") {
       // f32
       assert(arrayInfo.itemsize == 4 && "mismatched array itemsize");
       return PyDenseElementsAttribute(
           contextWrapper->getRef(),
           bulkLoad(context, mlirDenseElementsAttrFloatGet,
                    mlirF32TypeGet(context), arrayInfo));
     } else if (arrayInfo.format == "d") {
       // f64
       assert(arrayInfo.itemsize == 8 && "mismatched array itemsize");
       return PyDenseElementsAttribute(
           contextWrapper->getRef(),
           bulkLoad(context, mlirDenseElementsAttrDoubleGet,
                    mlirF64TypeGet(context), arrayInfo));
-    } else if (arrayInfo.format == "i") {
+    } else if (isSignedIntegerFormat(arrayInfo.format)) {
+      if (arrayInfo.itemsize == 4) {
         // i32
-      assert(arrayInfo.itemsize == 4 && "mismatched array itemsize");
         MlirType elementType = signless ? mlirIntegerTypeGet(context, 32)
                                         : mlirIntegerTypeSignedGet(context, 32);
         return PyDenseElementsAttribute(contextWrapper->getRef(),
                                         bulkLoad(context,
                                                  mlirDenseElementsAttrInt32Get,
                                                  elementType, arrayInfo));
-    } else if (arrayInfo.format == "I") {
-      // unsigned i32
-      assert(arrayInfo.itemsize == 4 && "mismatched array itemsize");
-      MlirType elementType = signless ? mlirIntegerTypeGet(context, 32)
-                                      : mlirIntegerTypeUnsignedGet(context, 32);
-      return PyDenseElementsAttribute(contextWrapper->getRef(),
-                                      bulkLoad(context,
-                                               mlirDenseElementsAttrUInt32Get,
-                                               elementType, arrayInfo));
-    } else if (arrayInfo.format == "l") {
+      } else if (arrayInfo.itemsize == 8) {
         // i64
-      assert(arrayInfo.itemsize == 8 && "mismatched array itemsize");
         MlirType elementType = signless ? mlirIntegerTypeGet(context, 64)
                                         : mlirIntegerTypeSignedGet(context, 64);
         return PyDenseElementsAttribute(contextWrapper->getRef(),
                                         bulkLoad(context,
                                                  mlirDenseElementsAttrInt64Get,
                                                  elementType, arrayInfo));
-    } else if (arrayInfo.format == "L") {
+      }
+    } else if (isUnsignedIntegerFormat(arrayInfo.format)) {
+      if (arrayInfo.itemsize == 4) {
+        // unsigned i32
+        MlirType elementType = signless
+                                   ? mlirIntegerTypeGet(context, 32)
+                                   : mlirIntegerTypeUnsignedGet(context, 32);
+        return PyDenseElementsAttribute(contextWrapper->getRef(),
+                                        bulkLoad(context,
+                                                 mlirDenseElementsAttrUInt32Get,
+                                                 elementType, arrayInfo));
+      } else if (arrayInfo.itemsize == 8) {
         // unsigned i64
-      assert(arrayInfo.itemsize == 8 && "mismatched array itemsize");
-      MlirType elementType = signless ? mlirIntegerTypeGet(context, 64)
-                                      : mlirIntegerTypeUnsignedGet(context, 64);
+        MlirType elementType = signless
+                                   ? mlirIntegerTypeGet(context, 64)
         return PyDenseElementsAttribute(contextWrapper->getRef(),
                                         bulkLoad(context,
                                                  mlirDenseElementsAttrUInt64Get,
                                                  elementType, arrayInfo));
       }
+    }
 
     // TODO: Fall back to string-based get.
     std::string message = "unimplemented array format conversion from format: ";
     message.append(arrayInfo.format);
     throw SetPyError(PyExc_ValueError, message);
   }
 
   static PyDenseElementsAttribute getSplat(PyType shapedType,
bulkLoad(MlirContext context,
     SmallVector<int64_t, 4> shape(arrayInfo.shape.begin(),
                                   arrayInfo.shape.begin() + arrayInfo.ndim);
     auto shapedType =
         mlirRankedTensorTypeGet(shape.size(), shape.data(), mlirElementType);
     intptr_t numElements = arrayInfo.size;
     const ElementTy *contents = static_cast<const ElementTy *>(arrayInfo.ptr);
     return ctor(shapedType, numElements, contents);
   }
-};
+
+  static bool isUnsignedIntegerFormat(const std::string &format) {
+    if (format.empty())
+      return false;
+    char code = format[0];
+    return code == 'I' || code == 'B' || code == 'H' || code == 'L' ||
+           code == 'Q';
+  }
+
+  static bool isSignedIntegerFormat(const std::string &format) {
+    if (format.empty())
+      return false;
+    char code = format[0];
+    return code == 'i' || code == 'b' || code == 'h' || code == 'l' ||
+           code == 'q';
+  }
+}; // namespace
 
 /// Refinement of the PyDenseElementsAttribute for attributes containing integer
 /// (and boolean) values. Supports element access.
 class PyDenseIntElementsAttribute
     : public PyConcreteAttribute<PyDenseIntElementsAttribute,
                                  PyDenseElementsAttribute> {
 public:
   static constexpr IsAFunctionTy isaFunction = mlirAttributeIsADenseIntElements;