rebase

Author: makslevental

lib/Dialect/HW/Transforms/FlattenModules.cpp

@@ -132,7 +132,7 @@ void FlattenModulesPass::runOnOperation() {
           continue;
 
         bool isLastModuleUse = --numUsesLeft == 0;
-        mlir::InlinerConfig config;
+
         PrefixingInliner inliner(&getContext(), inst.getInstanceName());
         if (failed(mlir::inlineRegion(inliner, config.getCloneCallback(),
                                       &module.getBody(), inst,

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,7 +461,7 @@ static LogicalResult processBuffer(
 
     mlir::ExecutionEngineOptions engineOptions;
     engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
-    static std::function<llvm::Error(llvm::Module *)> transformer =
+    std::function<llvm::Error(llvm::Module *)> transformer =
         mlir::makeOptimizingTransformer(
             /*optLevel=*/3, /*sizeLevel=*/0,
             /*targetMachine=*/nullptr);

tools/arcilator/arcilator.cpp

@@ -242,6 +242,9 @@ static LogicalResult executeBMC(MLIRContext &context) {
   };
 
   std::unique_ptr<mlir::ExecutionEngine> engine;
+  std::function<llvm::Error(llvm::Module *)> transformer =
+      mlir::makeOptimizingTransformer(
+          /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
   {
     auto timer = ts.nest("Setting up the JIT");
     auto entryPoint =
@@ -264,9 +267,6 @@ static LogicalResult executeBMC(MLIRContext &context) {
     SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
                                               sharedLibs.end());
     mlir::ExecutionEngineOptions engineOptions;
-    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;

tools/circt-bmc/circt-bmc.cpp

@@ -282,6 +282,9 @@ static LogicalResult executeLEC(MLIRContext &context) {
   };
 
   std::unique_ptr<mlir::ExecutionEngine> engine;
+  std::function<llvm::Error(llvm::Module *)> transformer =
+      mlir::makeOptimizingTransformer(
+          /*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
   {
     auto timer = ts.nest("Setting up the JIT");
     auto entryPoint = dyn_cast_or_null<LLVM::LLVMFuncOp>(
@@ -304,9 +307,6 @@ static LogicalResult executeLEC(MLIRContext &context) {
     SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
                                               sharedLibs.end());
     mlir::ExecutionEngineOptions engineOptions;
-    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;