Skip to content

Commit

Permalink
[ImportVerilog] Add support for $clog2
Browse files Browse the repository at this point in the history
Add a `moore.builtin.clog2` op and use it to convert `$clog2` calls in
ImportVerilog.
  • Loading branch information
fabianschuiki committed Sep 27, 2024
1 parent fec5160 commit c1d2fa6
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 3 deletions.
26 changes: 24 additions & 2 deletions include/circt/Dialect/Moore/MooreOps.td
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ class Builtin<string mnemonic, list<Trait> traits = []> :
MooreOp<"builtin." # mnemonic, traits>;

//===----------------------------------------------------------------------===//
// Simulation Control
// Simulation Control Builtins
//===----------------------------------------------------------------------===//

def StopBIOp : Builtin<"stop"> {
Expand Down Expand Up @@ -1499,7 +1499,7 @@ def FinishMessageBIOp : Builtin<"finish_message"> {
}

//===----------------------------------------------------------------------===//
// Severity and Display
// Severity and Display Builtins
//===----------------------------------------------------------------------===//

def DisplayBIOp : Builtin<"display"> {
Expand Down Expand Up @@ -1544,4 +1544,26 @@ def SeverityBIOp : Builtin<"severity"> {
let assemblyFormat = "$severity $message attr-dict";
}

//===----------------------------------------------------------------------===//
// Math Builtins
//===----------------------------------------------------------------------===//

def Clog2BIOp : Builtin<"clog2", [SameOperandsAndResultType]> {
let summary = "Compute ceil(log2(x)) of x";
let description = [{
Computes the ceiling of the base-2 logarithm of the argument. The argument
is interpreted as unsigned. The result is 0 if the argument is 0. The result
corresponds to the minimum address width necessary to address a given number
of elements, or the number of bits necessary to represent a given number of
states.

If any of the bits in the argument are X or Z, the result is X.

See IEEE 1800-2017 § 20.8.1 "Integer math functions".
}];
let arguments = (ins IntType:$value);
let results = (outs IntType:$result);
let assemblyFormat = "$value attr-dict `:` type($value)";
}

#endif // CIRCT_DIALECT_MOORE_MOOREOPS
11 changes: 10 additions & 1 deletion lib/Conversion/ImportVerilog/Expressions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,18 @@ struct RvalueExprVisitor {
Value visitCall(const slang::ast::CallExpression &expr,
const slang::ast::CallExpression::SystemCallInfo &info) {
const auto &subroutine = *info.subroutine;
auto args = expr.arguments();

if (subroutine.name == "$signed" || subroutine.name == "$unsigned")
return context.convertRvalueExpression(*expr.arguments()[0]);
return context.convertRvalueExpression(*args[0]);

if (subroutine.name == "$clog2") {
auto value = context.convertToSimpleBitVector(
context.convertRvalueExpression(*args[0]));
if (!value)
return {};
return builder.create<moore::Clog2BIOp>(loc, value);
}

mlir::emitError(loc) << "unsupported system call `" << subroutine.name
<< "`";
Expand Down
16 changes: 16 additions & 0 deletions test/Conversion/ImportVerilog/builtins.sv
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
// Internal issue in Slang v3 about jump depending on uninitialised value.
// UNSUPPORTED: valgrind

function void dummyA(int x); endfunction

// IEEE 1800-2017 § 20.2 "Simulation control system tasks"
// CHECK-LABEL: func.func private @SimulationControlBuiltins(
function void SimulationControlBuiltins(bit x);
// CHECK: moore.builtin.finish_message false
Expand Down Expand Up @@ -35,6 +38,8 @@ function void SimulationControlBuiltins(bit x);
$exit;
endfunction

// IEEE 1800-2017 § 20.10 "Severity tasks"
// IEEE 1800-2017 § 21.2 "Display system tasks"
// CHECK-LABEL: func.func private @DisplayAndSeverityBuiltins(
// CHECK-SAME: [[X:%.+]]: !moore.i32
function void DisplayAndSeverityBuiltins(int x);
Expand Down Expand Up @@ -181,3 +186,14 @@ function void DisplayAndSeverityBuiltins(int x);
// CHECK: moore.unreachable
if (0) $fatal(1, "%d", x);
endfunction

// IEEE 1800-2017 § 20.8 "Math functions"
// CHECK-LABEL: func.func private @MathBuiltins(
// CHECK-SAME: [[X:%.+]]: !moore.i32
// CHECK-SAME: [[Y:%.+]]: !moore.l42
function void MathBuiltins(int x, logic [41:0] y);
// CHECK: moore.builtin.clog2 [[X]] : i32
dummyA($clog2(x));
// CHECK: moore.builtin.clog2 [[Y]] : l42
dummyA($clog2(y));
endfunction
9 changes: 9 additions & 0 deletions test/Dialect/Moore/basic.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,12 @@ func.func @SeverityAndDisplayBuiltins(%arg0: !moore.format_string) {
moore.builtin.severity fatal %arg0
return
}

// CHECK-LABEL: func.func @MathBuiltins
func.func @MathBuiltins(%arg0: !moore.i32, %arg1: !moore.l42) {
// CHECK: moore.builtin.clog2 %arg0 : i32
moore.builtin.clog2 %arg0 : i32
// CHECK: moore.builtin.clog2 %arg1 : l42
moore.builtin.clog2 %arg1 : l42
return
}

0 comments on commit c1d2fa6

Please sign in to comment.