Skip to content

Commit edace86

Browse files
committed
[LLVM] bump to 747d4a95
1 parent 3b12279 commit edace86

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

lib/Dialect/HW/Transforms/FlattenModules.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void FlattenModulesPass::runOnOperation() {
132132
continue;
133133

134134
bool isLastModuleUse = --numUsesLeft == 0;
135-
135+
mlir::InlinerConfig config;
136136
PrefixingInliner inliner(&getContext(), inst.getInstanceName());
137137
if (failed(mlir::inlineRegion(inliner, config.getCloneCallback(),
138138
&module.getBody(), inst,

llvm

Submodule llvm updated 571 files

test/Dialect/Moore/types-errors.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// RUN: circt-opt --verify-diagnostics --split-input-file %s
22

33
// -----
4-
// expected-error @below {{invalid kind of Type specified}}
4+
// expected-error @below {{invalid kind of type specified}}
55
// expected-error @below {{parameter 'elementType' which is to be a `PackedType`}}
66
unrealized_conversion_cast to !moore.array<4 x string>
77

88
// -----
9-
// expected-error @below {{invalid kind of Type specified}}
9+
// expected-error @below {{invalid kind of type specified}}
1010
// expected-error @below {{parameter 'elementType' which is to be a `PackedType`}}
1111
unrealized_conversion_cast to !moore.open_array<string>
1212

tools/arcilator/arcilator.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,11 @@ static LogicalResult processBuffer(
461461

462462
mlir::ExecutionEngineOptions engineOptions;
463463
engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
464-
engineOptions.transformer = mlir::makeOptimizingTransformer(
465-
/*optLevel=*/3, /*sizeLevel=*/0,
466-
/*targetMachine=*/nullptr);
464+
static std::function<llvm::Error(llvm::Module *)> transformer =
465+
mlir::makeOptimizingTransformer(
466+
/*optLevel=*/3, /*sizeLevel=*/0,
467+
/*targetMachine=*/nullptr);
468+
engineOptions.transformer = transformer;
467469
engineOptions.sharedLibPaths = sharedLibraries;
468470

469471
auto executionEngine =

tools/circt-bmc/circt-bmc.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,10 @@ static LogicalResult executeBMC(MLIRContext &context) {
264264
SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
265265
sharedLibs.end());
266266
mlir::ExecutionEngineOptions engineOptions;
267-
engineOptions.transformer = mlir::makeOptimizingTransformer(
268-
/*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
267+
static std::function<llvm::Error(llvm::Module *)> transformer =
268+
mlir::makeOptimizingTransformer(
269+
/*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
270+
engineOptions.transformer = transformer;
269271
engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
270272
engineOptions.sharedLibPaths = sharedLibraries;
271273
engineOptions.enableObjectDump = true;

tools/circt-lec/circt-lec.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,10 @@ static LogicalResult executeLEC(MLIRContext &context) {
304304
SmallVector<StringRef, 4> sharedLibraries(sharedLibs.begin(),
305305
sharedLibs.end());
306306
mlir::ExecutionEngineOptions engineOptions;
307-
engineOptions.transformer = mlir::makeOptimizingTransformer(
308-
/*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
307+
static std::function<llvm::Error(llvm::Module *)> transformer =
308+
mlir::makeOptimizingTransformer(
309+
/*optLevel*/ 3, /*sizeLevel=*/0, /*targetMachine=*/nullptr);
310+
engineOptions.transformer = transformer;
309311
engineOptions.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
310312
engineOptions.sharedLibPaths = sharedLibraries;
311313
engineOptions.enableObjectDump = true;

0 commit comments

Comments
 (0)