DRAFT circle-mlir version up externals

on-going draft to version up externals and fix changes.

Signed-off-by: SaeHie Park <saehie.park@gmail.com>

Author: seanshpark

circle-mlir/circle-mlir/lib/dialect/include/circle-mlir/dialect/CircleDialect.h

@@ -20,6 +20,7 @@
 #ifndef __CIRCLE_MLIR_DIALECT_CIRCLE_DIALECT_H__
 #define __CIRCLE_MLIR_DIALECT_CIRCLE_DIALECT_H__
 
+#include <mlir/Bytecode/BytecodeOpInterface.h>           // from @llvm-project
 #include <mlir/Dialect/Traits.h>                         // from @llvm-project
 #include <mlir/IR/Dialect.h>                             // from @llvm-project
 #include <mlir/IR/DialectImplementation.h>               // from @llvm-project
@@ -46,6 +47,7 @@ class ControlType : public Type::TypeBase<ControlType, Type, TypeStorage>
 {
 public:
   using Base::Base;
+  static constexpr StringLiteral name = "cir.control";
 };
 
 #include "mlir/CircleOpInterface.h.inc"

circle-mlir/circle-mlir/lib/dialect/mlir/CircleOps.td

@@ -20,7 +20,7 @@
 #ifndef CIRCLE_OPS
 #define CIRCLE_OPS
 
-include "mlir/IR/FunctionInterfaces.td"
+// include "mlir/IR/FunctionInterfaces.td"
 include "mlir/IR/OpBase.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
@@ -81,6 +81,7 @@ class CIR_VariadicTensorOf<list<Type> allowedRuntimeTypes,
   Variadic<TensorOf<allowedOpTypes>>,
   CIR_RuntimeType<Variadic<TensorOf<allowedRuntimeTypes>>>;
 
+def CIR_I4 : I<4>;
 def CIR_Int32Or64 : SignlessIntOfWidths<[32, 64]>;
 
 def CIR_BoolTensor : CIR_TensorOf<[I1]>;
@@ -260,6 +261,8 @@ class CIR_Op<string mnemonic, list<Trait> traits = []> :
 
   // Whether the Circle operator has options in the schema representation.
   bit hasOptions = 0b0;
+  // Whether the Circle operator has options2 in the schema representation.
+  bit hasOptions2 = 0b0;
 
   // Use to specify a custom options type for Circle operators where
   // the option's name does not match the Cirlce operator's name.

circle-mlir/circle-mlir/lib/dialect/src/NameUtils.cpp

@@ -46,7 +46,7 @@ std::string GetNameFromLoc(Location loc)
       // in functions where the op's name is first.
       auto name = name_loc.getName().strref().split('@').first;
       // Skip if the name is for op type.
