From 81c2b92bb419d5b58d47fa8bb8cbb134fb2773bc Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 11 Mar 2021 15:56:32 +0100 Subject: Add _pm.h files to GENLIST, fixes vcxsrc target --- passes/pmgen/Makefile.inc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'passes/pmgen') diff --git a/passes/pmgen/Makefile.inc b/passes/pmgen/Makefile.inc index c6bbc386a..a7ef64282 100644 --- a/passes/pmgen/Makefile.inc +++ b/passes/pmgen/Makefile.inc @@ -4,24 +4,31 @@ # -------------------------------------- OBJS += passes/pmgen/test_pmgen.o +GENFILES += passes/pmgen/test_pmgen_pm.h passes/pmgen/test_pmgen.o: passes/pmgen/test_pmgen_pm.h passes/pmgen/ice40_dsp_pm.h passes/pmgen/peepopt_pm.h passes/pmgen/xilinx_srl_pm.h $(eval $(call add_extra_objs,passes/pmgen/test_pmgen_pm.h)) # -------------------------------------- OBJS += passes/pmgen/ice40_dsp.o +GENFILES += passes/pmgen/ice40_dsp_pm.h passes/pmgen/ice40_dsp.o: passes/pmgen/ice40_dsp_pm.h $(eval $(call add_extra_objs,passes/pmgen/ice40_dsp_pm.h)) # -------------------------------------- OBJS += passes/pmgen/ice40_wrapcarry.o +GENFILES += passes/pmgen/ice40_wrapcarry_pm.h passes/pmgen/ice40_wrapcarry.o: passes/pmgen/ice40_wrapcarry_pm.h $(eval $(call add_extra_objs,passes/pmgen/ice40_wrapcarry_pm.h)) # -------------------------------------- OBJS += passes/pmgen/xilinx_dsp.o +GENFILES += passes/pmgen/xilinx_dsp_pm.h +GENFILES += passes/pmgen/xilinx_dsp48a_pm.h +GENFILES += passes/pmgen/xilinx_dsp_CREG_pm.h +GENFILES += passes/pmgen/xilinx_dsp_cascade_pm.h passes/pmgen/xilinx_dsp.o: passes/pmgen/xilinx_dsp_pm.h passes/pmgen/xilinx_dsp48a_pm.h passes/pmgen/xilinx_dsp_CREG_pm.h passes/pmgen/xilinx_dsp_cascade_pm.h $(eval $(call add_extra_objs,passes/pmgen/xilinx_dsp_pm.h)) $(eval $(call add_extra_objs,passes/pmgen/xilinx_dsp48a_pm.h)) @@ -31,6 +38,7 @@ $(eval $(call add_extra_objs,passes/pmgen/xilinx_dsp_cascade_pm.h)) # -------------------------------------- OBJS += passes/pmgen/peepopt.o +GENFILES += passes/pmgen/peepopt_pm.h passes/pmgen/peepopt.o: passes/pmgen/peepopt_pm.h $(eval $(call add_extra_objs,passes/pmgen/peepopt_pm.h)) @@ -43,5 +51,6 @@ passes/pmgen/peepopt_pm.h: passes/pmgen/pmgen.py $(PEEPOPT_PATTERN) # -------------------------------------- OBJS += passes/pmgen/xilinx_srl.o +GENFILES += passes/pmgen/xilinx_srl_pm.h passes/pmgen/xilinx_srl.o: passes/pmgen/xilinx_srl_pm.h $(eval $(call add_extra_objs,passes/pmgen/xilinx_srl_pm.h)) -- cgit v1.2.3 From 72787f52fc31954e4b7dc3dc34d86705fc4e9dd1 Mon Sep 17 00:00:00 2001 From: Claire Xenia Wolf Date: Tue, 8 Jun 2021 00:39:36 +0200 Subject: Fixing old e-mail addresses and deadnames s/((Claire|Xen|Xenia|Clifford)\s+)+(Wolf|Xen)\s+<(claire|clifford)@(symbioticeda.com|clifford.at|yosyshq.com)>/Claire Xenia Wolf /gi; s/((Nina|Nak|N\.)\s+)+Engelhardt\s+/N. Engelhardt /gi; s/((David)\s+)+Shah\s+<(dave|david)@(symbioticeda.com|yosyshq.com|ds0.me)>/David Shah /gi; s/((Miodrag)\s+)+Milanovic\s+<(miodrag|micko)@(symbioticeda.com|yosyshq.com)>/Miodrag Milanovic /gi; s,https?://www.clifford.at/yosys/,http://yosyshq.net/yosys/,g; --- passes/pmgen/generate.h | 2 +- passes/pmgen/ice40_dsp.cc | 2 +- passes/pmgen/ice40_wrapcarry.cc | 2 +- passes/pmgen/peepopt.cc | 2 +- passes/pmgen/test_pmgen.cc | 2 +- passes/pmgen/xilinx_dsp.cc | 2 +- passes/pmgen/xilinx_srl.cc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'passes/pmgen') diff --git a/passes/pmgen/generate.h b/passes/pmgen/generate.h index 354583de5..85e208774 100644 --- a/passes/pmgen/generate.h +++ b/passes/pmgen/generate.h @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/passes/pmgen/ice40_dsp.cc b/passes/pmgen/ice40_dsp.cc index c46f5d58f..24134b1fb 100644 --- a/passes/pmgen/ice40_dsp.cc +++ b/passes/pmgen/ice40_dsp.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/passes/pmgen/ice40_wrapcarry.cc b/passes/pmgen/ice40_wrapcarry.cc index e234906ad..c936d02dc 100644 --- a/passes/pmgen/ice40_wrapcarry.cc +++ b/passes/pmgen/ice40_wrapcarry.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/passes/pmgen/peepopt.cc b/passes/pmgen/peepopt.cc index a9c62fcf6..9a497c914 100644 --- a/passes/pmgen/peepopt.cc +++ b/passes/pmgen/peepopt.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/passes/pmgen/test_pmgen.cc b/passes/pmgen/test_pmgen.cc index 7b2938ddf..beff59778 100644 --- a/passes/pmgen/test_pmgen.cc +++ b/passes/pmgen/test_pmgen.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/passes/pmgen/xilinx_dsp.cc b/passes/pmgen/xilinx_dsp.cc index cf7703d36..72b4522d8 100644 --- a/passes/pmgen/xilinx_dsp.cc +++ b/passes/pmgen/xilinx_dsp.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * 2019 Eddie Hung * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/passes/pmgen/xilinx_srl.cc b/passes/pmgen/xilinx_srl.cc index 1410850c7..a66a06586 100644 --- a/passes/pmgen/xilinx_srl.cc +++ b/passes/pmgen/xilinx_srl.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2012 Claire Xenia Wolf * (C) 2019 Eddie Hung * * Permission to use, copy, modify, and/or distribute this software for any -- cgit v1.2.3 From cbb6887ac846dbbaa420253a9f3656bd3b6bd92d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 5 Nov 2021 10:36:15 +0100 Subject: Correct way of setting maybe_unsused on labels --- passes/pmgen/pmgen.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'passes/pmgen') diff --git a/passes/pmgen/pmgen.py b/passes/pmgen/pmgen.py index 6e2fabeeb..c599d31a6 100644 --- a/passes/pmgen/pmgen.py +++ b/passes/pmgen/pmgen.py @@ -679,16 +679,14 @@ with open(outfile, "w") as f: print("#undef subpattern", file=f) print("", file=f) - print("rollback_label:", file=f) - print(" YS_MAYBE_UNUSED;", file=f) + print("YS_MAYBE_UNUSED rollback_label:;", file=f) if len(block["fcode"]): print("#define accept do { accept_cnt++; on_accept(); } while(0)", file=f) print("#define finish do { rollback = -1; goto finish_label; } while(0)", file=f) for line in block["fcode"]: print(" " + line, file=f) - print("finish_label:", file=f) - print(" YS_MAYBE_UNUSED;", file=f) + print("YS_MAYBE_UNUSED finish_label:;", file=f) print("#undef accept", file=f) print("#undef finish", file=f) -- cgit v1.2.3 From d5de2a0cdb3dcfe553a841db24f273e074d8f49d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 5 Nov 2021 10:51:58 +0100 Subject: Make it work on all --- passes/pmgen/pmgen.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'passes/pmgen') diff --git a/passes/pmgen/pmgen.py b/passes/pmgen/pmgen.py index c599d31a6..6e2fabeeb 100644 --- a/passes/pmgen/pmgen.py +++ b/passes/pmgen/pmgen.py @@ -679,14 +679,16 @@ with open(outfile, "w") as f: print("#undef subpattern", file=f) print("", file=f) - print("YS_MAYBE_UNUSED rollback_label:;", file=f) + print("rollback_label:", file=f) + print(" YS_MAYBE_UNUSED;", file=f) if len(block["fcode"]): print("#define accept do { accept_cnt++; on_accept(); } while(0)", file=f) print("#define finish do { rollback = -1; goto finish_label; } while(0)", file=f) for line in block["fcode"]: print(" " + line, file=f) - print("YS_MAYBE_UNUSED finish_label:;", file=f) + print("finish_label:", file=f) + print(" YS_MAYBE_UNUSED;", file=f) print("#undef accept", file=f) print("#undef finish", file=f) -- cgit v1.2.3 From e04ac4e9e9658d80aa125332ec538f16f5f0f0c1 Mon Sep 17 00:00:00 2001 From: Scott Thibault Date: Tue, 1 Feb 2022 17:55:09 -0500 Subject: Fix unextend method for signed constants --- passes/pmgen/ice40_dsp.pmg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'passes/pmgen') diff --git a/passes/pmgen/ice40_dsp.pmg b/passes/pmgen/ice40_dsp.pmg index 7a01cbd51..378f251c0 100644 --- a/passes/pmgen/ice40_dsp.pmg +++ b/passes/pmgen/ice40_dsp.pmg @@ -29,8 +29,7 @@ code sigA sigB sigH if (sig[i] != sig[i-1]) break; // Do not remove non-const sign bit - if (sig[i].wire) - ++i; + ++i; return sig.extract(0, i); }; sigA = unextend(port(mul, \A)); -- cgit v1.2.3 From 0a6e2bd5d51025b83d4ff7474e65dd2decf673d5 Mon Sep 17 00:00:00 2001 From: Scott Thibault Date: Tue, 1 Feb 2022 20:30:31 -0500 Subject: Update comment --- passes/pmgen/ice40_dsp.pmg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'passes/pmgen') diff --git a/passes/pmgen/ice40_dsp.pmg b/passes/pmgen/ice40_dsp.pmg index 378f251c0..4de479122 100644 --- a/passes/pmgen/ice40_dsp.pmg +++ b/passes/pmgen/ice40_dsp.pmg @@ -28,7 +28,7 @@ code sigA sigB sigH for (i = GetSize(sig)-1; i > 0; i--) if (sig[i] != sig[i-1]) break; - // Do not remove non-const sign bit + // Do not remove sign bit ++i; return sig.extract(0, i); }; -- cgit v1.2.3