Improvements to ease non-free synthesis flow

pulp-platform · Jul 26, 2024 · 0fa54bc · 0fa54bc
1 parent 39b48ff
commit 0fa54bc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -80,28 +80,28 @@ packages:
     - fpnew
     - tech_cells_generic
   cv32e40x:
-    revision: null
+    revision: fe5e7f41ad284b5aee583a727503bb6f1097daab
     version: null
     source:
-      Path: working_dir/cv32e40x
+      Git: https://github.com/pulp-platform/cv32e40x.git
     dependencies: []
-  decimate-xifu:
-    revision: null
-    version: null
-    source:
-      Path: working_dir/decimate-xifu
-    dependencies:
-    - cv32e40x
   fir-hwpe:
-    revision: null
-    version: null
+    revision: 0397301c727e2f232e0f508fbdc13401c023fa26
+    version: 2.0.2
     source:
-      Path: working_dir/fir-hwpe
+      Git: https://github.com/pulp-platform/fir-hwpe.git
     dependencies:
     - hci
     - hwpe-ctrl
     - hwpe-stream
     - zeroriscy
+  fir-xifu:
+    revision: 2b1a71fa7310c20ae0824b93669766713ebcec88
+    version: 0.1.3
+    source:
+      Git: https://github.com/pulp-platform/fir-xifu.git
+    dependencies:
+    - cv32e40x
   fpnew:
     revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315
     version: null
@@ -196,10 +196,10 @@ packages:
     - udma_sdio
     - udma_uart
   pulp_soc:
-    revision: null
+    revision: 8c6b9dea6ba8dbdbc995efb6e0e24194d470f373
     version: null
     source:
-      Path: working_dir/pulp_soc
+      Git: https://github.com/pulp-platform/pulp_soc.git
     dependencies:
     - adv_dbg_if
     - apb
@@ -211,8 +211,8 @@ packages:
     - common_cells
     - cv32e40p
     - cv32e40x
-    - decimate-xifu
     - fir-hwpe
+    - fir-xifu
     - fpnew
     - ibex
     - jtag_pulp
@@ -226,7 +226,7 @@ packages:
     revision: null
     version: null
     source:
-      Path: working_dir/pulpissimo_essentials
+      Path: target/synthesis/bender/pulpissimo_essentials
     dependencies: []
   pulpissimo_optional_vips:
     revision: null
@@ -288,10 +288,10 @@ packages:
     dependencies:
     - common_verification
   tech_cells_gf22fdx:
-    revision: a1e4e0485afeefb905d8120b27503bf691c45725
+    revision: null
     version: null
     source:
-      Git: [email protected]:pulp-restricted/tech_cells_GF22FDX.git
+      Path: target/synthesis/bender/tech_cells
     dependencies: []
   timer_unit:
     revision: 4c69615c89db9397a9747d6f6d6a36727854f0bc

diff --git a/Bender.yml b/Bender.yml
@@ -16,16 +16,17 @@ dependencies:
   common_cells:                { git: "https://github.com/pulp-platform/common_cells.git",       version: 1.21.0 }
   apb:                         { git: "https://github.com/pulp-platform/apb.git",                version: 0.2.4 }
   jtag_pulp:                   { git: "https://github.com/pulp-platform/jtag_pulp.git",          version: 0.2.0 }
-  pulp_soc:                    { git: "https://github.com/pulp-platform/pulp_soc.git",           rev: efcl_ss-v0.2.2 } # branch fc/cv32e40x
+  pulp_soc:                    { git: "https://github.com/pulp-platform/pulp_soc.git",           rev: efcl_ss-v0.2.4 } # branch fc/cv32e40x
   tbtools:                     { git: "https://github.com/pulp-platform/tbtools.git",            version: 0.2.1 }
   tech_cells_generic:          { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.3 }
-  tech_cells_synthesis:        { path: "target/gf22fdx/bender/tech_cells" }
-  pulpissimo_essentials:       { path: "target/gf22fdx/bender/pulpissimo_essentials" }
   pulpissimo_padframe_rtl_sim: { path: "hw/padframe/pulpissimo_padframe_rtl_sim_autogen" }
   pulpissimo_padframe_fpga:    { path: "hw/padframe/pulpissimo_padframe_fpga_autogen" }
   register_interface:          { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.1 }
   generic_FLL:                 { git: "https://github.com/pulp-platform/generic_FLL.git",        version: 0.2.0 }
   apb_fll_if:                  { git: "https://github.com/pulp-platform/apb_fll_if.git",         version: 0.2.1 }
+  # the following dependencies are non-free, and will be ignored in a free setup
+  tech_cells_gf22fdx:          { path: "target/synthesis/bender/tech_cells" }
+  pulpissimo_essentials:       { path: "target/synthesis/bender/pulpissimo_essentials" }
 
 
   # Target Specific Dependencies

diff --git a/Makefile b/Makefile
@@ -25,14 +25,21 @@ endif
 include target/sim/questasim/Makefile
 include target/lint/spyglass/Makefile
 include target/fpga/Makefile
-include target/gf22fdx/synopsys/Makefile
 include $(PULPISSIMO_ROOT)/utils/utils.mk
 
+# ignore synthesis targets if only free setup available
+-include target/synthesis/Makefile
+
 .PHONY: checkout
 ## Checkout all Bender IPs
 checkout: $(PULPISSIMO_UTILS)/bender
 	$(PULPISSIMO_UTILS)/bender checkout
 
+.PHONY: checkout-synthesis
+checkout-synthesis:
+	git clone --recursive [email protected]:pulp-restricted/pulpissimo-synthesis target/synthesis
+	$(PULPISSIMO_UTILS)/bender update
+
 .PHONY: hw bootrom padframe
 ## Re-generate generated hardware IPs
 hw: bootrom padframe