symbiflow: update packages to point to the latest availables

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

CMakeLists.txt

@@ -320,7 +320,7 @@ add_custom_target(get_ispd_benchmarks
 add_custom_target(get_symbiflow_benchmarks
     COMMAND ./vtr_flow/scripts/download_symbiflow.py --vtr_flow_dir ./vtr_flow
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Downloading (~1GB) and extracting SymbiFlow architectures (~10GB) into VTR source tree.")
+    COMMENT "Downloading (~100MB) and extracting SymbiFlow architectures (~2.7GB) into VTR source tree.")
 
 #
 # Unit Testing

vtr_flow/benchmarks/symbiflow/README.md

@@ -6,4 +6,7 @@ This directory holds all the SymbiFlow benchmarks that are generated in the [Sym
 The circuits come along with the SDC constraints file, if present, and have been produced with yosys.
 They are compatible with the symbiflow architectures produced in the same Symbiflow-arch-defs build.
 
+Some of the circuites require also the place constraint files to correctly place some IOs and clock tiles
+in the correct location, so not to incur in routability issues.
+
 All the data files can be downloaded with the `make get_symbiflow_benchmarks` target in the root directory.

vtr_flow/benchmarks/symbiflow/place_constr/README.md

@@ -0,0 +1,4 @@
+Place constraints
+=================
+
+This directory contains the Place constraints files corresponding to the homonym circuit file.

vtr_flow/scripts/download_symbiflow.py

@@ -16,13 +16,9 @@
 
 GCS_URL = {
     "architectures":
-        ("https://storage.googleapis.com/symbiflow-arch-defs/artifacts/"
-         "prod/foss-fpga-tools/symbiflow-arch-defs/presubmit/install/1125/20201201-062708/"
-         "symbiflow-arch-defs-install-4f157a57.tar.xz"),
+        "https://storage.googleapis.com/symbiflow-arch-defs-gha/symbiflow-xc7a50t_test-latest",
     "benchmarks":
-        ("https://storage.googleapis.com/symbiflow-arch-defs/artifacts/"
-         "prod/foss-fpga-tools/symbiflow-arch-defs/presubmit/install/1125/20201201-062708/"
-         "symbiflow-arch-defs-benchmarks-4f157a57.tar.xz")
+        "https://storage.googleapis.com/symbiflow-arch-defs-gha/symbiflow-benchmarks-latest"
 }
 
 SYMBIFLOW_URL_MIRRORS = {"google": GCS_URL}
@@ -117,8 +113,9 @@ def download_url(filename, url):
     """
     Downloads the symbiflow release
     """
-    print("Downloading latest package:\n{}".format(url))
-    request.urlretrieve(url, filename, reporthook=download_progress_callback)
+    latest_package_url = request.urlopen(url).read().decode("utf-8")
+    print("Downloading latest package:\n{}".format(latest_package_url))
+    request.urlretrieve(latest_package_url, filename, reporthook=download_progress_callback)
 
 
 def download_progress_callback(block_num, block_size, expected_size):
@@ -183,6 +180,8 @@ def extract_to_vtr_flow_dir(args, tar_xz_filename, destination, extract_path="")
             elif fnmatch.fnmatch(src_file_path, "**/*.sdc"):
                 dst_file_path = os.path.join(symbiflow_extract_dir, "sdc", filename)
 
+            elif fnmatch.fnmatch(src_file_path, "**/*.place"):
+                dst_file_path = os.path.join(symbiflow_extract_dir, "place_constr", filename)
 
             if dst_file_path:
                 shutil.move(src_file_path, dst_file_path)

vtr_flow/scripts/python_libs/vtr/task.py

@@ -40,6 +40,7 @@ def __init__(
         script_params_list_add=None,
         pass_requirements_file=None,
         sdc_dir=None,
+        place_constr_dir=None,
         qor_parse_file=None,
         cmos_tech_behavior=None,
         pad_file=None,
@@ -60,6 +61,7 @@ def __init__(
         self.script_params_list_add = script_params_list_add
         self.pass_requirements_file = pass_requirements_file
         self.sdc_dir = sdc_dir
+        self.place_constr_dir = place_constr_dir
         self.qor_parse_file = qor_parse_file
         self.cmos_tech_behavior = cmos_tech_behavior
         self.pad_file = pad_file
@@ -180,6 +182,7 @@ def load_task_config(config_file):
             "script_params_common",
             "pass_requirements_file",
             "sdc_dir",
+            "place_constr_dir",
             "qor_parse_file",
             "cmos_tech_behavior",
             "pad_file",
@@ -355,6 +358,19 @@ def create_jobs(args, configs, longest_name=0, longest_arch_circuit=0, after_run
                 except InspectError:
                     pass
 
+            if config.place_constr_dir:
+                place_constr_name = "{}.place".format(Path(circuit).stem)
+                try:
+                    place_constr_file = resolve_vtr_source_file(
+                        config, place_constr_name, config.place_constr_dir)
+
+                    cmd += [
+                        "--fix_clusters",
+                        "{}".format(place_constr_file)
+                    ]
+                except InspectError:
+                    pass
+
             parse_cmd = None
             second_parse_cmd = None
             qor_parse_command = None

vtr_flow/tasks/regression_tests/vtr_reg_nightly/symbiflow/config/config.txt

@@ -8,6 +8,9 @@ circuits_dir=benchmarks/symbiflow
 # SDC directory
 sdc_dir=benchmarks/symbiflow/sdc
 
+# Place constraints directory
+place_constr_dir=benchmarks/symbiflow/place_constr
+
 # Path to directory of architectures to use
 archs_dir=arch/symbiflow
 
@@ -18,6 +21,10 @@ circuit_list_add=murax_basys3_full_100.eblif
 circuit_list_add=murax_basys3_full_50.eblif
 circuit_list_add=picosoc_basys3_full_100.eblif
 circuit_list_add=picosoc_basys3_full_50.eblif
+circuit_list_add=linux_arty.eblif
+circuit_list_add=minilitex_arty.eblif
+circuit_list_add=minilitex_ddr_arty.eblif
+circuit_list_add=minilitex_ddr_eth_arty.eblif
 
 # Add architectures to list to sweep
 arch_list_add=arch.timing.xml