Skip to content

Commit

Permalink
llvm-bump (#4321)
Browse files Browse the repository at this point in the history
Co-authored-by: Ram Sunder <[email protected]>
  • Loading branch information
Ramlakshmi3733 and Ram Sunder authored Nov 18, 2022
1 parent a7b001b commit 2f7ad73
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions lib/Conversion/ExportVerilog/PrepareForEmission.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ static void legalizeHWModule(Block &block, const LoweringOptions &options) {
// if we aren't allowing local variable declarations. The Verilog emitter
// doesn't want to have to have to know how to synthesize a reg in the
// case they have to be spilled for whatever reason.
if (!mlir::MemoryEffectOpInterface::hasNoEffect(&op)) {
if (!mlir::isMemoryEffectFree(&op)) {
if (rewriteSideEffectingExpr(&op))
continue;
}
Expand Down Expand Up @@ -821,8 +821,8 @@ static void legalizeHWModule(Block &block, const LoweringOptions &options) {
// right in general. MLIR doesn't have a "fully associative" property.
if (op.getNumOperands() > 2 && op.getNumResults() == 1 &&
op.hasTrait<mlir::OpTrait::IsCommutative>() &&
mlir::MemoryEffectOpInterface::hasNoEffect(&op) &&
op.getNumRegions() == 0 && op.getNumSuccessors() == 0 &&
mlir::isMemoryEffectFree(&op) && op.getNumRegions() == 0 &&
op.getNumSuccessors() == 0 &&
(op.getAttrs().empty() ||
(op.getAttrs().size() == 1 && op.hasAttr("sv.namehint")))) {
// Lower this operation to a balanced binary tree of the same operation.
Expand Down
2 changes: 1 addition & 1 deletion lib/Dialect/FIRRTL/Transforms/IMDeadCodeElim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void IMDeadCodeElimPass::markBlockExecutable(Block *block) {
else if (isa<FConnectLike>(op))
// Skip connect op.
continue;
else if (!mlir::MemoryEffectOpInterface::hasNoEffect(&op))
else if (!mlir::isMemoryEffectFree(&op))
markUnknownSideEffectOp(&op);

// TODO: Handle attach etc.
Expand Down
2 changes: 1 addition & 1 deletion lib/Dialect/LLHD/Transforms/EarlyCodeMotionPass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void EarlyCodeMotionPass::runOnOperation() {
iter != block->getOperations().end(); ++iter) {
Operation &op = *iter;
if (!isa<llhd::PrbOp>(op) && !isa<llhd::SigOp>(op) &&
(!mlir::MemoryEffectOpInterface::hasNoEffect(&op) ||
(!mlir::isMemoryEffectFree(&op) ||
op.hasTrait<OpTrait::IsTerminator>()))
continue;

Expand Down
2 changes: 1 addition & 1 deletion lib/Dialect/SV/Transforms/HWCleanup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void HWCleanupPass::runOnProceduralRegion(Region &region) {
}

// Keep track of the last side effecting operation we've seen.
if (!mlir::MemoryEffectOpInterface::hasNoEffect(&op))
if (!mlir::isMemoryEffectFree(&op))
lastSideEffectingOp = &op;
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Dialect/SV/Transforms/PrettifyVerilog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ bool PrettifyVerilogPass::splitAssignment(OpBuilder &builder, Value dst,
/// operation so it can be sunk into multiple blocks. If there are no more uses
/// in the current block, the op will be removed.
void PrettifyVerilogPass::sinkOrCloneOpToUses(Operation *op) {
assert(mlir::MemoryEffectOpInterface::hasNoEffect(op) &&
assert(mlir::isMemoryEffectFree(op) &&
"Op with side effects cannot be sunk to its uses.");
auto block = op->getBlock();
// This maps a block to the block local instance of the op.
Expand Down Expand Up @@ -403,7 +403,7 @@ void PrettifyVerilogPass::sinkExpression(Operation *op) {
if (curOpBlock != op->user_begin()->getBlock()) {
// Ok, we're about to make a change, ensure that there are no side
// effects.
if (!mlir::MemoryEffectOpInterface::hasNoEffect(op))
if (!mlir::isMemoryEffectFree(op))
return;

op->moveBefore(*op->user_begin());
Expand Down Expand Up @@ -451,7 +451,7 @@ void PrettifyVerilogPass::sinkExpression(Operation *op) {

// Ok, we're about to make a change, ensure that there are no side
// effects.
if (!mlir::MemoryEffectOpInterface::hasNoEffect(op))
if (!mlir::isMemoryEffectFree(op))
return;

// Ok, we found a common ancestor between all the users that is deeper than
Expand Down
2 changes: 1 addition & 1 deletion llvm
Submodule llvm updated 1568 files

0 comments on commit 2f7ad73

Please sign in to comment.