From 63bb8337f8e989f4c51513bc6235be5ddd2248a4 Mon Sep 17 00:00:00 2001
From: Alessandro Comodi <acomodi@antmicro.com>
Date: Wed, 15 Jan 2020 16:46:48 +0100
Subject: [PATCH] 072-ordered_wires: increased parallel jobs.

This changes also the way the ordered wires final files are generated.
In fact, now, with the help of a Lock, all the suprocesses directly
access the final files, updating them. Once the write completes, the
temporary file is deleted.

This saves up disk space.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
---
 fuzzers/072-ordered_wires/Makefile      |  4 +--
 fuzzers/072-ordered_wires/run_fuzzer.py | 35 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/fuzzers/072-ordered_wires/Makefile b/fuzzers/072-ordered_wires/Makefile
index 851bebc8..48439017 100644
--- a/fuzzers/072-ordered_wires/Makefile
+++ b/fuzzers/072-ordered_wires/Makefile
@@ -2,8 +2,8 @@
 N := 1
 SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
-MAX_VIVADO_PROCESS ?= 4
-MAX_PIPS_INSTANCE ?= 340000
+MAX_VIVADO_PROCESS ?= 8
+MAX_PIPS_INSTANCE ?= 680000
 
 database: $(SPECIMENS_OK)
 	true
diff --git a/fuzzers/072-ordered_wires/run_fuzzer.py b/fuzzers/072-ordered_wires/run_fuzzer.py
index f166c900..8bf345ae 100644
--- a/fuzzers/072-ordered_wires/run_fuzzer.py
+++ b/fuzzers/072-ordered_wires/run_fuzzer.py
@@ -3,13 +3,14 @@ import shutil
 import sys
 import subprocess
 import signal
-from multiprocessing import Pool
+from multiprocessing import Pool, Lock
 from itertools import chain
 import argparse
 
 # Can be used to redirect vivado tons of output
 # stdout=DEVNULL in subprocess.check_call
 
+MP_LOCK = Lock()
 
 # Worker function called from threads
 def start_pips(argList):
@@ -20,6 +21,24 @@ def start_pips(argList):
         str(blockID) + " " + str(start) + " " + str(stop),
         shell=True)
 
+    uphill_wires = "wires/uphill_wires_{}.txt".format(blockID)
+    downhill_wires = "wires/downhill_wires_{}.txt".format(blockID)
+
+    # Locking to write on final file and remove the temporary one
+    MP_LOCK.acquire()
+    with open("uphill_wires.txt", "a") as wfd:
+        f = uphill_wires
+        with open(f, "r") as fd:
+            shutil.copyfileobj(fd, wfd)
+
+    with open("downhill_wires.txt", "a") as wfd:
+        f = downhill_wires
+        with open(f, "r") as fd:
+            shutil.copyfileobj(fd, wfd)
+    MP_LOCK.release()
+
+    os.remove(uphill_wires)
+    os.remove(downhill_wires)
 
 # Function called once to get the total numbers of pips to list
 def get_nb_pips():
@@ -116,20 +135,6 @@ def main(argv):
     pipsFileCount = run_pool(
         pipscount, nbPipsBlock, blockPipsSize, nbParBlock, start_pips)
 
-    print("Generating final files")
-
-    with open("uphill_wires.txt", "w") as wfd:
-        for j in range(0, pipsFileCount):
-            f = "wires/uphill_wires_" + str(j) + ".txt"
-            with open(f, "r") as fd:
-                shutil.copyfileobj(fd, wfd)
-
-    with open("downhill_wires.txt", "w") as wed:
-        for j in range(0, pipsFileCount):
-            e = "wires/downhill_wires_" + str(j) + ".txt"
-            with open(e, "r") as ed:
-                shutil.copyfileobj(ed, wed)
-
     print("Work done !")
     return 0