Update LLVM to latest (7d246cb)

include/Dialect/HLSCpp/HLSCpp.h

@@ -7,8 +7,8 @@
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/IR/Builders.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Dialect.h"
-#include "mlir/IR/Function.h"
 
 namespace mlir {
 namespace scalehls {

include/Dialect/HLSCpp/Visitor.h

@@ -37,8 +37,8 @@ public:
             DmaWaitOp, AtomicRMWOp, GenericAtomicRMWOp, AtomicYieldOp,
             MemRefCastOp, ViewOp, SubViewOp,
             // Tensor-related statements.
-            TensorLoadOp, TensorStoreOp, TensorToMemrefOp, ExtractElementOp,
-            TensorFromElementsOp, SplatOp, TensorCastOp, DimOp, RankOp,
+            TensorLoadOp, TensorStoreOp, TensorToMemrefOp, TensorFromElementsOp,
+            SplatOp, DimOp, RankOp,
             // Unary expressions.
             AbsFOp, CeilFOp, NegFOp, CosOp, SinOp, TanhOp, SqrtOp, RsqrtOp,
             ExpOp, Exp2Op, LogOp, Log2Op, Log10Op,
@@ -122,10 +122,8 @@ public:
   HANDLE(TensorLoadOp);
   HANDLE(TensorStoreOp);
   HANDLE(TensorToMemrefOp);
-  HANDLE(ExtractElementOp);
   HANDLE(TensorFromElementsOp);
   HANDLE(SplatOp);
-  HANDLE(TensorCastOp);
   HANDLE(DimOp);
   HANDLE(RankOp);
 

include/Dialect/HLSKernel/HLSKernel.h

@@ -7,9 +7,9 @@
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/IR/Builders.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/IR/StandardTypes.h"
 
 namespace mlir {
 namespace scalehls {

lib/Conversion/LegalizeOnnx.cpp

@@ -184,8 +184,8 @@ void LegalizeOnnx::runOnOperation() {
     // Construct new function type.
     SmallVector<Type, 16> inputTypes(func.getArgumentTypes());
     inputTypes.append(weightTypes.begin(), weightTypes.end());
-    auto newType = FunctionType::get(inputTypes, func.getType().getResults(),
-                                     func.getContext());
+    auto newType = FunctionType::get(func.getContext(), inputTypes,
+                                     func.getType().getResults());
 
     // Record the argument number of the old function.
     auto oldArgNum = func.getNumArguments();