commit f958bbeb28d13e3159898dfd2d7dfe28f767b777
author Chris Lattner <clattner@google.com> Fri Jun 29 22:08:05 2018 -0700
committer jpienaar <jpienaar@google.com> Fri Mar 29 12:27:32 2019 -0700
tree 2d1d1c8f84ad47c9895367882d5eef3d6a1ea2a5
parent faf37dd36876cc367503d1192f7e5f90a3ab56c5

Enhance the type system to support arbitrary precision integers, which are
important for low-bitwidth inference cases and hardware synthesis targets.

Rename 'int' to 'affineint' to avoid confusion between "the integers" and "the int
type".

PiperOrigin-RevId: 202751508

lib/Parser/Parser.cpp

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
index 6927050..1bfa331 100644
--- a/lib/Parser/Parser.cpp
+++ b/lib/Parser/Parser.cpp
@@ -121,7 +121,7 @@
   // as the results of their action.
 
   // Type parsing.
-  PrimitiveType *parsePrimitiveType();
+  Type *parsePrimitiveType();
   Type *parseElementType();
   VectorType *parseVectorType();
   ParseResult parseDimensionListRanked(SmallVectorImpl<int> &dimensions);
@@ -218,12 +218,11 @@
 
 /// Parse the low-level fixed dtypes in the system.
 ///
-///   primitive-type
-///      ::= `f16` | `bf16` | `f32` | `f64`      // Floating point
-///        | `i1` | `i8` | `i16` | `i32` | `i64` // Sized integers
-///        | `int`
+///   primitive-type ::= `f16` | `bf16` | `f32` | `f64`
+///   primitive-type ::= integer-type
+///   primitive-type ::= `affineint`
 ///
-PrimitiveType *Parser::parsePrimitiveType() {
+Type *Parser::parsePrimitiveType() {
   switch (curToken.getKind()) {
   default:
     return (emitError("expected type"), nullptr);
@@ -239,24 +238,16 @@
   case Token::kw_f64:
     consumeToken(Token::kw_f64);
     return Type::getF64(context);
-  case Token::kw_i1:
-    consumeToken(Token::kw_i1);
-    return Type::getI1(context);
-  case Token::kw_i8:
-    consumeToken(Token::kw_i8);
-    return Type::getI8(context);
-  case Token::kw_i16:
-    consumeToken(Token::kw_i16);
-    return Type::getI16(context);
-  case Token::kw_i32:
-    consumeToken(Token::kw_i32);
-    return Type::getI32(context);
-  case Token::kw_i64:
-    consumeToken(Token::kw_i64);
-    return Type::getI64(context);
-  case Token::kw_int:
-    consumeToken(Token::kw_int);
-    return Type::getInt(context);
+  case Token::kw_affineint:
+    consumeToken(Token::kw_affineint);
+    return Type::getAffineInt(context);
+  case Token::inttype: {
+    auto width = curToken.getIntTypeBitwidth();
+    if (!width.hasValue())
+      return (emitError("invalid integer width"), nullptr);
+    consumeToken(Token::inttype);
+    return Type::getInt(width.getValue(), context);
+  }
   }
 }
 
@@ -419,11 +410,9 @@
     return (emitError("expected '>' in memref type"), nullptr);
 
   // FIXME: Add an IR representation for memref types.
-  return Type::getI1(context);
+  return Type::getInt(1, context);
 }
 
-
-
 /// Parse a function type.
 ///
 ///   function-type ::= type-list-parens `->` type-list
@@ -445,7 +434,6 @@
   return FunctionType::get(arguments, results, context);
 }
 
-
 /// Parse an arbitrary type.
 ///
 ///   type ::= primitive-type