diff --git a/etc/settings/settings_test.json b/etc/settings/settings_test.json index 01bee2272..86d897d38 100644 --- a/etc/settings/settings_test.json +++ b/etc/settings/settings_test.json @@ -59,17 +59,57 @@ "auto", "none" ], - "arg": "carry" + "arg": "carry", + "default":"Auto" }, - "no_dsp_checkbox": { - "label": "No DSP Blocks", - "widgetType": "checkbox", - "arg": "no_dsp" + "netlist_lang_dropdown": { + "label": "Pnr netlist language", + "widgetType": "dropdown", + "options": [ + "Blif", + "EBlif", + "Edif", + "Verilog", + "VHDL" + ], + "optionsLookup": [ + "blif", + "eblif", + "edif", + "verilog", + "vhdl" + ], + "default": "Verilog", + "arg": "netlist_lang" }, - "no_bram_checkbox": { - "label": "No Block Ram", - "widgetType": "checkbox", - "arg": "no_bram" + "inferred_io": { + "label": "Inferred IO", + "widgetType": "dropdown", + "options": [ + "Auto", + "None" + ], + "optionsLookup": [ + "auto", + "none" + ], + "arg": "inferred_io" + }, + "bram_spinbox_ex": { + "label": "Block RAM limit", + "widgetType": "spinbox", + "minVal": 0, + "maxVal": 0, + "stepVal": 1, + "arg": "bram_limit" + }, + "carry_chain_spinbox_ex": { + "label": "Carry length limit", + "widgetType": "spinbox", + "minVal": 0, + "maxVal": 0, + "stepVal": 1, + "arg": "carry_chain_limit" }, "no_sat_checkbox": { "label": "No Sat", @@ -81,6 +121,17 @@ "widgetType": "checkbox", "arg": "fast" }, + "no_flatten": { + "label": "No flatten", + "widgetType": "checkbox", + "arg": "no_flatten" + }, + "keep_tribuf": { + "label": "Keep Tribuf", + "widgetType": "checkbox", + "arg": "keep_tribuf", + "default": "checked" + }, "_META_": { "hidden": false, "isSetting": true, diff --git a/src/Compiler/CompilerRS.cpp b/src/Compiler/CompilerRS.cpp index b5547e498..0d463742f 100644 --- a/src/Compiler/CompilerRS.cpp +++ b/src/Compiler/CompilerRS.cpp @@ -466,7 +466,7 @@ std::string CompilerRS::FinishSynthesisScript(const std::string &script) { no_sat = "-no_sat"; } - std::string init_registers = std::string("-init_registers ") + std::to_string(SynthInitRegisters) + std::string(" "); + std::string init_registers = std::string("-init_registers ") + std::to_string(SynthInitRegisters()) + std::string(" "); std::string limits; limits += std::string("-max_lut ") + std::to_string(MaxDeviceLUTCount()) +