From 72d8d203568e75084a37c995150df267623d7838 Mon Sep 17 00:00:00 2001
From: Tarachand Pagarani <tpagarani@quicklogic.com>
Date: Sun, 17 Jan 2021 23:54:39 -0800
Subject: [PATCH] 1. Add 4 clocks to IO interfaces 2. Mux the clock with the
 output for sending the clock out of the FPGA

---
 ...ravel_io_skywater130nm_fdhd_cc_openfpga.xml |  8 ++++----
 ...an_chain_nonLR_caravel_io_skywater130nm.xml | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ARCH/openfpga_arch_template/k4_N8_reset_softadder_register_scan_chain_caravel_io_skywater130nm_fdhd_cc_openfpga.xml b/ARCH/openfpga_arch_template/k4_N8_reset_softadder_register_scan_chain_caravel_io_skywater130nm_fdhd_cc_openfpga.xml
index 374fce6..71f86a1 100644
--- a/ARCH/openfpga_arch_template/k4_N8_reset_softadder_register_scan_chain_caravel_io_skywater130nm_fdhd_cc_openfpga.xml
+++ b/ARCH/openfpga_arch_template/k4_N8_reset_softadder_register_scan_chain_caravel_io_skywater130nm_fdhd_cc_openfpga.xml
@@ -370,10 +370,10 @@ foundry middle-speed (ms) standard cell library
   <tile_annotations>
     <global_port name="clk" is_clock="true" default_val="0">
       <tile name="clb" port="clk[0:3]" x="-1" y="-1"/>
-      <tile name="io_top" port="clk" x="-1" y="-1"/>
-      <tile name="io_right" port="clk" x="-1" y="-1"/>
-      <tile name="io_bottom" port="clk" x="-1" y="-1"/>
-      <tile name="io_left" port="clk" x="-1" y="-1"/>
+      <tile name="io_top" port="clk[0:3]" x="-1" y="-1"/>
+      <tile name="io_right" port="clk[0:3]" x="-1" y="-1"/>
+      <tile name="io_bottom" port="clk[0:3]" x="-1" y="-1"/>
+      <tile name="io_left" port="clk[0:3]" x="-1" y="-1"/>
     </global_port>
     <global_port name="reset" is_reset="true" default_val="0">
       <tile name="clb" port="reset" x="-1" y="-1"/>
diff --git a/ARCH/vpr_arch/k4_N8_tileable_reset_softadder_register_scan_chain_nonLR_caravel_io_skywater130nm.xml b/ARCH/vpr_arch/k4_N8_tileable_reset_softadder_register_scan_chain_nonLR_caravel_io_skywater130nm.xml
index 1c7155e..a43deaa 100644
--- a/ARCH/vpr_arch/k4_N8_tileable_reset_softadder_register_scan_chain_nonLR_caravel_io_skywater130nm.xml
+++ b/ARCH/vpr_arch/k4_N8_tileable_reset_softadder_register_scan_chain_nonLR_caravel_io_skywater130nm.xml
@@ -76,7 +76,7 @@ Authors: Xifan Tang
       <equivalent_sites>
         <site pb_type="io"/>
       </equivalent_sites>
-      <clock name="clk" num_pins="1"/>
+      <clock name="clk" num_pins="4"/>
       <input name="f2a_i" num_pins="1"/>
       <output name="a2f_o" num_pins="1"/>
       <input name="sc_in" num_pins="1"/>
@@ -97,7 +97,7 @@ Authors: Xifan Tang
       <equivalent_sites>
         <site pb_type="io"/>
       </equivalent_sites>
-      <clock name="clk" num_pins="1"/>
+      <clock name="clk" num_pins="4"/>
       <input name="f2a_i" num_pins="1"/>
       <output name="a2f_o" num_pins="1"/>
       <input name="sc_in" num_pins="1"/>
@@ -118,7 +118,7 @@ Authors: Xifan Tang
       <equivalent_sites>
         <site pb_type="io"/>
       </equivalent_sites>
-      <clock name="clk" num_pins="1"/>
+      <clock name="clk" num_pins="4"/>
       <input name="f2a_i" num_pins="1"/>
       <output name="a2f_o" num_pins="1"/>
       <input name="sc_in" num_pins="1"/>
@@ -139,7 +139,7 @@ Authors: Xifan Tang
       <equivalent_sites>
         <site pb_type="io"/>
       </equivalent_sites>
-      <clock name="clk" num_pins="1"/>
+      <clock name="clk" num_pins="4"/>
       <input name="f2a_i" num_pins="1"/>
       <output name="a2f_o" num_pins="1"/>
       <input name="sc_in" num_pins="1"/>
@@ -311,7 +311,7 @@ Authors: Xifan Tang
   <complexblocklist>
     <!-- Define input pads begin -->
     <pb_type name="io">
-      <clock name="clk" num_pins="1"/>
+      <clock name="clk" num_pins="4"/>
       <input name="f2a_i" num_pins="1"/>
       <output name="a2f_o" num_pins="1"/>
       <input name="sc_in" num_pins="1"/>
@@ -350,7 +350,7 @@ Authors: Xifan Tang
             <direct name="ff[1:1]-DI" input="ff[0:0].Q" output="ff[1:1].DI"/>
             <direct name="iopad-sc_out" input="ff[1:1].Q" output="iopad.sc_out"/>
             <complete name="complete1" input="iopad.reset" output="ff[1:0].reset"/>
-            <mux name="mux1" input="iopad.f2a_i ff[0:0].Q" output="pad.outpad">
+            <mux name="mux1" input="iopad.f2a_i ff[0:0].Q iopad.clk" output="pad.outpad">
               <delay_constant max="25e-12" in_port="iopad.f2a_i" out_port="pad.outpad"/>
               <delay_constant max="45e-12" in_port="ff[0:0].Q" out_port="pad.outpad"/>
             </mux>
@@ -361,7 +361,7 @@ Authors: Xifan Tang
           </interconnect>
         </pb_type>
         <interconnect>
-          <direct name="direct1" input="io.clk" output="iopad.clk"/>
+          <complete name="clks" input="io.clk" output="iopad.clk"/>
           <direct name="direct3" input="io.f2a_i" output="iopad.f2a_i"/>
           <direct name="direct4" input="iopad.a2f_o" output="io.a2f_o"/>
           <direct name="direct6" input="io.sc_in" output="iopad.sc_in"/>
@@ -395,7 +395,7 @@ Authors: Xifan Tang
           </interconnect>
         </pb_type>
         <interconnect>
-          <direct name="io_output-clk" input="io.clk" output="io_output.clk"/>
+          <complete name="io_output-clk" input="io.clk" output="io_output.clk"/>
           <direct name="io_output-f2a_i" input="io.f2a_i" output="io_output.f2a_i"/>
         </interconnect>
       </mode>
@@ -425,7 +425,7 @@ Authors: Xifan Tang
         </pb_type>
         <interconnect>
           <direct name="io-a2f_o" input="io_input.a2f_o" output="io.a2f_o"/>
-          <direct name="io_input-clk" input="io.clk" output="io_input.clk"/>
+          <complete name="io_input-clk" input="io.clk" output="io_input.clk"/>
         </interconnect>
       </mode>
     </pb_type>