Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions lib/Conversion/MooreToCore/MooreToCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1658,6 +1658,33 @@ static LogicalResult convert(FinishBIOp op, FinishBIOp::Adaptor adaptor,
return success();
}

// moore.builtin.severity -> sim.proc.print
static LogicalResult convert(SeverityBIOp op, SeverityBIOp::Adaptor adaptor,
ConversionPatternRewriter &rewriter) {

std::string severityString;

switch (op.getSeverity()) {
case (Severity::Fatal):
severityString = "Fatal: ";
break;
case (Severity::Error):
severityString = "Error: ";
break;
case (Severity::Warning):
severityString = "Warning: ";
break;
default:
return failure();
}

auto prefix = rewriter.create<sim::FormatLitOp>(op.getLoc(), severityString);
auto message = rewriter.create<sim::FormatStringConcatOp>(
op.getLoc(), ValueRange{prefix, adaptor.getMessage()});
rewriter.replaceOpWithNewOp<sim::PrintFormattedProcOp>(op, message);
return success();
}

// moore.builtin.finish_message
static LogicalResult convert(FinishMessageBIOp op,
FinishMessageBIOp::Adaptor adaptor,
Expand Down Expand Up @@ -1956,6 +1983,7 @@ static void populateOpConversion(ConversionPatternSet &patterns,

// Simulation control
patterns.add<StopBIOp>(convert);
patterns.add<SeverityBIOp>(convert);
patterns.add<FinishBIOp>(convert);
patterns.add<FinishMessageBIOp>(convert);

Expand Down
27 changes: 27 additions & 0 deletions test/Conversion/MooreToCore/basic.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -1245,3 +1245,30 @@ func.func @SimulationControl() {

return
}

// CHECK-LABEL: @SeverityToPrint
func.func @SeverityToPrint() {
// CHECK: [[MSG:%.*]] = sim.fmt.lit "Fatal condition met!"
// CHECK-NEXT: [[PFX:%.*]] = sim.fmt.lit "Fatal: "
// CHECK-NEXT: [[CONCAT:%.*]] = sim.fmt.concat ([[PFX]], [[MSG]])
// CHECK-NEXT: sim.proc.print [[CONCAT]]
%0 = moore.fmt.literal "Fatal condition met!"
moore.builtin.severity fatal %0

// CHECK: [[MSG:%.*]] = sim.fmt.lit "Error condition met!"
// CHECK-NEXT: [[PFX:%.*]] = sim.fmt.lit "Error: "
// CHECK-NEXT: [[CONCAT:%.*]] = sim.fmt.concat ([[PFX]], [[MSG]])
// CHECK-NEXT: sim.proc.print [[CONCAT]]
%1 = moore.fmt.literal "Error condition met!"
moore.builtin.severity error %1

// CHECK: [[MSG:%.*]] = sim.fmt.lit "Warning condition met!"
// CHECK-NEXT: [[PFX:%.*]] = sim.fmt.lit "Warning: "
// CHECK-NEXT: [[CONCAT:%.*]] = sim.fmt.concat ([[PFX]], [[MSG]])
// CHECK-NEXT: sim.proc.print [[CONCAT]]
%2 = moore.fmt.literal "Warning condition met!"
moore.builtin.severity warning %2

return
}