[syn] Fix scripts for new vendored lowrisc_ip

Signed-off-by: Harry Callahan <hcallahan@lowrisc.org>

Author: hcallahan-lowrisc

syn/syn_yosys.sh

@@ -37,10 +37,10 @@ LR_DEP_SOURCES=(
     "../vendor/lowrisc_ip/ip/prim/rtl/prim_secded_inv_39_32_dec.sv"
     "../vendor/lowrisc_ip/ip/prim/rtl/prim_secded_inv_39_32_enc.sv"
     "../vendor/lowrisc_ip/ip/prim/rtl/prim_lfsr.sv"
-    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_generic_and2.sv"
-    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_generic_buf.sv"
-    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_generic_clock_mux2.sv"
-    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_generic_flop.sv"
+    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_and2.sv"
+    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_buf.sv"
+    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_clock_mux2.sv"
+    "../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_flop.sv"
 )
 
 mkdir -p "$LR_SYNTH_OUT_DIR/generated"
@@ -78,8 +78,9 @@ for file in ../rtl/*.sv; do
   sv2v \
     --define=SYNTHESIS --define=YOSYS \
     ../rtl/*_pkg.sv \
-    ../vendor/lowrisc_ip/ip/prim/rtl/prim_ram_1p_pkg.sv \
+    ../vendor/lowrisc_ip/ip/prim_generic/rtl/prim_ram_1p_pkg.sv \
     ../vendor/lowrisc_ip/ip/prim/rtl/prim_secded_pkg.sv \
+    ../vendor/lowrisc_ip/ip/prim/rtl/prim_util_pkg.sv \
     -I../vendor/lowrisc_ip/ip/prim/rtl \
     -I../vendor/lowrisc_ip/dv/sv/dv_utils \
     "$file" \

syn/tcl/yosys_run_synth.tcl

@@ -35,10 +35,10 @@ if { $lr_synth_ibex_secure_ibex } {
   # Place keep_hierarchy contraints on relevant modules to prevent aggressive
   # synthesis optimzations across the boundaries of these modules.
   yosys "hierarchy -check -top $lr_synth_top_module"
-  yosys "setattr -mod -set keep_hierarchy 1 *prim_generic_and2*"
-  yosys "setattr -mod -set keep_hierarchy 1 *prim_generic_buf*"
-  yosys "setattr -mod -set keep_hierarchy 1 *prim_generic_clock_mux2*"
-  yosys "setattr -mod -set keep_hierarchy 1 *prim_generic_flop*"
+  yosys "setattr -mod -set keep_hierarchy 1 *prim_and2*"
+  yosys "setattr -mod -set keep_hierarchy 1 *prim_buf*"
+  yosys "setattr -mod -set keep_hierarchy 1 *prim_clock_mux2*"
+  yosys "setattr -mod -set keep_hierarchy 1 *prim_flop*"
 }
 
 yosys "synth $flatten_opt -top $lr_synth_top_module"
@@ -63,10 +63,10 @@ if { $lr_synth_timing_run } {
 if { $lr_synth_ibex_secure_ibex } {
   # Remove keep_hierarchy constraints before the final flattening step.
   # We're done optimizing.
-  yosys "setattr -mod -set keep_hierarchy 0 *prim_generic_and2*"
-  yosys "setattr -mod -set keep_hierarchy 0 *prim_generic_buf*"
-  yosys "setattr -mod -set keep_hierarchy 0 *prim_generic_clock_mux2*"
-  yosys "setattr -mod -set keep_hierarchy 0 *prim_generic_flop*"
+  yosys "setattr -mod -set keep_hierarchy 0 *prim_and2*"
+  yosys "setattr -mod -set keep_hierarchy 0 *prim_buf*"
+  yosys "setattr -mod -set keep_hierarchy 0 *prim_clock_mux2*"
+  yosys "setattr -mod -set keep_hierarchy 0 *prim_flop*"
 }
 
 # Final flattening.