From e15a0235a36460935e74457eadb3857ead9fec0d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 11 Jun 2020 08:18:02 +0800 Subject: [PATCH] Revert "migen: add patch to limit vivado threads to 1" This reverts commit 8f7308b036533bbd25b60fe99f6bb47b2d7ff062. --- .../migen-limit-vivado-threads-to-1.patch | 24 ------------------- artiq-fast/pkgs/python-deps.nix | 5 ---- 2 files changed, 29 deletions(-) delete mode 100644 artiq-fast/pkgs/migen-limit-vivado-threads-to-1.patch diff --git a/artiq-fast/pkgs/migen-limit-vivado-threads-to-1.patch b/artiq-fast/pkgs/migen-limit-vivado-threads-to-1.patch deleted file mode 100644 index 903ac6f..0000000 --- a/artiq-fast/pkgs/migen-limit-vivado-threads-to-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 59a61be1b7b7cb45f5494b980b9f37e2838d6e6a Mon Sep 17 00:00:00 2001 -From: Astro -Date: Wed, 10 Jun 2020 19:29:25 +0200 -Subject: [PATCH] limit vivado threads to 1 - ---- - migen/build/xilinx/vivado.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/migen/build/xilinx/vivado.py b/migen/build/xilinx/vivado.py -index d2cf101..e9e4b77 100644 ---- a/migen/build/xilinx/vivado.py -+++ b/migen/build/xilinx/vivado.py -@@ -149,6 +149,7 @@ class XilinxVivadoToolchain: - - # script that calls above steps - tcl = [] -+ tcl.append("set_param general.maxThreads 1") - tcl.append("source \"{}_route.tcl\"".format(build_name)) - tcl.append("source \"{}_bitstream.tcl\"".format(build_name)) - tools.write_to_file(build_name + ".tcl", "\n".join(tcl)) --- -2.26.2 - diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix index b5ff625..31f6147 100644 --- a/artiq-fast/pkgs/python-deps.nix +++ b/artiq-fast/pkgs/python-deps.nix @@ -86,11 +86,6 @@ rec { rev = "b1b2b298b85a795239daad84c75be073ddc4f8bd"; sha256 = "1qy2ydk8xqqv92i992j1g71fbi185zd6s3kigzsf3169874dyh81"; }; - patches = [ - # Vivado synthesis processes consume over 1 GB of RSS each. Limit them to - # 1 thread because they can become overwhelming during parallel builds. - ./migen-limit-vivado-threads-to-1.patch - ]; propagatedBuildInputs = with python3Packages; [ colorama ];