-      if (!name.endswith(":"))
+      if (!name.ends_with(":"))
       {
         loc_names.push_back(name);
         if (!name.empty())

circle-mlir/circle-mlir/lib/dialect/src/ops/Conv2DOp.h

@@ -54,10 +54,11 @@ LogicalResult ComputeConvWindowedOutputSize(int64_t input_size, int64_t filter_s
 }
 
 LogicalResult Conv2DOp::inferReturnTypes(MLIRContext *, std::optional<Location> location,
-                                         ValueRange operands, DictionaryAttr attr, OpaqueProperties,
-                                         RegionRange, SmallVectorImpl<Type> &inferredReturnTypes)
+                                         ValueRange operands, DictionaryAttr attr,
+                                         OpaqueProperties properties, RegionRange,
+                                         SmallVectorImpl<Type> &inferredReturnTypes)
 {
-  Conv2DOpAdaptor op(operands, attr);
+  Conv2DOpAdaptor op(operands, attr, properties);
 
   const Value input = op.getInput();
   const Value filter = op.getFilter();

circle-mlir/circle-mlir/lib/dialect/src/ops/ReshapeOp.h

@@ -370,10 +370,10 @@ mlir::LogicalResult ReshapeOp::verify()
 
 LogicalResult ReshapeOp::inferReturnTypes(MLIRContext *context, std::optional<Location> location,
                                           ValueRange operands, DictionaryAttr attr,
-                                          OpaqueProperties, RegionRange,
+                                          OpaqueProperties properties, RegionRange,
                                           SmallVectorImpl<Type> &inferredReturnTypes)
 {
-  ReshapeOpAdaptor op(operands, attr);
+  ReshapeOpAdaptor op(operands, attr, properties);
   const Value input = op.getInput();
   const Value shape = op.getShape();
 

circle-mlir/circle-mlir/lib/import/src/CircleImport.cpp

@@ -39,8 +39,7 @@ inline constexpr unsigned int flatbuffer_size_max = 2147483648;
 #include <llvm/Support/FormatVariadic.h>
 #include <mlir/IR/Matchers.h> // m_Constant
 #include <mlir/Dialect/Func/IR/FuncOps.h>
-#include <mlir/Dialect/Quant/QuantOps.h>
-#include <mlir/Dialect/Quant/QuantTypes.h>
+#include <mlir/Dialect/Quant/IR/QuantTypes.h>
 
 #include <circle_schema/schema_generated.h>
 
@@ -226,8 +225,8 @@ template <typename T> llvm::SmallVector<mlir::APInt> ReadAsHostEndian(llvm::Arra
   const char *data_ptr = reinterpret_cast<const char *>(bytes.data());
   for (size_t i = 0; i < elem_count; i++)
   {
-    T val = llvm::support::endian::readNext<T, llvm::support::endianness::native,
-                                            llvm::support::unaligned>(data_ptr);
+    T val = llvm::support::endian::readNext<T, llvm::endianness::native, llvm::support::unaligned>(
+      data_ptr);
     ret.push_back(mlir::APInt(sizeof(T) * 8, val));
   }
   return ret;
@@ -254,9 +253,8 @@ std::optional<mlir::ElementsAttr> ConvertFloatBuffer(mlir::RankedTensorType shap
 
       for (int i = 0; i < elem_count; i++)
       {
-        uint32_t bit_repr =
-          llvm::support::endian::readNext<uint32_t, llvm::support::endianness::native,
-                                          llvm::support::unaligned>(data);
+        uint32_t bit_repr = llvm::support::endian::readNext<uint32_t, llvm::endianness::native,
+                                                            llvm::support::unaligned>(data);
         values.push_back(absl::bit_cast<float>(bit_repr));
       }
       auto num = shaped_type.getNumElements();

circle-mlir/circle-mlir/lib/pass/src/RewriteCirclePass.cpp

@@ -112,7 +112,7 @@ void RewriteCirclePass::applyActivationFusion()
 
   // TODO add more patterns
 
-  (void)applyPatternsAndFoldGreedily(func, std::move(patterns));
+  (void)applyPatternsGreedily(func, std::move(patterns));
 }
 
 std::unique_ptr<mlir::Pass> createRewriteCirclePass(void)

circle-mlir/circle-mlir/lib/pass/src/opt/ConvertMirrorPadPad32.h

@@ -57,7 +57,7 @@ struct ConvertMirrorPadPad32 : public OpRewritePattern<MirrorPadOp>
     auto intattr = DenseIntElementsAttr::get(si32stype, values);
     mlir::Value shape32 = rewriter.create<ConstOp>(opLoc, intattr);
 
-    auto pad_mutable = mirrorpad_op.getPadMutable();
+    auto &pad_mutable = mirrorpad_op.getPadMutable();
     pad_mutable.assign(shape32);
 
     return mlir::success();

circle-mlir/circle-mlir/lib/pass/src/opt/ConvertReshapeShape32.h

@@ -59,7 +59,7 @@ struct ConvertReshapeShape32 : public OpRewritePattern<ReshapeOp>
     mlir::Value shape32 =
       rewriter.create<ConstOp>(opLoc, DenseIntElementsAttr::get(si32stype, values));
 
-    auto shape_mutable = reshape_op.getShapeMutable();
+    auto &shape_mutable = reshape_op.getShapeMutable();
     shape_mutable.assign(shape32);
 
     return mlir::success();

circle-mlir/circle-mlir/lib/pass/src/opt/ConvertResizeNearestSize32.h

@@ -74,7 +74,7 @@ struct ConvertResizeNearestSize32 : public OpRewritePattern<ResizeNearestNeighbo
     mlir::Value size32 =
       rewriter.create<ConstOp>(opLoc, DenseIntElementsAttr::get(si32stype, values));
 
-    auto resize_mutable = resize_op.getSizeMutable();
+    auto &resize_mutable = resize_op.getSizeMutable();
     resize_mutable.assign(size32);
 
     return mlir::success();