Revert "[mlir][python] allow DenseIntElementsAttr for index type (llvm#118947)"

This reverts commit 9dd762e.

Author: mgehre-amd

mlir/include/mlir-c/BuiltinAttributes.h

@@ -556,8 +556,6 @@ MLIR_CAPI_EXPORTED int64_t
 mlirDenseElementsAttrGetInt64Value(MlirAttribute attr, intptr_t pos);
 MLIR_CAPI_EXPORTED uint64_t
 mlirDenseElementsAttrGetUInt64Value(MlirAttribute attr, intptr_t pos);
-MLIR_CAPI_EXPORTED uint64_t
-mlirDenseElementsAttrGetIndexValue(MlirAttribute attr, intptr_t pos);
 MLIR_CAPI_EXPORTED float mlirDenseElementsAttrGetFloatValue(MlirAttribute attr,
                                                             intptr_t pos);
 MLIR_CAPI_EXPORTED double

mlir/lib/Bindings/Python/IRAttributes.cpp

@@ -1372,19 +1372,13 @@ class PyDenseIntElementsAttribute
 
     MlirType type = mlirAttributeGetType(*this);
     type = mlirShapedTypeGetElementType(type);
-    // Index type can also appear as a DenseIntElementsAttr and therefore can be
-    // casted to integer.
-    assert(mlirTypeIsAInteger(type) ||
-           mlirTypeIsAIndex(type) && "expected integer/index element type in "
-                                     "dense int elements attribute");
+    assert(mlirTypeIsAInteger(type) &&
+           "expected integer element type in dense int elements attribute");
     // Dispatch element extraction to an appropriate C function based on the
     // elemental type of the attribute. nb::int_ is implicitly constructible
     // from any C++ integral type and handles bitwidth correctly.
     // TODO: consider caching the type properties in the constructor to avoid
     // querying them on each element access.
-    if (mlirTypeIsAIndex(type)) {
-      return mlirDenseElementsAttrGetIndexValue(*this, pos);
-    }
     unsigned width = mlirIntegerTypeGetWidth(type);
     bool isUnsigned = mlirIntegerTypeIsUnsigned(type);
     if (isUnsigned) {

mlir/lib/CAPI/IR/BuiltinAttributes.cpp

@@ -758,9 +758,6 @@ int64_t mlirDenseElementsAttrGetInt64Value(MlirAttribute attr, intptr_t pos) {
 uint64_t mlirDenseElementsAttrGetUInt64Value(MlirAttribute attr, intptr_t pos) {
   return llvm::cast<DenseElementsAttr>(unwrap(attr)).getValues<uint64_t>()[pos];
 }
-uint64_t mlirDenseElementsAttrGetIndexValue(MlirAttribute attr, intptr_t pos) {
-  return llvm::cast<DenseElementsAttr>(unwrap(attr)).getValues<uint64_t>()[pos];
-}
 float mlirDenseElementsAttrGetFloatValue(MlirAttribute attr, intptr_t pos) {
   return llvm::cast<DenseElementsAttr>(unwrap(attr)).getValues<float>()[pos];
 }

mlir/test/python/dialects/builtin.py

@@ -246,7 +246,3 @@ def testDenseElementsAttr():
         # CHECK{LITERAL}: dense<[[0, 1], [2, 3]]> : tensor<2x2xi32>
         print(DenseElementsAttr.get(values, type=VectorType.get((2, 2), i32)))
         # CHECK{LITERAL}: dense<[[0, 1], [2, 3]]> : vector<2x2xi32>
-        idx_values = np.arange(4, dtype=np.int64)
-        idx_type = IndexType.get()
-        print(DenseElementsAttr.get(idx_values, type=VectorType.get([4], idx_type)))
-        # CHECK{LITERAL}: dense<[0, 1, 2, 3]> : vector<4xindex>

mlir/test/python/ir/array_attributes.py

@@ -572,10 +572,6 @@ def testGetDenseElementsIndex():
         print(arr)
         # CHECK: True
         print(arr.dtype == np.int64)
-        array = np.array([1, 2, 3], dtype=np.int64)
-        attr = DenseIntElementsAttr.get(array, type=VectorType.get([3], idx_type))
-        # CHECK: [1, 2, 3]
-        print(list(DenseIntElementsAttr(attr)))
 
 
 # CHECK-LABEL: TEST: testGetDenseResourceElementsAttr

mlir/test/python/ir/attributes.py

@@ -366,10 +366,6 @@ def testDenseIntAttr():
         # CHECK: i1
         print(ShapedType(a.type).element_type)
 
-        shape = Attribute.parse("dense<[0, 1, 2, 3]> : vector<4xindex>")
-        # CHECK: attr: dense<[0, 1, 2, 3]>
-        print("attr:", shape)
-
 
 @run
 def testDenseArrayGetItem():