yosys2digitaljs 0.5.0 → 0.6.0

package/ChangeLog.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.6.0] -- 2022-02-02
+
+### Added
+
+- Support for Yosys 0.11 cells `$aldff`, `$aldffe`
+- Added a function `yosys2digitaljs` for converting a Yosys JSON output obtained elsewhere, without running Yosys locally
+
 ## [0.5.0] -- 2021-10-06
 
 ### Added

package/README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/tilk/yosys2digitaljs.svg?branch=master)](https://travis-ci.org/tilk/yosys2digitaljs)
 # yosys2digitaljs
 This program converts JSON netlist output generated by [Yosys](http://www.clifford.at/yosys/)
 circuit synthesis software for use with the
@@ -25,9 +24,10 @@ The generated JSON is printed on standard output.
 # API
 Yosys2digitaljs can be used as a library. The API is promise (or async/await) based. Available functions are:
 
- - `process_sv(sv_text)` - converts a single SystemVerilog source passed as a string.
- - `process_files(texts)` - converts multiple Verilog/SystemVerilog sources. The `texts` parameter is an object, with keys being file names, and corresponding values containing the file contents as strings. Example: `{ 'test.sv': 'module test; ...' }`.
- - `process(filenames, dirname)` - converts Verilog/SystemVerilog sources saved on the filesystem under names `filenames` in the directory `dirname`.
+ - `yosys2digitaljs(json, options)` - converts the Yosys JSON output `json` (passed as an JS object) to a DigitalJS representation of the same circuit.
+ - `process_sv(sv_text, options)` - converts a single SystemVerilog source passed as a string.
+ - `process_files(texts, options)` - converts multiple Verilog/SystemVerilog sources. The `texts` parameter is an object, with keys being file names, and corresponding values containing the file contents as strings. Example: `{ 'test.sv': 'module test; ...' }`.
+ - `process(filenames, dirname, options)` - converts Verilog/SystemVerilog sources saved on the filesystem under names `filenames` in the directory `dirname`.
 
 The functions return a promise, which fulfills with an object value with following keys:
 

package/dist/index.d.ts

@@ -53,8 +53,86 @@ declare namespace Digitaljs {
         };
     };
 }
-declare type Options = {
+declare namespace Yosys {
+    type BitChar = '0' | '1' | 'x';
+    type Bit = number | '0' | '1' | 'x';
+    type BitVector = Bit[];
+    type Port = {
+        direction: 'input' | 'output' | 'inout';
+        bits: any;
+    };
+    type Parameters = {
+        WIDTH?: JsonConstant;
+        A_WIDTH?: JsonConstant;
+        B_WIDTH?: JsonConstant;
+        S_WIDTH?: JsonConstant;
+        Y_WIDTH?: JsonConstant;
+        A_SIGNED?: JsonConstant;
+        B_SIGNED?: JsonConstant;
+        CLK_POLARITY?: JsonConstant;
+        EN_POLARITY?: JsonConstant;
+        ARST_POLARITY?: JsonConstant;
+        ARST_VALUE: JsonConstant;
+        CTRL_IN_WIDTH?: JsonConstant;
+        CTRL_OUT_WIDTH?: JsonConstant;
+        TRANS_NUM?: JsonConstant;
+        STATE_NUM?: JsonConstant;
+        STATE_NUM_LOG2?: JsonConstant;
+        STATE_RST?: JsonConstant;
+        RD_PORTS?: JsonConstant;
+        WR_PORTS?: JsonConstant;
+        RD_CLK_POLARITY?: JsonConstant;
+        RD_CLK_ENABLE?: JsonConstant;
+        RD_CLK_TRANSPARENT?: JsonConstant;
+        WR_CLK_POLARITY?: JsonConstant;
+        WR_CLK_ENABLE?: JsonConstant;
+        [key: string]: any;
+    };
+    type JsonConstant = number | string;
+    type Attributes = {
+        init: JsonConstant;
+        [key: string]: any;
+    };
+    type Cell = {
+        hide_name: 0 | 1;
+        type: string;
+        parameters: Parameters;
+        attributes: Attributes;
+        port_directions: {
+            [key: string]: 'input' | 'output';
+        };
+        connections: {
+            [key: string]: BitVector;
+        };
+    };
+    type Net = {
+        hide_name: 0 | 1;
+        bits: BitVector;
+        attributes: {
+            [key: string]: string;
+        };
+    };
+    type Module = {
+        ports: {
+            [key: string]: Port;
+        };
+        cells: {
+            [key: string]: Cell;
+        };
+        netnames: {
+            [key: string]: Net;
+        };
+    };
+    type Output = {
+        modules: {
+            [key: string]: Module;
+        };
+    };
+}
+declare type ConvertOptions = {
     propagation?: number;
+};
+declare type Options = ConvertOptions & {
     optimize?: boolean;
     fsmexpand?: boolean;
     fsm?: boolean | "nomap";
@@ -76,10 +154,11 @@ declare type LintMessage = {
     message: string;
 };
 export declare function verilator_lint(filenames: string[], dirname?: string, options?: Options): Promise<LintMessage[]>;
+export declare function yosys2digitaljs(obj: Yosys.Output, options?: ConvertOptions): Digitaljs.TopModule;
 export declare function process(filenames: string[], dirname?: string, options?: Options): Promise<Output>;
 export declare function io_ui(output: Digitaljs.Module): void;
 export declare function process_files(data: {
     [key: string]: string;
-}, options: Options): Promise<Output>;
-export declare function process_sv(text: string): Promise<Output>;
+}, options?: Options): Promise<Output>;
+export declare function process_sv(text: string, options?: Options): Promise<Output>;
 export {};

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.process_sv = exports.process_files = exports.io_ui = exports.process = exports.verilator_lint = void 0;
+exports.process_sv = exports.process_files = exports.io_ui = exports.process = exports.yosys2digitaljs = exports.verilator_lint = void 0;
 const tmp = require("tmp-promise");
 const child_process = require("child_process");
 const assert = require("assert");
