From e18329c3ab8b1fea2ec42f297c9fd1992909f9e1 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 12 Nov 2018 11:58:55 -0800 Subject: [PATCH 1/2] clbnoutmux: move minitest to fuzzer Signed-off-by: John McMaster --- .../clb_noutmux => fuzzers/016-clbnoutmux/minitest}/.gitignore | 0 fuzzers/016-clbnoutmux/minitest/Makefile | 1 + .../clb_noutmux => fuzzers/016-clbnoutmux/minitest}/README.md | 0 {minitests/clb_noutmux => fuzzers/016-clbnoutmux/minitest}/top.v | 0 minitests/clb_noutmux/Makefile | 1 - 5 files changed, 1 insertion(+), 1 deletion(-) rename {minitests/clb_noutmux => fuzzers/016-clbnoutmux/minitest}/.gitignore (100%) create mode 100644 fuzzers/016-clbnoutmux/minitest/Makefile rename {minitests/clb_noutmux => fuzzers/016-clbnoutmux/minitest}/README.md (100%) rename {minitests/clb_noutmux => fuzzers/016-clbnoutmux/minitest}/top.v (100%) delete mode 100644 minitests/clb_noutmux/Makefile diff --git a/minitests/clb_noutmux/.gitignore b/fuzzers/016-clbnoutmux/minitest/.gitignore similarity index 100% rename from minitests/clb_noutmux/.gitignore rename to fuzzers/016-clbnoutmux/minitest/.gitignore diff --git a/fuzzers/016-clbnoutmux/minitest/Makefile b/fuzzers/016-clbnoutmux/minitest/Makefile new file mode 100644 index 00000000..6fcdd876 --- /dev/null +++ b/fuzzers/016-clbnoutmux/minitest/Makefile @@ -0,0 +1 @@ +include $(XRAY_DIR)/minitests/util/common.mk diff --git a/minitests/clb_noutmux/README.md b/fuzzers/016-clbnoutmux/minitest/README.md similarity index 100% rename from minitests/clb_noutmux/README.md rename to fuzzers/016-clbnoutmux/minitest/README.md diff --git a/minitests/clb_noutmux/top.v b/fuzzers/016-clbnoutmux/minitest/top.v similarity index 100% rename from minitests/clb_noutmux/top.v rename to fuzzers/016-clbnoutmux/minitest/top.v diff --git a/minitests/clb_noutmux/Makefile b/minitests/clb_noutmux/Makefile deleted file mode 100644 index 1d13e215..00000000 --- a/minitests/clb_noutmux/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../util/common.mk From cceb2362963ea749c431e8ca7945128eed45b08f Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 12 Nov 2018 12:07:21 -0800 Subject: [PATCH 2/2] clbnoutmux: O6 hack Signed-off-by: John McMaster --- fuzzers/016-clbnoutmux/generate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clbnoutmux/generate.py index ada2425b..78a6ab86 100644 --- a/fuzzers/016-clbnoutmux/generate.py +++ b/fuzzers/016-clbnoutmux/generate.py @@ -56,10 +56,13 @@ for l in f: # remove this MUX from the cache, preventing generation of 0-tags for this MUX cache[loc].remove(which) + # O6 hack per https://github.com/SymbiFlow/prjxray/issues/243 + segmk.add_site_tag(loc, "%sOUTMUX.%s" % (which, "O6"), src == "O5") + # create 0-tags for all sources on the remaining (unused) MUXes for loc, muxes in cache.items(): for which in muxes: - for src in "F7 F8 CY O5 XOR O6 5Q".split(): + for src in "F7 F8 CY O5 XOR 5Q".split(): if src == "F7" and which not in "AC": continue if src == "F8" and which not in "B": continue if src == "5Q": src = which + "5Q"