[mlir][ods] Fix AnyInteger predicate

[stephenneuendorffer]

mlir/include/mlir/IR/OpBase.td

318

To be symmetric with isSignlessInteger() and other functions, maybe adding isInteger() which does the isa<IntegerType> check is a good idea?

[rriddle]

mlir/include/mlir/IR/OpBase.td

318

I explicitly removed all of the methods that can be easily checked with isa<>. They only serve as pass-through methods that bloat API surface area. The same methodology applies to methods placed on the Builder.

mlir/include/mlir/IR/OpBase.td

class AnyTypeOf<list<Type> allowedTypes, string description = ""> : Type<
     Or<!foreach(allowedtype, allowedTypes, allowedtype.predicate)>,
     !if(!eq(description, ""),
         StrJoin<!foreach(t, allowedTypes, t.description), " or ">.result,
         description)>;
 
 // Integer types.
 
 // Any integer type irrespective of its width and signedness semantics.
-def AnyInteger : Type<CPred<"$_self.isInteger()">, "integer">;
+def AnyInteger : Type<CPred<"$_self.isa<IntegerType>()">, "integer">;
 
 // Any integer type (regardless of signedness semantics) of a specific width.
 class AnyI<int width>
     : Type<CPred<"$_self.isInteger(" # width # ")">, width # "-bit integer"> {
   int bitwidth = width;
 }
 
 class AnyIntOfWidths<list<int> widths> :

mlir/test/lib/TestDialect/TestOps.td

 //===----------------------------------------------------------------------===//
 // Test Types
 //===----------------------------------------------------------------------===//
 
 def IntTypesOp : TEST_Op<"int_types"> {
   let results = (outs
     AnyI16:$any_i16,
     SI32:$si32,
-    UI64:$ui64
+    UI64:$ui64,
+    AnyInteger:$any_int
   );
 }
 
 def ComplexF64 : Complex<F64>;
 def ComplexOp : TEST_Op<"complex_f64"> {
   let results = (outs ComplexF64);
 }
 

mlir/test/mlir-tblgen/types.mlir

 // RUN: mlir-opt %s -split-input-file -verify-diagnostics | FileCheck %s
 
 func @correct_int_types_success() {
-  "test.int_types"() : () -> (i16, si32, ui64)
-  "test.int_types"() : () -> (si16, si32, ui64)
-  "test.int_types"() : () -> (ui16, si32, ui64)
+  "test.int_types"() : () -> (i16, si32, ui64, i8)
+  "test.int_types"() : () -> (si16, si32, ui64, ui64)
+  "test.int_types"() : () -> (ui16, si32, ui64, si128)
   return
 }
 
 // -----
 
 func @wrong_int_type_signedness_failure() {
   // expected-error @+1 {{result #1 must be 32-bit signed integer, but got 'ui32'}}
-  "test.int_types"() : () -> (ui16, ui32, ui64)
+  "test.int_types"() : () -> (ui16, ui32, ui64, si8)
   return
 }
 
 // -----
 
 func @wrong_int_type_signedness_failure() {
   // expected-error @+1 {{result #2 must be 64-bit unsigned integer, but got 'si64'}}
-  "test.int_types"() : () -> (ui16, si32, si64)
+  "test.int_types"() : () -> (ui16, si32, si64, ui8)
   return
 }
 
 // -----
 
 func @wrong_int_type_failure() {
   // expected-error @+1 {{result #0 must be 16-bit integer, but got 'f16'}}
-  "test.int_types"() : () -> (f16, si32, ui64)
+  "test.int_types"() : () -> (f16, si32, ui64, i16)
+  return
+}
+
+// -----
+
+func @wrong_int_type_failure() {
+  // expected-error @+1 {{result #3 must be integer, but got 'f64'}}
+  "test.int_types"() : () -> (i16, si32, ui64, f64)
   return
 }
 
 // -----
 
 // CHECK-LABEL: @complex_f64_success
 func @complex_f64_success() {
   "test.complex_f64"() : () -> (complex<f64>)