@@ -95,7 +95,9 @@ const gate_subst = new Map([
     ['$adlatch', 'Dff'],
     ['$sr', 'Dff'],
     ['$dffsr', 'Dff'],
-    ['$dffsre', 'Dff']
+    ['$dffsre', 'Dff'],
+    ['$aldff', 'Dff'],
+    ['$aldffe', 'Dff']
 ]);
 const gate_negations = new Map([
     ['And', 'Nand'],
@@ -149,6 +151,8 @@ function order_ports(data) {
         '$adlatch': { EN: 'en', ARST: 'arst', D: 'in', Q: 'out' },
         '$dffsr': { CLK: 'clk', SET: 'set', CLR: 'clr', D: 'in', Q: 'out' },
         '$dffsre': { CLK: 'clk', EN: 'en', SET: 'set', CLR: 'clr', D: 'in', Q: 'out' },
+        '$aldff': { CLK: 'clk', ALOAD: 'aload', AD: 'ain', D: 'in', Q: 'out' },
+        '$aldffe': { CLK: 'clk', EN: 'en', ALOAD: 'aload', AD: 'ain', D: 'in', Q: 'out' },
         '$sr': { SET: 'set', CLR: 'clr', Q: 'out' },
         '$fsm': { ARST: 'arst', CLK: 'clk', CTRL_IN: 'in', CTRL_OUT: 'out' }
     };
@@ -436,7 +440,7 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
             assert(cell.port_directions.B == 'input');
             assert(cell.port_directions.Y == 'output');
         }
-        if (['$dff', '$dffe', '$adff', '$adffe', '$sdff', '$sdffe', '$sdffce', '$dlatch', '$adlatch', '$dffsr', '$dffsre'].includes(cell.type)) {
+        if (['$dff', '$dffe', '$adff', '$adffe', '$sdff', '$sdffe', '$sdffce', '$dlatch', '$adlatch', '$dffsr', '$dffsre', '$aldff', '$aldffe'].includes(cell.type)) {
             assert(cell.connections.D.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.connections.Q.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.port_directions.D == 'input');
@@ -446,6 +450,18 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 assert(cell.port_directions.CLK == 'input');
             }
         }
+        if (['$dffe', '$adffe', '$sdffe', '$sdffce', '$dffsre', '$aldffe', '$dlatch', '$adlatch'].includes(cell.type)) {
+            assert(cell.connections.EN.length == 1);
+            assert(cell.port_directions.EN == 'input');
+        }
+        if (['$adff', '$adffe', '$adlatch'].includes(cell.type)) {
+            assert(cell.connections.ARST.length == 1);
+            assert(cell.port_directions.ARST == 'input');
+        }
+        if (['$sdff', '$sdffe', '$sdffce'].includes(cell.type)) {
+            assert(cell.connections.SRST.length == 1);
+            assert(cell.port_directions.SRST == 'input');
+        }
         if (['$dffsr', '$dffsre'].includes(cell.type)) {
             assert(cell.connections.SET.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.connections.CLR.length == decode_json_number(cell.parameters.WIDTH));
@@ -592,17 +608,28 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 };
                 break;
             case '$dffe':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY))
                 };
                 break;
