edacation 0.6.2 → 0.6.4
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/project/configuration.d.ts +10 -0
- package/dist/project/configuration.js +4 -2
- package/dist/project/configuration.js.map +1 -1
- package/dist/project/flasher.js +5 -1
- package/dist/project/flasher.js.map +1 -1
- package/dist/project/nextpnr.js +4 -1
- package/dist/project/nextpnr.js.map +1 -1
- package/dist/project/project.d.ts +4 -0
- package/dist/project/yosys.js +21 -19
- package/dist/project/yosys.js.map +1 -1
- package/package.json +1 -1
|
@@ -36,6 +36,7 @@ declare const schemaWorkerTarget: z.ZodObject<{
|
|
|
36
36
|
declare const schemaYosysOptions: z.ZodObject<{
|
|
37
37
|
optimize: z.ZodOptional<z.ZodBoolean>;
|
|
38
38
|
topLevelModule: z.ZodOptional<z.ZodString>;
|
|
39
|
+
synthArguments: z.ZodOptional<z.ZodString>;
|
|
39
40
|
}, z.core.$strip>;
|
|
40
41
|
declare const schemaYosys: z.ZodObject<{
|
|
41
42
|
synthPrepareCommands: z.ZodOptional<z.ZodObject<{
|
|
@@ -53,6 +54,7 @@ declare const schemaYosys: z.ZodObject<{
|
|
|
53
54
|
options: z.ZodOptional<z.ZodObject<{
|
|
54
55
|
optimize: z.ZodOptional<z.ZodBoolean>;
|
|
55
56
|
topLevelModule: z.ZodOptional<z.ZodString>;
|
|
57
|
+
synthArguments: z.ZodOptional<z.ZodString>;
|
|
56
58
|
}, z.core.$strip>>;
|
|
57
59
|
}, z.core.$strip>;
|
|
58
60
|
declare const schemaYosysTarget: z.ZodObject<{
|
|
@@ -74,6 +76,7 @@ declare const schemaYosysTarget: z.ZodObject<{
|
|
|
74
76
|
options: z.ZodOptional<z.ZodObject<{
|
|
75
77
|
optimize: z.ZodOptional<z.ZodBoolean>;
|
|
76
78
|
topLevelModule: z.ZodOptional<z.ZodString>;
|
|
79
|
+
synthArguments: z.ZodOptional<z.ZodString>;
|
|
77
80
|
}, z.core.$strip>>;
|
|
78
81
|
}, z.core.$strip>;
|
|
79
82
|
declare const schemaNextpnrOptions: z.ZodObject<{
|
|
@@ -112,6 +115,7 @@ declare const schemaNextpnrTarget: z.ZodObject<{
|
|
|
112
115
|
}, z.core.$strip>;
|
|
113
116
|
declare const schemaFlasherOptions: z.ZodObject<{
|
|
114
117
|
board: z.ZodOptional<z.ZodString>;
|
|
118
|
+
programToFlash: z.ZodOptional<z.ZodBoolean>;
|
|
115
119
|
}, z.core.$strip>;
|
|
116
120
|
declare const schemaFlasher: z.ZodObject<{
|
|
117
121
|
packerArguments: z.ZodOptional<z.ZodObject<{
|
|
@@ -124,6 +128,7 @@ declare const schemaFlasher: z.ZodObject<{
|
|
|
124
128
|
}, z.core.$strip>>;
|
|
125
129
|
options: z.ZodOptional<z.ZodObject<{
|
|
126
130
|
board: z.ZodOptional<z.ZodString>;
|
|
131
|
+
programToFlash: z.ZodOptional<z.ZodBoolean>;
|
|
127
132
|
}, z.core.$strip>>;
|
|
128
133
|
}, z.core.$strip>;
|
|
129
134
|
declare const schemaFlasherTarget: z.ZodObject<{
|
|
@@ -139,6 +144,7 @@ declare const schemaFlasherTarget: z.ZodObject<{
|
|
|
139
144
|
}, z.core.$strip>>;
|
|
140
145
|
options: z.ZodOptional<z.ZodObject<{
|
|
141
146
|
board: z.ZodOptional<z.ZodString>;
|
|
147
|
+
programToFlash: z.ZodOptional<z.ZodBoolean>;
|
|
142
148
|
}, z.core.$strip>>;
|
|
143
149
|
}, z.core.$strip>;
|
|
144
150
|
declare const schemaIVerilogOptions: z.ZodObject<{
|
|
@@ -189,6 +195,7 @@ export declare const schemaProjectConfiguration: z.ZodObject<{
|
|
|
189
195
|
options: z.ZodOptional<z.ZodObject<{
|
|
190
196
|
optimize: z.ZodOptional<z.ZodBoolean>;
|
|
191
197
|
topLevelModule: z.ZodOptional<z.ZodString>;
|
|
198
|
+
synthArguments: z.ZodOptional<z.ZodString>;
|
|
192
199
|
}, z.core.$strip>>;
|
|
193
200
|
}, z.core.$strip>>;
|
|
194
201
|
nextpnr: z.ZodOptional<z.ZodObject<{
|
|
@@ -248,6 +255,7 @@ export declare const schemaProjectConfiguration: z.ZodObject<{
|
|
|
248
255
|
}, z.core.$strip>>;
|
|
249
256
|
options: z.ZodOptional<z.ZodObject<{
|
|
250
257
|
board: z.ZodOptional<z.ZodString>;
|
|
258
|
+
programToFlash: z.ZodOptional<z.ZodBoolean>;
|
|
251
259
|
}, z.core.$strip>>;
|
|
252
260
|
}, z.core.$strip>>;
|
|
253
261
|
}, z.core.$strip>>;
|
|
@@ -288,6 +296,7 @@ export declare const schemaProjectConfiguration: z.ZodObject<{
|
|
|
288
296
|
options: z.ZodOptional<z.ZodObject<{
|
|
289
297
|
optimize: z.ZodOptional<z.ZodBoolean>;
|
|
290
298
|
topLevelModule: z.ZodOptional<z.ZodString>;
|
|
299
|
+
synthArguments: z.ZodOptional<z.ZodString>;
|
|
291
300
|
}, z.core.$strip>>;
|
|
292
301
|
}, z.core.$strip>>;
|
|
293
302
|
nextpnr: z.ZodOptional<z.ZodObject<{
|
|
@@ -357,6 +366,7 @@ export declare const schemaProjectConfiguration: z.ZodObject<{
|
|
|
357
366
|
}, z.core.$strip>>;
|
|
358
367
|
options: z.ZodOptional<z.ZodObject<{
|
|
359
368
|
board: z.ZodOptional<z.ZodString>;
|
|
369
|
+
programToFlash: z.ZodOptional<z.ZodBoolean>;
|
|
360
370
|
}, z.core.$strip>>;
|
|
361
371
|
}, z.core.$strip>>;
|
|
362
372
|
}, z.core.$strip>>;
|
|
@@ -32,7 +32,8 @@ const schemaWorkerTarget = zod_1.z.object({
|
|
|
32
32
|
});
|
|
33
33
|
const schemaYosysOptions = zod_1.z.object({
|
|
34
34
|
optimize: zod_1.z.boolean().optional(),
|
|
35
|
-
topLevelModule: zod_1.z.string().optional()
|
|
35
|
+
topLevelModule: zod_1.z.string().optional(),
|
|
36
|
+
synthArguments: zod_1.z.string().optional(),
|
|
36
37
|
});
|
|
37
38
|
const schemaYosys = zod_1.z.object({
|
|
38
39
|
synthPrepareCommands: schemaValueList.optional(),
|
|
@@ -62,7 +63,8 @@ const schemaNextpnrTarget = zod_1.z.object({
|
|
|
62
63
|
options: schemaNextpnrOptions.optional()
|
|
63
64
|
});
|
|
64
65
|
const schemaFlasherOptions = zod_1.z.object({
|
|
65
|
-
board: zod_1.z.string().optional()
|
|
66
|
+
board: zod_1.z.string().optional(),
|
|
67
|
+
programToFlash: zod_1.z.boolean().optional(),
|
|
66
68
|
});
|
|
67
69
|
const schemaFlasher = zod_1.z.object({
|
|
68
70
|
packerArguments: schemaValueList.optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/project/configuration.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/project/configuration.ts"],"names":[],"mappings":"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"}
|
package/dist/project/flasher.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFlasherWorkerOptions = exports.getFlasherOptions = exports.parseFlasherArguments = void 0;
|
|
4
4
|
const string_args_parser_1 = require("string-args-parser");
|
|
5
|
-
const target_js_1 = require("./target.js");
|
|
6
5
|
const devices_js_1 = require("./devices.js");
|
|
6
|
+
const target_js_1 = require("./target.js");
|
|
7
7
|
const DEFAULT_OPTIONS = {
|
|
8
8
|
board: undefined,
|
|
9
|
+
programToFlash: false,
|
|
9
10
|
};
|
|
10
11
|
const parseFlasherArguments = (args) => args.flatMap((arg) => (0, string_args_parser_1.parseArgs)(arg));
|
|
11
12
|
exports.parseFlasherArguments = parseFlasherArguments;
|
|
@@ -25,6 +26,9 @@ const getFlasherWorkerOptions = (project, targetId) => {
|
|
|
25
26
|
if (options.board) {
|
|
26
27
|
generatedFlasherArgs.push('-b', options.board);
|
|
27
28
|
}
|
|
29
|
+
if (options.programToFlash) {
|
|
30
|
+
generatedFlasherArgs.push('-f');
|
|
31
|
+
}
|
|
28
32
|
switch (family.architecture) {
|
|
29
33
|
case 'ecp5': {
|
|
30
34
|
const bitstreamFile = (0, target_js_1.getTargetFile)(target, `${family.architecture}.config`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flasher.js","sourceRoot":"","sources":["../../src/project/flasher.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"flasher.js","sourceRoot":"","sources":["../../src/project/flasher.ts"],"names":[],"mappings":"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"}
|
package/dist/project/nextpnr.js
CHANGED
|
@@ -23,7 +23,10 @@ const getNextpnrWorkerOptions = (project, targetId) => {
|
|
|
23
23
|
const family = vendor.families[target.family];
|
|
24
24
|
const device = family.devices[target.device];
|
|
25
25
|
// Input files
|
|
26
|
-
const generatedInputFiles = [
|
|
26
|
+
const generatedInputFiles = [
|
|
27
|
+
(0, target_js_1.getTargetFile)(target, `${family.architecture}.json`),
|
|
28
|
+
...(options.pinConfigFile ? [options.pinConfigFile] : [])
|
|
29
|
+
];
|
|
27
30
|
const inputFiles = (0, target_js_1.getCombined)(configuration, targetId, 'nextpnr', 'inputFiles', generatedInputFiles).filter((f) => !!f);
|
|
28
31
|
// Tool
|
|
29
32
|
const tool = `nextpnr-${family.architecture}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextpnr.js","sourceRoot":"","sources":["../../src/project/nextpnr.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"nextpnr.js","sourceRoot":"","sources":["../../src/project/nextpnr.ts"],"names":[],"mappings":"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"}
|
|
@@ -164,6 +164,7 @@ export declare class Project {
|
|
|
164
164
|
options?: {
|
|
165
165
|
optimize?: boolean | undefined;
|
|
166
166
|
topLevelModule?: string | undefined;
|
|
167
|
+
synthArguments?: string | undefined;
|
|
167
168
|
} | undefined;
|
|
168
169
|
} | undefined;
|
|
169
170
|
nextpnr?: {
|
|
@@ -233,6 +234,7 @@ export declare class Project {
|
|
|
233
234
|
} | undefined;
|
|
234
235
|
options?: {
|
|
235
236
|
board?: string | undefined;
|
|
237
|
+
programToFlash?: boolean | undefined;
|
|
236
238
|
} | undefined;
|
|
237
239
|
} | undefined;
|
|
238
240
|
}[];
|
|
@@ -261,6 +263,7 @@ export declare class Project {
|
|
|
261
263
|
options?: {
|
|
262
264
|
optimize?: boolean | undefined;
|
|
263
265
|
topLevelModule?: string | undefined;
|
|
266
|
+
synthArguments?: string | undefined;
|
|
264
267
|
} | undefined;
|
|
265
268
|
} | undefined;
|
|
266
269
|
nextpnr?: {
|
|
@@ -320,6 +323,7 @@ export declare class Project {
|
|
|
320
323
|
} | undefined;
|
|
321
324
|
options?: {
|
|
322
325
|
board?: string | undefined;
|
|
326
|
+
programToFlash?: boolean | undefined;
|
|
323
327
|
} | undefined;
|
|
324
328
|
} | undefined;
|
|
325
329
|
} | undefined;
|
package/dist/project/yosys.js
CHANGED
|
@@ -9,7 +9,9 @@ const util_js_1 = require("../util.js");
|
|
|
9
9
|
const devices_js_1 = require("./devices.js");
|
|
10
10
|
const target_js_1 = require("./target.js");
|
|
11
11
|
const DEFAULT_OPTIONS = {
|
|
12
|
-
optimize: true
|
|
12
|
+
optimize: true,
|
|
13
|
+
topLevelModule: undefined,
|
|
14
|
+
synthArguments: undefined,
|
|
13
15
|
};
|
|
14
16
|
const getYosysOptions = (configuration, targetId) => (0, target_js_1.getOptions)(configuration, targetId, 'yosys', DEFAULT_OPTIONS);
|
|
15
17
|
exports.getYosysOptions = getYosysOptions;
|
|
@@ -21,19 +23,19 @@ const getFileIngestCommands = (inputFiles, options) => {
|
|
|
21
23
|
if (!options.topLevelModule) {
|
|
22
24
|
throw new Error('Top level module must be defined when synthesizing VHDL');
|
|
23
25
|
}
|
|
24
|
-
commands.push('plugin -i ghdl', `ghdl ${vhdlFiles.join(' ')} -e ${options.topLevelModule}
|
|
26
|
+
commands.push('plugin -i ghdl;', `ghdl ${vhdlFiles.join(' ')} -e ${options.topLevelModule};`);
|
|
25
27
|
}
|
|
26
28
|
// Load verilog files
|
|
27
29
|
const verilogFiles = inputFiles.filter((file) => util_js_1.FILE_EXTENSIONS_VERILOG.includes(path_1.default.extname(file).substring(1)));
|
|
28
30
|
if (verilogFiles.length) {
|
|
29
|
-
commands.push(...verilogFiles.map((file) => `read_verilog -sv "${file}"
|
|
31
|
+
commands.push(...verilogFiles.map((file) => `read_verilog -sv "${file}";`));
|
|
30
32
|
}
|
|
31
33
|
// (auto-)set top-level module
|
|
32
34
|
if (options.topLevelModule) {
|
|
33
|
-
commands.push(`hierarchy -top ${options.topLevelModule}
|
|
35
|
+
commands.push(`hierarchy -top ${options.topLevelModule};`);
|
|
34
36
|
}
|
|
35
37
|
else {
|
|
36
|
-
commands.push('hierarchy -auto-top');
|
|
38
|
+
commands.push('hierarchy -auto-top;');
|
|
37
39
|
}
|
|
38
40
|
return commands;
|
|
39
41
|
};
|
|
@@ -62,14 +64,13 @@ const getYosysRTLWorkerOptions = (project, targetId) => {
|
|
|
62
64
|
const generatedCommands = [
|
|
63
65
|
...getFileIngestCommands(inputFiles, options),
|
|
64
66
|
'proc;',
|
|
65
|
-
'opt;',
|
|
66
|
-
'memory -nomap;',
|
|
67
|
-
'wreduce -memx;',
|
|
68
|
-
'opt -full;',
|
|
69
|
-
`tee -q -o "${(0, target_js_1.getTargetFile)(target, 'stats.yosys.json')}" stat -json -width *;`,
|
|
70
|
-
`write_json "${(0, target_js_1.getTargetFile)(target, 'rtl.yosys.json')}";`,
|
|
71
|
-
''
|
|
72
67
|
];
|
|
68
|
+
if (options.optimize)
|
|
69
|
+
generatedCommands.push('opt;');
|
|
70
|
+
generatedCommands.push('memory -nomap;');
|
|
71
|
+
if (options.optimize)
|
|
72
|
+
generatedCommands.push('wreduce -memx;', 'opt -full;');
|
|
73
|
+
generatedCommands.push(`tee -q -o "${(0, target_js_1.getTargetFile)(target, 'stats.yosys.json')}" stat -json -width *;`, `write_json "${(0, target_js_1.getTargetFile)(target, 'rtl.yosys.json')}";`, '');
|
|
73
74
|
const commands = (0, target_js_1.getCombined)(configuration, targetId, 'yosys', 'rtlCommands', generatedCommands);
|
|
74
75
|
const encoder = new TextEncoder();
|
|
75
76
|
return {
|
|
@@ -105,21 +106,22 @@ const getYosysSynthesisWorkerOptions = (project, targetId) => {
|
|
|
105
106
|
const generatedPrepareCommands = [
|
|
106
107
|
...getFileIngestCommands(inputFiles, options),
|
|
107
108
|
'proc;',
|
|
108
|
-
'opt;',
|
|
109
|
-
`write_json "${(0, target_js_1.getTargetFile)(target, 'presynth.yosys.json')}";`,
|
|
110
|
-
''
|
|
111
109
|
];
|
|
110
|
+
if (options.optimize)
|
|
111
|
+
generatedPrepareCommands.push('opt;');
|
|
112
|
+
generatedPrepareCommands.push(`write_json "${(0, target_js_1.getTargetFile)(target, 'presynth.yosys.json')}";`, '');
|
|
112
113
|
const prepareCommands = (0, target_js_1.getCombined)(configuration, targetId, 'yosys', 'synthPrepareCommands', generatedPrepareCommands);
|
|
113
114
|
// Commands (synthesis)
|
|
114
115
|
const generatedSynthCommands = [
|
|
115
|
-
`read_json "${(0, target_js_1.getTargetFile)(target, 'presynth.yosys.json')}"
|
|
116
|
+
`read_json "${(0, target_js_1.getTargetFile)(target, 'presynth.yosys.json')}";`,
|
|
116
117
|
];
|
|
118
|
+
const synthArgs = options.synthArguments || '';
|
|
117
119
|
if (family.architecture === 'generic') {
|
|
118
|
-
generatedSynthCommands.push(
|
|
119
|
-
generatedSynthCommands.push(`write_json "${(0, target_js_1.getTargetFile)(target, family.architecture)}.json"
|
|
120
|
+
generatedSynthCommands.push(`synth ${synthArgs};`);
|
|
121
|
+
generatedSynthCommands.push(`write_json "${(0, target_js_1.getTargetFile)(target, family.architecture)}.json";`);
|
|
120
122
|
}
|
|
121
123
|
else {
|
|
122
|
-
generatedSynthCommands.push(`synth_${family.architecture} -json "${(0, target_js_1.getTargetFile)(target, family.architecture)}.json"
|
|
124
|
+
generatedSynthCommands.push(`synth_${family.architecture} -json "${(0, target_js_1.getTargetFile)(target, family.architecture)}.json" ${synthArgs};`);
|
|
123
125
|
}
|
|
124
126
|
generatedSynthCommands.push('');
|
|
125
127
|
const synthCommands = (0, target_js_1.getCombined)(configuration, targetId, 'yosys', 'synthCommands', generatedSynthCommands);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yosys.js","sourceRoot":"","sources":["../../src/project/yosys.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"yosys.js","sourceRoot":"","sources":["../../src/project/yosys.ts"],"names":[],"mappings":"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"}
|
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.6.
|
|
5
|
+
"version": "0.6.4",
|
|
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)"
|