xcup: Enable global clock routing

.gitmodules

@@ -12,4 +12,4 @@
 	url = https://github.com/SymbiFlow/XilinxUnisimLibrary.git
 [submodule "third_party/python-fpga-interchange"]
 	path = third_party/python-fpga-interchange
-	url = https://github.com/SymbiFlow/python-fpga-interchange
+	url = https://github.com/gatecat/python-fpga-interchange

environment.yml

@@ -15,7 +15,7 @@ dependencies:
     - litex-hub::prjxray-tools=0.1_2842_g6867429c=20210301_104249
     - litex-hub::prjxray-db=0.0_252_g8372b58=20210622_220029
     - litex-hub::yosys=0.9_5457_gc6681508=20210615_141355_py38
-    - litex-hub::nextpnr-fpga_interchange=v0.0_3690_g2c459961=20210625_074838
+    - litex-hub::nextpnr-fpga_interchange=v0.0_3699_g1a5bb7b8=20210625_074838
     - litex-hub::iverilog=s20150603_0957_gad862020=20201120_145821
     - litex-hub::prjoxide=v0.0_376_gd0b0340=20210624_125028
     - swig

tests/common/dcp_vivado.tcl

@@ -19,7 +19,10 @@ set_property IS_ENABLED 0 [get_drc_checks {NSTD-1}]
 # Reports
 report_utilization -file $::env(OUTPUT_DIR)/utilization.rpt
 report_clock_utilization -file $::env(OUTPUT_DIR)/clock_utilization.rpt
-report_timing_summary -datasheet -max_paths 10 -file $::env(OUTPUT_DIR)/timing_summary.rpt
+if { $::env(ARCH) != "xcup" } {
+	# This segfaults Vivado on the counter-zcu104 example...
+	report_timing_summary -datasheet -max_paths 10 -file $::env(OUTPUT_DIR)/timing_summary.rpt
+}
 report_power -file $::env(OUTPUT_DIR)/power.rpt
 report_route_status -file $::env(OUTPUT_DIR)/route_status.rpt
 

tests/common/remap_xcup.v

@@ -17,3 +17,9 @@ module BUF(input I, output O);
 LUT1 #(.INIT(2'b10)) _TECHMAP_REPLACE_ (.I0(I), .O(O));
 
 endmodule
+
+module BUFG(input I, output O);
+
+BUFGCE #(.SIM_DEVICE("ULTRASCALE_PLUS")) _TECHMAP_REPLACE_ (.I(I), .CE(1'b1), .O(O));
+
+endmodule

tests/common/synth_xcup.tcl

@@ -4,7 +4,7 @@ foreach src $::env(SOURCES) {
     read_verilog $src
 }
 
-synth_xilinx -flatten -noclkbuf -nolutram -nowidelut -nosrl -nocarry -nodsp -arch xcup
+synth_xilinx -flatten -nolutram -nowidelut -nosrl -nocarry -nodsp -arch xcup
 
 if { $::env(TECHMAP) != "" } {
     techmap -map $::env(TECHMAP)