edacation 0.3.6 → 0.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/util.d.ts +0 -1
- package/dist/project/configuration.d.ts +153 -138
- package/dist/project/devices.js +31 -10
- package/dist/project/devices.js.map +1 -1
- package/dist/project/nextpnr.d.ts +4 -1
- package/dist/project/nextpnr.js +14 -6
- package/dist/project/nextpnr.js.map +1 -1
- package/dist/project/project.d.ts +49 -21
- package/dist/project/project.js +85 -10
- package/dist/project/project.js.map +1 -1
- package/dist/project/target.d.ts +1 -0
- package/dist/project/target.js +12 -5
- package/dist/project/target.js.map +1 -1
- package/dist/project/yosys.d.ts +4 -1
- package/dist/project/yosys.js +24 -12
- package/dist/project/yosys.js.map +1 -1
- package/dist/util.d.ts +0 -5
- package/package.json +9 -9
package/dist/project/yosys.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.generateYosysSynthCommands = exports.generateYosysSynthPrepareCommands = exports.generateYosysRTLCommands = exports.getYosysWorkerOptions = exports.generateYosysWorkerOptions = void 0;
|
|
6
|
+
exports.generateYosysSynthCommands = exports.generateYosysSynthPrepareCommands = exports.generateYosysRTLCommands = exports.getYosysWorkerOptions = exports.generateYosysWorkerOptions = exports.getYosysOptions = exports.getYosysDefaultOptions = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const util_js_1 = require("../util.js");
|
|
9
9
|
const devices_js_1 = require("./devices.js");
|
|
@@ -11,9 +11,24 @@ const target_js_1 = require("./target.js");
|
|
|
11
11
|
const DEFAULT_OPTIONS = {
|
|
12
12
|
optimize: true
|
|
13
13
|
};
|
|
14
|
+
const getSynthCommands = (arch, outFile) => {
|
|
15
|
+
const commands = [];
|
|
16
|
+
if (arch === 'generic') {
|
|
17
|
+
commands.push('synth;');
|
|
18
|
+
commands.push(`write_json ${outFile};`);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
commands.push(`synth_${arch} -json ${outFile};`);
|
|
22
|
+
}
|
|
23
|
+
return commands;
|
|
24
|
+
};
|
|
25
|
+
const getYosysDefaultOptions = (configuration) => (0, target_js_1.getDefaultOptions)(configuration, 'yosys', DEFAULT_OPTIONS);
|
|
26
|
+
exports.getYosysDefaultOptions = getYosysDefaultOptions;
|
|
27
|
+
const getYosysOptions = (configuration, targetId) => (0, target_js_1.getOptions)(configuration, targetId, 'yosys', DEFAULT_OPTIONS);
|
|
28
|
+
exports.getYosysOptions = getYosysOptions;
|
|
14
29
|
const generateYosysWorkerOptions = (configuration, projectInputFiles, targetId) => {
|
|
15
30
|
const target = (0, target_js_1.getTarget)(configuration, targetId);
|
|
16
|
-
const options = (0,
|
|
31
|
+
const options = (0, exports.getYosysOptions)(configuration, targetId);
|
|
17
32
|
const vendor = devices_js_1.VENDORS[target.vendor];
|
|
18
33
|
const family = vendor.families[target.family];
|
|
19
34
|
const inputFiles = projectInputFiles.filter((inputFile) => util_js_1.FILE_EXTENSIONS_HDL.includes(path_1.default.extname(inputFile).substring(1)));
|
|
@@ -26,19 +41,14 @@ const generateYosysWorkerOptions = (configuration, projectInputFiles, targetId)
|
|
|
26
41
|
if (options.optimize) {
|
|
27
42
|
commands.push('opt;');
|
|
28
43
|
}
|
|
29
|
-
|
|
30
|
-
commands.push('synth;');
|
|
31
|
-
commands.push(`write_json ${outputFiles[0]};`);
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
commands.push(`synth_${family.architecture} -json ${outputFiles[0]};`);
|
|
35
|
-
}
|
|
44
|
+
commands.push(...getSynthCommands(family.architecture, outputFiles[0]));
|
|
36
45
|
return {
|
|
37
46
|
inputFiles,
|
|
38
47
|
outputFiles,
|
|
39
48
|
tool,
|
|
40
49
|
target,
|
|
41
|
-
commands
|
|
50
|
+
commands,
|
|
51
|
+
options
|
|
42
52
|
};
|
|
43
53
|
};
|
|
44
54
|
exports.generateYosysWorkerOptions = generateYosysWorkerOptions;
|
|
@@ -49,12 +59,14 @@ const getYosysWorkerOptions = (project, targetId) => {
|
|
|
49
59
|
const tool = generated.tool;
|
|
50
60
|
const target = generated.target;
|
|
51
61
|
const commands = (0, target_js_1.getCombined)(project.getConfiguration(), targetId, 'yosys', 'commands', generated.commands);
|
|
62
|
+
const options = generated.options;
|
|
52
63
|
return {
|
|
53
64
|
inputFiles,
|
|
54
65
|
outputFiles,
|
|
55
66
|
tool,
|
|
56
67
|
target,
|
|
57
|
-
commands
|
|
68
|
+
commands,
|
|
69
|
+
options
|
|
58
70
|
};
|
|
59
71
|
};
|
|
60
72
|
exports.getYosysWorkerOptions = getYosysWorkerOptions;
|
|
@@ -92,7 +104,7 @@ const generateYosysSynthCommands = (workerOptions) => {
|
|
|
92
104
|
const family = vendor.families[target.family];
|
|
93
105
|
return [
|
|
94
106
|
`read_json ${(0, target_js_1.getTargetFile)(workerOptions.target, 'presynth.yosys.json')}`,
|
|
95
|
-
|
|
107
|
+
...getSynthCommands(family.architecture, workerOptions.outputFiles[0]),
|
|
96
108
|
'',
|
|
97
109
|
'design -reset',
|
|
98
110
|
'',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yosys.js","sourceRoot":"","sources":["../../src/project/yosys.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,wCAAwE;AAGxE,
|
|
1
|
+
{"version":3,"file":"yosys.js","sourceRoot":"","sources":["../../src/project/yosys.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
CHANGED
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
|
-
/// <reference types="node" />
|
|
5
|
-
/// <reference types="node" />
|
|
6
1
|
export type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
|
|
7
2
|
export declare const encodeText: (input: string) => Uint8Array;
|
|
8
3
|
export declare const encodeJSON: (input: unknown, pretty?: boolean) => Uint8Array;
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "edacation",
|
|
3
3
|
"description": "Library and CLI for interacting with Yosys and nextpnr.",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "0.3.
|
|
5
|
+
"version": "0.3.8",
|
|
6
6
|
"contributors": [
|
|
7
7
|
"Danielle Huisman <danielle@huisman.me> (https://github.com/DanielleHuisman)",
|
|
8
8
|
"Mike Almeloo <git@mikealmel.ooo> (https://github.com/DismissedGuy)"
|
|
@@ -32,21 +32,21 @@
|
|
|
32
32
|
"dev": "node --loader ts-node/esm src/cli/index.ts"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@types/node": "^20.11.0",
|
|
36
|
-
"@types/yargs": "^17.0.32",
|
|
37
35
|
"string-args-parser": "^1.0.4",
|
|
38
36
|
"yargs": "^17.7.2",
|
|
39
|
-
"zod": "^3.
|
|
37
|
+
"zod": "^3.23.8"
|
|
40
38
|
},
|
|
41
39
|
"devDependencies": {
|
|
42
40
|
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
|
|
43
|
-
"@
|
|
44
|
-
"@
|
|
45
|
-
"eslint": "^8.
|
|
41
|
+
"@types/node": "^20.14.8",
|
|
42
|
+
"@types/yargs": "^17.0.32",
|
|
43
|
+
"@typescript-eslint/eslint-plugin": "^8.4.0",
|
|
44
|
+
"@typescript-eslint/parser": "^8.4.0",
|
|
45
|
+
"eslint": "^8.57.0",
|
|
46
46
|
"eslint-config-google": "^0.14.0",
|
|
47
47
|
"eslint-plugin-import": "^2.29.1",
|
|
48
|
-
"prettier": "^3.2
|
|
48
|
+
"prettier": "^3.3.2",
|
|
49
49
|
"ts-node": "^10.9.2",
|
|
50
|
-
"typescript": "^5.
|
|
50
|
+
"typescript": "^5.4.5"
|
|
51
51
|
}
|
|
52
52
|
}
|