Skip to content
Open
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
70 changes: 70 additions & 0 deletions include/circt/Dialect/Moore/MooreOps.td
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,14 @@ class DelayedAssignOpBase<string mnemonic, list<Trait> traits = []> :
}];
}

class DeassignOpBase<string mnemonic, list<Trait> traits = []> :
MooreOp<mnemonic, traits> {
let arguments = (ins RefType:$dst);
let assemblyFormat = [{
$dst attr-dict `:` type($dst)
}];
}

// Continuous assignment

def ContinuousAssignOp : AssignOpBase<"assign", [HasParent<"SVModuleOp">]> {
Expand Down Expand Up @@ -459,6 +467,68 @@ def DelayedNonBlockingAssignOp :
}];
}

// Procedural continuous assignment

def ProceduralContinuousAssignOp : AssignOpBase<"procedural_assign", [
HasParent<"ProcedureOp">
]> {
let summary = "Procedural continuous assignment (keyword: assign)";
let description = [{
A continuous assignment in procedure scope, such as `assign x = y;`, which
continuously drives the value on the right-hand side onto the LHS.

LHS of assignment is a variable reference or a concatenation of variables.

See IEEE 1800-2023 § 10.6.1 "The assign and deassign procedural statements".
}];
}

def ProceduralContinuousForceOp : AssignOpBase<"force", [
HasParent<"ProcedureOp">
]> {
let summary = "Procedural continuous assignment (keyword: force)";
let description = [{
A continuous assignment in procedure scope, such as `force x = y;`, which
continuously drives the value on the right-hand side onto the LHS.

LHS of assignment is a variable reference, a net, a constant bit-select or
part-select of a vector net, or a concatenation of these.

It overrides an `assign` procedural continuous assignment.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: could we move this up to the first sentence to make the semantic difference a bit clearer?


See IEEE 1800-2023 § 10.6.2 "The force and release procedural statements".
}];
}

def ProceduralContinuousDeassignOp : DeassignOpBase<"procedural_deassign", [
HasParent<"ProcedureOp">
]> {
let summary = "Procedural continuous deassignment (keyword: deassign)";
let description = [{
Deassignment of a continuous assignment in procedure scope, such as `deassign x;`.

The value of the variable shall remain the same until the variable is assigned a
new value (through a procedural or procedural continuous assignment).

See IEEE 1800-2023 § 10.6.1 "The assign and deassign procedural statements".
}];
}

def ProceduralContinuousReleaseOp : DeassignOpBase<"release", [
HasParent<"ProcedureOp">
]> {
let summary = "Procedural continuous deassignment (keyword: release)";
let description = [{
Deassignment of a continuous assignment in procedure scope, such as `release x;`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, could we clarify the semantic difference between this and deassign in this paragraph?


If the variable is driven by a continuous assignment or currently has an active
`assign` procedural continuous assignment, then it shall re-establish that
assignment. Otherwise,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's some missing text here?


See IEEE 1800-2023 § 10.6.2 "The force and release procedural statements".
}];
}

//===----------------------------------------------------------------------===//
// Statements
//===----------------------------------------------------------------------===//
Expand Down
40 changes: 40 additions & 0 deletions lib/Conversion/ImportVerilog/Statements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,46 @@ struct StmtVisitor {
return success();
}

// Handle procedural continuous assignment.
LogicalResult visit(const slang::ast::ProceduralAssignStatement &assignNode) {
const auto &expr =
assignNode.assignment.as<slang::ast::AssignmentExpression>();

auto lhs = context.convertLvalueExpression(expr.left());
if (!lhs)
return failure();

auto rhs = context.convertRvalueExpression(
expr.right(), cast<moore::RefType>(lhs.getType()).getNestedType());
if (!rhs)
return failure();

if (assignNode.isForce) {
moore::ProceduralContinuousForceOp::create(builder, loc, lhs, rhs);
} else {
// TODO: prohibit net-type lhs
moore::ProceduralContinuousAssignOp::create(builder, loc, lhs, rhs);
}

return success();
}

// Handle procedural continuous deassignment.
LogicalResult
visit(const slang::ast::ProceduralDeassignStatement &deassignNode) {
auto lhs = context.convertLvalueExpression(deassignNode.lvalue);
if (!lhs)
return failure();

if (deassignNode.isRelease) {
moore::ProceduralContinuousReleaseOp::create(builder, loc, lhs);
} else {
moore::ProceduralContinuousDeassignOp::create(builder, loc, lhs);
}
Comment on lines +1122 to +1126
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: we can drop the braces here


return success();
}

/// Emit an error for all other statements.
template <typename T>
LogicalResult visit(T &&stmt) {
Expand Down
47 changes: 47 additions & 0 deletions test/Conversion/ImportVerilog/basic.sv
Original file line number Diff line number Diff line change
Expand Up @@ -4099,6 +4099,53 @@ module QueueUnboundedLiteralTest;
endmodule


// CHECK-LABEL: moore.module @ContinuousProceduralAssign(in %clear : !moore.l1, in %preset : !moore.l1) {
module ContinuousProceduralAssign (
input clear,
input preset
);

// CHECK: [[Q:%.+]] = moore.variable : <l1>
logic q;

always @(clear or preset)
if (!clear)
// CHECK: [[ZERO:%.+]] = moore.constant 0 : l1
// CHECK: moore.procedural_assign [[Q]], [[ZERO]] : l1
assign q = 0;
else if (!preset)
// CHECK: [[ONE:%.+]] = moore.constant 1 : l1
// CHECK: moore.procedural_assign [[Q]], [[ONE]] : l1
assign q = 1;
else
// CHECK: moore.procedural_deassign [[Q]] : <l1>
deassign q;

endmodule

// CHECK-LABEL: moore.module @ContinuousProceduralForce(in %clear : !moore.l1, in %preset : !moore.l1) {
module ContinuousProceduralForce (
input clear,
input preset
);

// CHECK: [[Q:%.+]] = moore.variable : <l1>
logic q;

always @(clear or preset)
if (!clear)
// CHECK: [[ZERO:%.+]] = moore.constant 0 : l1
// CHECK: moore.force [[Q]], [[ZERO]] : l1
force q = 0;
else if (!preset)
// CHECK: [[ONE:%.+]] = moore.constant 1 : l1
// CHECK: moore.force [[Q]], [[ONE]] : l1
force q = 1;
else
// CHECK: moore.release [[Q]] : <l1>
release q;

endmodule


// CHECK-LABEL: moore.module @ForkJoinTest() {
Expand Down
7 changes: 0 additions & 7 deletions test/Conversion/ImportVerilog/errors.sv
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ module Foo;
initial x = @* x;
endmodule

// -----
module Foo;
int a;
// expected-error @below {{unsupported statement}}
initial release a;
endmodule

// -----
module Foo;
bit x, y;
Expand Down