+            case '$aldff':
+                dev.bits = decode_json_number(cell.parameters.WIDTH);
+                dev.polarity = {
+                    clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
+                    aload: Boolean(decode_json_number(cell.parameters.ALOAD_POLARITY))
+                };
+                break;
+            case '$aldffe':
+                dev.bits = decode_json_number(cell.parameters.WIDTH);
+                dev.polarity = {
+                    clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
+                    enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY)),
+                    aload: Boolean(decode_json_number(cell.parameters.ALOAD_POLARITY))
+                };
+                break;
             case '$adff':
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -611,8 +638,6 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 dev.arst_value = decode_json_constant(cell.parameters.ARST_VALUE, dev.bits);
                 break;
             case '$sdff':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -621,10 +646,6 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$adffe':
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -634,10 +655,6 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 dev.arst_value = decode_json_constant(cell.parameters.ARST_VALUE, dev.bits);
                 break;
             case '$sdffe':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -647,10 +664,6 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$sdffce':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -661,18 +674,12 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$dlatch':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY))
                 };
                 break;
             case '$adlatch':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY)),
@@ -689,8 +696,6 @@ function yosys_to_digitaljs_mod(name, mod, portmaps, options = {}) {
                 };
                 break;
             case '$dffsre':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -1020,6 +1025,18 @@ async function verilator_lint(filenames, dirname, options = {}) {
     }
 }
 exports.verilator_lint = verilator_lint;
