[LLVM] bump to 747d4a95

Author: makslevental

lib/Dialect/FIRRTL/Transforms/CheckCombLoops.cpp

@@ -100,7 +100,6 @@ class DiscoverLoops {
             // destination and the second is the source.
             for (auto [dest, source] : df.computeDataFlow())
               addDrivenBy(dest, source);
-
           })
           .Case<Forceable>([&](Forceable forceableOp) {
             // Any declaration that can be forced.
@@ -613,12 +612,12 @@ class DiscoverLoops {
         llvm::dbgs() << "\n node:" << getName(drivenBy[node.first].first)
                      << "=> probe:" << getName(drivenBy[node.second].first);
       }
-      for (auto i = rwProbeClasses.begin(), e = rwProbeClasses.end(); i != e;
-           ++i) { // Iterate over all of the equivalence sets.
+      for (const auto &i : rwProbeClasses) {
+        // Iterate over all of the equivalence sets.
         if (!i->isLeader())
           continue; // Ignore non-leader sets.
         // Print members in this set.
-        llvm::interleave(llvm::make_range(rwProbeClasses.member_begin(i),
+        llvm::interleave(llvm::make_range(rwProbeClasses.member_begin(*i),
                                           rwProbeClasses.member_end()),
                          llvm::dbgs(), "\n");
         llvm::dbgs() << "\n dataflow at leader::" << i->getData() << "\n =>"
@@ -649,13 +648,12 @@ class DiscoverLoops {
     if (auto defOp = dyn_cast_or_null<Forceable>(baseFieldRef.getDefiningOp()))
       if (defOp.isForceable() && !defOp.getDataRef().use_empty()) {
         // Assumption, the probe must exist in the equivalence classes.
-        auto rwProbeNode =
+        unsigned rwProbeNode =
             rwProbeClasses.getLeaderValue(getOrAddNode(defOp.getDataRef()));
         // For all the probes, that are in the same eqv class, i.e., refer to
         // the same value.
         for (auto probe :
-             llvm::make_range(rwProbeClasses.member_begin(
-                                  rwProbeClasses.findValue(rwProbeNode)),
+             llvm::make_range(rwProbeClasses.findLeader(rwProbeNode),
                               rwProbeClasses.member_end())) {
           auto probeVal = drivenBy[probe].first;
           // If the probe is a port, then record the path from the probe to the

lib/Dialect/FIRRTL/Transforms/InferResets.cpp

@@ -1028,11 +1028,10 @@ LogicalResult InferResetsPass::inferAndUpdateResets() {
     llvm::dbgs() << "\n";
     debugHeader("Infer reset types") << "\n\n";
   });
-  for (auto it = resetClasses.begin(), end = resetClasses.end(); it != end;
-       ++it) {
+  for (const auto &it : resetClasses) {
     if (!it->isLeader())
       continue;
-    ResetNetwork net = llvm::make_range(resetClasses.member_begin(it),
+    ResetNetwork net = llvm::make_range(resetClasses.member_begin(*it),
                                         resetClasses.member_end());
 
     // Infer whether this should be a sync or async reset.

lib/Dialect/FIRRTL/Transforms/LowerXMR.cpp

@@ -130,7 +130,7 @@ class LowerXMRPass : public circt::firrtl::impl::LowerXMRBase<LowerXMRPass> {
     CircuitNamespace ns(getOperation());
     circuitNamespace = &ns;
 
-    llvm::EquivalenceClasses<Value, ValueComparator> eq;
+    llvm::EquivalenceClasses<Value> eq;
     dataFlowClasses = &eq;
 
     InstanceGraph &instanceGraph = getAnalysis<InstanceGraph>();
@@ -370,12 +370,12 @@ class LowerXMRPass : public circt::firrtl::impl::LowerXMRBase<LowerXMRPass> {
     }
 
     LLVM_DEBUG({
-      for (auto I = dataFlowClasses->begin(), E = dataFlowClasses->end();
-           I != E; ++I) { // Iterate over all of the equivalence sets.
+      for (const auto &I : *dataFlowClasses) {
+        // Iterate over all of the equivalence sets.
         if (!I->isLeader())
           continue; // Ignore non-leader sets.
         // Print members in this set.
-        llvm::interleave(llvm::make_range(dataFlowClasses->member_begin(I),
+        llvm::interleave(llvm::make_range(dataFlowClasses->member_begin(*I),
                                           dataFlowClasses->member_end()),
                          llvm::dbgs(), "\n");
         llvm::dbgs() << "\n dataflow at leader::" << I->getData() << "\n =>";
@@ -887,15 +887,7 @@ class LowerXMRPass : public circt::firrtl::impl::LowerXMRBase<LowerXMRPass> {
   /// no NextNodeOnPath, which denotes a leaf node on the path.
   SmallVector<XMRNode> refSendPathList;
 
-  /// llvm::EquivalenceClasses wants comparable elements. This comparator uses
-  /// uses pointer comparison on the Impl.
-  struct ValueComparator {
-    bool operator()(const Value &lhs, const Value &rhs) const {
-      return lhs.getImpl() < rhs.getImpl();
-    }
-  };
-
-  llvm::EquivalenceClasses<Value, ValueComparator> *dataFlowClasses;
+  llvm::EquivalenceClasses<Value> *dataFlowClasses;
   // Instance and module ref ports that needs to be removed.
   DenseMap<Operation *, llvm::BitVector> refPortsToRemoveMap;
 

lib/Dialect/HW/Transforms/FlattenModules.cpp

@@ -12,6 +12,7 @@
 #include "circt/Support/BackedgeBuilder.h"
 #include "mlir/IR/IRMapping.h"
 #include "mlir/Pass/Pass.h"
+#include "mlir/Transforms/Inliner.h"
 #include "mlir/Transforms/InliningUtils.h"
 #include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/Support/Debug.h"
@@ -128,9 +129,10 @@ void FlattenModulesPass::runOnOperation() {
           continue;
 
         bool isLastModuleUse = --numUsesLeft == 0;
-
+        mlir::InlinerConfig config;
         PrefixingInliner inliner(&getContext(), inst.getInstanceName());
-        if (failed(mlir::inlineRegion(inliner, &module.getBody(), inst,
+        if (failed(mlir::inlineRegion(inliner, config.getCloneCallback(),
+                                      &module.getBody(), inst,
                                       inst.getOperands(), inst.getResults(),
                                       std::nullopt, !isLastModuleUse))) {
           inst.emitError("failed to inline '")

lib/Dialect/LLHD/Transforms/FunctionEliminationPass.cpp

@@ -18,6 +18,7 @@
 #include "mlir/IR/Visitors.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Pass/Pass.h"
+#include "mlir/Transforms/Inliner.h"
 #include "mlir/Transforms/InliningUtils.h"
 #include "llvm/Support/LogicalResult.h"
 
@@ -81,8 +82,9 @@ LogicalResult FunctionEliminationPass::runOnModule(hw::HWModuleOp module) {
     auto func = cast<CallableOpInterface>(
         table.lookupNearestSymbolFrom(module, symbol.getLeafReference()));
 
-    if (succeeded(
-            mlir::inlineCall(inliner, call, func, func.getCallableRegion()))) {
+    mlir::InlinerConfig config;
+    if (succeeded(mlir::inlineCall(inliner, config.getCloneCallback(), call,
+                                   func, func.getCallableRegion()))) {
       call->erase();
       continue;
     }

llvm

@@ -1,12 +1,12 @@
 // RUN: circt-opt --verify-diagnostics --split-input-file %s
 
 // -----
-// expected-error @below {{invalid kind of Type specified}}
+// expected-error @below {{invalid kind of type specified}}
 // expected-error @below {{parameter 'elementType' which is to be a `PackedType`}}
 unrealized_conversion_cast to !moore.array<4 x string>
 
 // -----
-// expected-error @below {{invalid kind of Type specified}}
+// expected-error @below {{invalid kind of type specified}}
 // expected-error @below {{parameter 'elementType' which is to be a `PackedType`}}
 unrealized_conversion_cast to !moore.open_array<string>
 

test/Dialect/Moore/types-errors.mlir

@@ -461,9 +461,11 @@ static LogicalResult processBuffer(
 
     mlir::ExecutionEngineOptions engineOptions;
     engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
-    engineOptions.transformer = mlir::makeOptimizingTransformer(
-        /*optLevel=*/3, /*sizeLevel=*/0,
-        /*targetMachine=*/nullptr);
+    static std::function<llvm::Error(llvm::Module *)> transformer =
+        mlir::makeOptimizingTransformer(
+            /*optLevel=*/3, /*sizeLevel=*/0,
+            /*targetMachine=*/nullptr);
+    engineOptions.transformer = transformer;
     engineOptions.sharedLibPaths = sharedLibraries;
 
     auto executionEngine =

tools/arcilator/arcilator.cpp

@@ -264,8 +264,10 @@ static LogicalResult executeBMC(MLIRContext &context) {
     SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
                                               sharedLibs.end());
     mlir::ExecutionEngineOptions engineOptions;
-    engineOptions.transformer = mlir::makeOptimizingTransformer(
-        /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
+    static std::function<llvm::Error(llvm::Module *)> transformer =
+        mlir::makeOptimizingTransformer(
+            /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
+    engineOptions.transformer = transformer;
     engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
     engineOptions.sharedLibPaths = sharedLibraries;
     engineOptions.enableObjectDump = true;

tools/circt-bmc/circt-bmc.cpp

@@ -304,8 +304,10 @@ static LogicalResult executeLEC(MLIRContext &context) {
     SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
                                               sharedLibs.end());
     mlir::ExecutionEngineOptions engineOptions;
-    engineOptions.transformer = mlir::makeOptimizingTransformer(
-        /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
+    static std::function<llvm::Error(llvm::Module *)> transformer =
+        mlir::makeOptimizingTransformer(
+            /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
+    engineOptions.transformer = transformer;
     engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
     engineOptions.sharedLibPaths = sharedLibraries;
     engineOptions.enableObjectDump = true;