Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix yosys-optimizer using boolean gate mapping with abc -fast mode #568

Merged
merged 1 commit into from Mar 27, 2024
Merged

fix: fix yosys-optimizer using boolean gate mapping with abc -fast mode #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions lib/Transforms/YosysOptimizer/BooleanGateImporter.cpp
View file
Open in desktop
Expand Up @@ -20,14 +20,16 @@ namespace heir {
mlir::Operation *BooleanGateImporter::createOp(Yosys::RTLIL::Cell *cell,
SmallVector<Value> &inputs,
ImplicitLocOpBuilder &b) const {
auto op = llvm::StringSwitch<mlir::Operation *>(cell->type.substr(1))
.Case("inv", b.create<comb::InvOp>(inputs[0], false))
.Case("xnor2", b.create<comb::XNorOp>(inputs, false))
.Case("and2", b.create<comb::AndOp>(inputs, false))
.Case("xor2", b.create<comb::XorOp>(inputs, false))
.Case("nand2", b.create<comb::NandOp>(inputs, false))
.Case("nor2", b.create<comb::NorOp>(inputs, false))
.Case("or2", b.create<comb::OrOp>(inputs, false))
// standard cell names look like $_CELL_
auto op = llvm::StringSwitch<mlir::Operation *>(
cell->type.substr(2, cell->type.size() - 3))
.Case("NOT", b.create<comb::InvOp>(inputs[0], false))
.Case("XNOR", b.create<comb::XNorOp>(inputs, false))
.Case("AND", b.create<comb::AndOp>(inputs, false))
.Case("XOR", b.create<comb::XorOp>(inputs, false))
.Case("NAND", b.create<comb::NandOp>(inputs, false))
.Case("NOR", b.create<comb::NorOp>(inputs, false))
.Case("OR", b.create<comb::OrOp>(inputs, false))
.Default(nullptr);
if (op == nullptr) {
llvm_unreachable("unexpected cell type");
Expand Down
3 changes: 1 addition & 2 deletions lib/Transforms/YosysOptimizer/YosysOptimizer.cpp
View file
Open in desktop
Expand Up @@ -87,13 +87,12 @@ stat;
// $2: abc path
// $3: yosys runfiles path
// $4: abc fast option -fast
// TODO(#554): Re-enable -fast mode.
constexpr std::string_view kYosysBooleanTemplate = R"(
read_verilog {0};
hierarchy -check -top \{1};
proc; memory; stat;
techmap -map {3}/techmap.v; opt; stat;
abc -exe {2} -liberty {3}/tfhe-rs_cells.liberty; stat;
abc -exe {2} -g AND,NAND,OR,NOR,XOR,XNOR {4};
opt_clean -purge; stat;
rename -hide */c:*; rename -enumerate */c:*;
hierarchy -generate * o:Y i:*; opt; opt_clean -purge;
Expand Down
1 change: 0 additions & 1 deletion lib/Transforms/YosysOptimizer/yosys/BUILD
View file
Open in desktop
Expand Up @@ -9,6 +9,5 @@ filegroup(
name = "share_files",
srcs = glob([
"*.v",
"*.liberty",
]),
)
260 changes: 0 additions & 260 deletions lib/Transforms/YosysOptimizer/yosys/tfhe-rs_cells.liberty
View file
Open in desktop

This file was deleted.

15 changes: 13 additions & 2 deletions tests/yosys_optimizer/add_one.mlir
View file
Open in desktop
@@ -1,5 +1,7 @@
// RUN: heir-opt --yosys-optimizer --canonicalize --cse %s | FileCheck %s
// RUN: heir-opt --yosys-optimizer --canonicalize --cse %s | FileCheck %s --check-prefix=CHECK --check-prefix=LUT
// RUN: heir-opt --yosys-optimizer="abc-fast=True" --canonicalize --cse %s | FileCheck %s --check-prefix=CHECK --check-prefix=LUT-FAST
// RUN: heir-opt --yosys-optimizer="mode=Boolean" --canonicalize --cse %s | FileCheck --check-prefix=CHECK --check-prefix=BOOL %s
// RUN: heir-opt --yosys-optimizer="mode=Boolean abc-fast=True" --canonicalize --cse %s | FileCheck --check-prefix=CHECK --check-prefix=BOOL-FAST %s

module {
// CHECK-LABEL: @add_one
Expand All @@ -14,7 +16,16 @@ module {
ins(%in, %one: !secret.secret<i8>, i8) {
^bb0(%IN: i8, %ONE: i8) :
// CHECK-NOT: arith.addi
// BOOL-COUNT-7: comb.inv

// LUT-COUNT-11: comb.truth_table
// LUT-FAST-COUNT-13: comb.truth_table
// BOOL-COUNT-14: comb
// BOOL-FAST-COUNT-16: comb

// LUT-NOT: comb.truth_table
// LUT-FAST-NOT: comb.truth_table
// BOOL-NOT: comb
// BOOL-FAST-NOT: comb
%2 = arith.addi %IN, %ONE : i8
secret.yield %2 : i8
} -> (!secret.secret<i8>)
Expand Down