+function yosys2digitaljs(obj, options = {}) {
+    const portmaps = order_ports(obj);
+    const out = yosys_to_digitaljs(obj, portmaps, options);
+    const toporder = topsort(module_deps(obj));
+    toporder.pop();
+    const toplevel = toporder.pop();
+    const output = Object.assign({ subcircuits: {} }, out[toplevel]);
+    for (const x of toporder)
+        output.subcircuits[x] = out[x];
+    return output;
+}
+exports.yosys2digitaljs = yosys2digitaljs;
 async function process(filenames, dirname, options = {}) {
     const optimize_simp = options.optimize ? "; opt" : "; opt_clean";
     const optimize = options.optimize ? "; opt -full" : "; opt_clean";
@@ -1044,14 +1061,7 @@ async function process(filenames, dirname, options = {}) {
         }
         obj = JSON.parse(fs.readFileSync(tmpjson, 'utf8'));
         await (0, util_1.promisify)(fs.unlink)(tmpjson);
-        const portmaps = order_ports(obj);
-        const out = yosys_to_digitaljs(obj, portmaps, options);
-        const toporder = topsort(module_deps(obj));
-        toporder.pop();
-        const toplevel = toporder.pop();
-        const output = Object.assign({ subcircuits: {} }, out[toplevel]);
-        for (const x of toporder)
-            output.subcircuits[x] = out[x];
+        const output = yosys2digitaljs(obj, options);
         const ret = {
             output: output,
             yosys_output: obj,
@@ -1088,7 +1098,7 @@ function io_ui(output) {
     }
 }
 exports.io_ui = io_ui;
-async function process_files(data, options) {
+async function process_files(data, options = {}) {
     const dir = await tmp.dir();
     const names = [];
     try {
@@ -1108,12 +1118,12 @@ async function process_files(data, options) {
     }
 }
 exports.process_files = process_files;
-async function process_sv(text) {
+async function process_sv(text, options = {}) {
     const tmpsv = await tmp.file({ postfix: '.sv' });
     try {
         await (0, util_1.promisify)(fs.write)(tmpsv.fd, text);
         await (0, util_1.promisify)(fs.close)(tmpsv.fd);
-        return await process([tmpsv.path]);
+        return await process([tmpsv.path], undefined, options);
     }
     finally {
         tmpsv.cleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yosys2digitaljs",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Export Yosys netlists to a logic simulator",
   "main": "dist/index",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -94,7 +94,9 @@ const gate_subst = new Map([
     ['$adlatch', 'Dff'],
     ['$sr', 'Dff'],
     ['$dffsr', 'Dff'],
-    ['$dffsre', 'Dff']]);
+    ['$dffsre', 'Dff'],
+    ['$aldff', 'Dff'],
+    ['$aldffe', 'Dff']]);
 const gate_negations = new Map([
     ['And', 'Nand'],
     ['Nand', 'And'],
@@ -245,8 +247,11 @@ namespace Yosys {
 
 };
 
-type Options = {
+type ConvertOptions = {
     propagation?: number,
+};
+
+type Options = ConvertOptions & {
     optimize?: boolean,
     fsmexpand?: boolean,
     fsm?: boolean | "nomap",
@@ -330,6 +335,8 @@ function order_ports(data: Yosys.Output): Portmaps {
         '$adlatch': {EN: 'en', ARST: 'arst', D: 'in', Q: 'out'},
         '$dffsr': {CLK: 'clk', SET: 'set', CLR: 'clr', D: 'in', Q: 'out'},
         '$dffsre': {CLK: 'clk', EN: 'en', SET: 'set', CLR: 'clr', D: 'in', Q: 'out'},
+        '$aldff': {CLK: 'clk', ALOAD: 'aload', AD: 'ain', D: 'in', Q: 'out'},
+        '$aldffe': {CLK: 'clk', EN: 'en', ALOAD: 'aload', AD: 'ain', D: 'in', Q: 'out'},
         '$sr': {SET: 'set', CLR: 'clr', Q: 'out'},
         '$fsm': {ARST: 'arst', CLK: 'clk', CTRL_IN: 'in', CTRL_OUT: 'out'}
     };
@@ -386,7 +393,7 @@ function parse_source_positions(str: string): Digitaljs.SourcePosition[] {
     return ret;
 }
 
-function yosys_to_digitaljs(data: Yosys.Output, portmaps: Portmaps, options: Options = {}): {[key: string]: Digitaljs.Module} {
+function yosys_to_digitaljs(data: Yosys.Output, portmaps: Portmaps, options: ConvertOptions = {}): {[key: string]: Digitaljs.Module} {
     const out = {};
     for (const [name, mod] of Object.entries(data.modules)) {
         out[name] = yosys_to_digitaljs_mod(name, mod, portmaps, options);
@@ -394,7 +401,7 @@ function yosys_to_digitaljs(data: Yosys.Output, portmaps: Portmaps, options: Opt
     return out
 }
 
-function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portmaps, options: Options = {}): Digitaljs.Module {
+function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portmaps, options: ConvertOptions = {}): Digitaljs.Module {
     function constbit(bit: Bit) {
         return bit == '0' || bit == '1' || bit == 'x';
     }
@@ -624,7 +631,7 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 assert(cell.port_directions.B == 'input');
                 assert(cell.port_directions.Y == 'output');
         }
-        if (['$dff', '$dffe', '$adff', '$adffe', '$sdff', '$sdffe', '$sdffce', '$dlatch', '$adlatch', '$dffsr', '$dffsre'].includes(cell.type)) {
+        if (['$dff', '$dffe', '$adff', '$adffe', '$sdff', '$sdffe', '$sdffce', '$dlatch', '$adlatch', '$dffsr', '$dffsre', '$aldff', '$aldffe'].includes(cell.type)) {
             assert(cell.connections.D.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.connections.Q.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.port_directions.D == 'input');
@@ -634,6 +641,18 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 assert(cell.port_directions.CLK == 'input');
             }
         }
+        if (['$dffe', '$adffe', '$sdffe', '$sdffce', '$dffsre', '$aldffe', '$dlatch', '$adlatch'].includes(cell.type)) {
+            assert(cell.connections.EN.length == 1);
+            assert(cell.port_directions.EN == 'input');
+        }
+        if (['$adff', '$adffe', '$adlatch'].includes(cell.type)) {
+            assert(cell.connections.ARST.length == 1);
+            assert(cell.port_directions.ARST == 'input');
+        }
+        if (['$sdff', '$sdffe', '$sdffce'].includes(cell.type)) {
+            assert(cell.connections.SRST.length == 1);
+            assert(cell.port_directions.SRST == 'input');
+        }
         if (['$dffsr', '$dffsre'].includes(cell.type)) {
             assert(cell.connections.SET.length == decode_json_number(cell.parameters.WIDTH));
             assert(cell.connections.CLR.length == decode_json_number(cell.parameters.WIDTH));
@@ -756,17 +775,28 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 };
                 break;
             case '$dffe':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY))
                 };
                 break;
+            case '$aldff':
+                dev.bits = decode_json_number(cell.parameters.WIDTH);
+                dev.polarity = {
+                    clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
+                    aload: Boolean(decode_json_number(cell.parameters.ALOAD_POLARITY))
+                };
+                break;
+            case '$aldffe':
+                dev.bits = decode_json_number(cell.parameters.WIDTH);
+                dev.polarity = {
+                    clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
+                    enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY)),
+                    aload: Boolean(decode_json_number(cell.parameters.ALOAD_POLARITY))
+                };
+                break;
             case '$adff':
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -775,8 +805,6 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 dev.arst_value = decode_json_constant(cell.parameters.ARST_VALUE, dev.bits);
                 break;
             case '$sdff':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -785,10 +813,6 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$adffe':
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -798,10 +822,6 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 dev.arst_value = decode_json_constant(cell.parameters.ARST_VALUE, dev.bits);
                 break;
             case '$sdffe':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -811,10 +831,6 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$sdffce':
-                assert(cell.connections.SRST.length == 1);
-                assert(cell.port_directions.SRST == 'input');
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -825,18 +841,12 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 dev.srst_value = decode_json_constant(cell.parameters.SRST_VALUE, dev.bits);
                 break;
             case '$dlatch':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY))
                 };
                 break;
             case '$adlatch':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
-                assert(cell.connections.ARST.length == 1);
-                assert(cell.port_directions.ARST == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     enable: Boolean(decode_json_number(cell.parameters.EN_POLARITY)),
@@ -853,8 +863,6 @@ function yosys_to_digitaljs_mod(name: string, mod: Yosys.Module, portmaps: Portm
                 };
                 break;
             case '$dffsre':
-                assert(cell.connections.EN.length == 1);
-                assert(cell.port_directions.EN == 'input');
                 dev.bits = decode_json_number(cell.parameters.WIDTH);
                 dev.polarity = {
                     clock: Boolean(decode_json_number(cell.parameters.CLK_POLARITY)),
@@ -1172,6 +1180,18 @@ export async function verilator_lint(filenames: string[], dirname?: string, opti
     }
 }
 
+export function yosys2digitaljs(obj: Yosys.Output, options: ConvertOptions = {}): Digitaljs.TopModule {
+    const portmaps = order_ports(obj);
+    const out = yosys_to_digitaljs(obj, portmaps, options);
+    const toporder = topsort(module_deps(obj));
+    toporder.pop();
+    const toplevel = toporder.pop();
+    const output: Digitaljs.TopModule = { subcircuits: {}, ... out[toplevel] };
+    for (const x of toporder)
+        output.subcircuits[x] = out[x];
+    return output;
+}
+
 export async function process(filenames: string[], dirname?: string, options: Options = {}): Promise<Output> {
     const optimize_simp = options.optimize ? "; opt" : "; opt_clean";
     const optimize = options.optimize ? "; opt -full" : "; opt_clean";
@@ -1198,13 +1218,7 @@ export async function process(filenames: string[], dirname?: string, options: Op
         }
         obj = JSON.parse(fs.readFileSync(tmpjson, 'utf8'));
         await promisify(fs.unlink)(tmpjson);
-        const portmaps = order_ports(obj);
-        const out = yosys_to_digitaljs(obj, portmaps, options);
-        const toporder = topsort(module_deps(obj));
-        toporder.pop();
-        const toplevel = toporder.pop();
-        const output: Digitaljs.TopModule = { subcircuits: {}, ... out[toplevel] };
-        for (const x of toporder) output.subcircuits[x] = out[x];
+        const output = yosys2digitaljs(obj, options);
         const ret: Output = {
             output: output,
             yosys_output: obj,
@@ -1239,7 +1253,7 @@ export function io_ui(output: Digitaljs.Module) {
     }
 }
 
-export async function process_files(data: {[key: string]: string}, options: Options): Promise<Output> {
+export async function process_files(data: {[key: string]: string}, options: Options = {}): Promise<Output> {
     const dir = await tmp.dir();
     const names = [];
     try {
@@ -1257,12 +1271,12 @@ export async function process_files(data: {[key: string]: string}, options: Opti
     }
 }
 
-export async function process_sv(text: string): Promise<Output> {
+export async function process_sv(text: string, options: Options = {}): Promise<Output> {
     const tmpsv = await tmp.file({ postfix: '.sv' });
     try {
         await promisify(fs.write)(tmpsv.fd, text);
         await promisify(fs.close)(tmpsv.fd);
-        return await process([tmpsv.path]);
+        return await process([tmpsv.path], undefined, options);
     } finally {
         tmpsv.cleanup();
     }

package/.travis.yml

@@ -1,8 +0,0 @@
-before_install:
-  - sudo add-apt-repository ppa:saltmakrell/ppa -y
-  - sudo apt-get update
-  - sudo apt-get install -y yosys
-
-language: node_js
-node_js:
-    - "8"