mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-05-05 09:55:16 +00:00
Code Activity

Fix some escaping with different approach

Browse source
This commit is contained in:
Miodrag Milanovic 2026-03-25 09:41:39 +01:00
parent 86c9b06d98
commit 31bf712059
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/fmt/generate_mk.py
View file

@ -6,11 +6,11 @@ sys.path.append("..")
import gen_tests_makefile import gen_tests_makefile
def cmd(lines): def cmd(lines):
return " ; \\\n".join(lines) return " && \\\n".join(lines)
def initial_display(): def initial_display():
gen_tests_makefile.generate_target("initial_display", cmd([ gen_tests_makefile.generate_target("initial_display", cmd([
f"$(YOSYS) -p \"read_verilog initial_display.v\" | awk \"/<<<BEGIN>>>/,/<<<END>>>/ {{print $$0}}\" >yosys-initial_display.log 2>&1", f"$(YOSYS) -p \"read_verilog initial_display.v\" | awk '/<<<BEGIN>>>/,/<<<END>>>/ {{print $$0}}' >yosys-initial_display.log 2>&1",
"iverilog -o iverilog-initial_display initial_display.v", "iverilog -o iverilog-initial_display initial_display.v",
"./iverilog-initial_display >iverilog-initial_display.log", "./iverilog-initial_display >iverilog-initial_display.log",
"diff yosys-initial_display.log iverilog-initial_display.log", "diff yosys-initial_display.log iverilog-initial_display.log",
@ -94,22 +94,22 @@ def extra():
gen_tests_makefile.generate_target("display_lm", cmd([ gen_tests_makefile.generate_target("display_lm", cmd([
"$(YOSYS) -p \"read_verilog display_lm.v\" >yosys-display_lm.log 2>&1", "$(YOSYS) -p \"read_verilog display_lm.v\" >yosys-display_lm.log 2>&1",
"$(YOSYS) -p \"read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc\" >/dev/null 2>&1", "$(YOSYS) -p \"read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc\" >/dev/null 2>&1",
f"$${{CXX:-g++}} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++", f"$${{CXX:-g++}} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ >/dev/null 2>&1",
"./yosys-display_lm_cc >yosys-display_lm_cc.log", "./yosys-display_lm_cc >yosys-display_lm_cc.log 2>/dev/null",
"for log in yosys-display_lm.log yosys-display_lm_cc.log; do " "grep \"^%l: \\\\\\bot\\$$\" \"yosys-display_lm.log\" >/dev/null 2>&1",
"grep \"^%l: \\\\bot\\$\" \"$log\" >/dev/null 2>&1; " "grep \"^%m: \\\\\\bot\\$$\" \"yosys-display_lm.log\" >/dev/null 2>&1",
"grep \"^%m: \\\\bot\\$\" \"$log\" >/dev/null 2>&1; " "grep \"^%l: \\\\\\bot\\$$\" \"yosys-display_lm_cc.log\" >/dev/null 2>&1",
"done", "grep \"^%m: \\\\\\bot\\$$\" \"yosys-display_lm_cc.log\" >/dev/null 2>&1",
])) ]))
def main(): def main():
def callback(): def callback():
#initial_display() initial_display()
always_display() always_display()
roundtrip() roundtrip()
cxxrtl() cxxrtl()
#extra() extra()
gen_tests_makefile.generate_custom(callback) gen_tests_makefile.generate_custom(callback)

7
tests/gen_tests_makefile.py
View file

@ -17,12 +17,9 @@ def generate_target(name, command):
target = f"{name}" target = f"{name}"
print(f"all: {target}") print(f"all: {target}")
print(f".PHONY: {target}") print(f".PHONY: {target}")
print(f"{target}_cmd={command}")
print(f"{target}:") print(f"{target}:")
if command: print(f"\t@$(call run_test,{target}, $({target}_cmd))")
print(f"\t@$(call run_test,{target}, \\")
print(f"\t{command})")
else:
print(f"\t@$(call run_test,{target})")
def generate_ys_test(ys_file, yosys_args="", commands=""): def generate_ys_test(ys_file, yosys_args="", commands=""):
cmd = f'$(YOSYS) -ql {ys_file}.err {yosys_args} {ys_file} >/dev/null 2>&1 && mv {ys_file}.err {ys_file}.log' cmd = f'$(YOSYS) -ql {ys_file}.err {yosys_args} {ys_file} >/dev/null 2>&1 && mv {ys_file}.err {ys_file}.log'