diff --git a/openfpga_flow/openfpga_timing_annotation/skywater130nm.yml b/openfpga_flow/openfpga_timing_annotation/skywater130nm.yml
index ab976c6bb..31061e930 100644
--- a/openfpga_flow/openfpga_timing_annotation/skywater130nm.yml
+++ b/openfpga_flow/openfpga_timing_annotation/skywater130nm.yml
@@ -22,5 +22,68 @@ LUT3_DELAY: 0.92e-9
LUT3_OUT_TO_FLE_OUT_DELAY: 1.44e-9
LUT4_DELAY: 1.21e-9
LUT4_OUT_TO_FLE_OUT_DELAY: 1.46e-9
+LUT5_DELAY: 235e-12 # LUT5_DELAY NOT ACCURATE
+LUT5_OUT_TO_FLE_OUT_DELAY: 25e-12 # LUT5_OUT_TO_FLE_OUT_DELAY NOT ACCURATE
+LUT6_DELAY: 235e-12 # LUT6_DELAY NOT ACCURATE
+LUT6_OUT_TO_FLE_OUT_DELAY: 25e-12 # LUT6_OUT_TO_FLE_OUT_DELAY NOT ACCURATE
REGIN_TO_FF0_DELAY: 1.12e-9
-FF0_TO_FF1_DELAY: 0.56e-9
\ No newline at end of file
+FF0_TO_FF1_DELAY: 0.56e-9
+
+CROSSBAR_I_TO_FLE_IN_DELAY: 95e-12 # CROSSBAR_I_TO_FLE_IN_DELAY NOT ACCURATE
+CROSSBAR_FLE_OUT_TO_FLE_IN_DELAY: 95e-12 # FLE_OUT_TO_FLE_IN_DELAY NOT ACCURATE
+
+CLB_CIN_TO_FLE_CIN: 0.16e-9 # CLB_CIN_TO_FLE_CIN NOT ACCURATE
+
+
+
+################# Adder Delays #################
+
+ADDER_LUT4_CIN2OUT_DELAY: 1.21e-9
+ADDER_LUT4_CIN2COUT_DELAY: 1.21e-9
+ADDER_LUT4_IN2OUT_DELAY: 1.21e-9
+ADDER_LUT4_IN2COUT_DELAY: 1.21e-9
+
+ARITHMETIC_ADDER_OUT_TO_ARITHMETIC_OUT: 25e-12
+ARITHMETIC_FF_OUT_TO_ARITHMETIC_OUT: 45e-12
+
+
+
+################# MULT9 Delays #################
+
+MULT9_A2Y_DELAY_MAX: 1.523e-9
+MULT9_A2Y_DELAY_MIN: 0.776e-9
+MULT9_B2Y_DELAY_MAX: 1.523e-9
+MULT9_B2Y_DELAY_MIN: 0.776e-9
+
+
+
+################# MULT18 Delays #################
+
+MULT18_A2Y_DELAY_MAX: 1.523e-9
+MULT18_A2Y_DELAY_MIN: 0.776e-9
+MULT18_B2Y_DELAY_MAX: 1.523e-9
+MULT18_B2Y_DELAY_MIN: 0.776e-9
+MULT18_SLICE_A2A_DELAY_MAX: 134e-12 # MULT18_SLICE_A2A_DELAY_MAX NOT ACCURATE
+MULT18_SLICE_A2A_DELAY_MIN: 74e-12 # MULT18_SLICE_A2A_DELAY_MIN NOT ACCURATE
+MULT18_SLICE_B2B_DELAY_MAX: 134e-12 # MULT18_SLICE_B2B_DELAY_MAX NOT ACCURATE
+MULT18_SLICE_B2B_DELAY_MIN: 74e-12 # MULT18_SLICE_B2B_DELAY_MIN NOT ACCURATE
+MULT18_SLICE_OUT2OUT_DELAY_MAX: 1.93e-9 # MULT18_SLICE_OUT2OUT_DELAY_MAX NOT ACCURATE
+MULT18_SLICE_OUT2OUT_DELAY_MIN: 74e-12 # MULT18_SLICE_OUT2OUT_DELAY_MIN NOT ACCURATE
+
+
+
+################# BRAM Delays #################
+
+DPRAM_128x8_CLK_TO_WADDR_DELAY: 509e-12
+DPRAM_128x8_CLK_TO_RADDR_DELAY: 509e-12
+DPRAM_128x8_CLK_TO_DATA_IN_DELAY: 509e-12
+DPRAM_128x8_CLK_TO_WEN_DELAY: 509e-12
+DPRAM_128x8_CLK_TO_REN_DELAY: 509e-12
+DPRAM_128x8_CLK_TO_DATA_OUT_DELAY: 1.234e-9
+
+MEMORY_WADDR_TO_BRAM_WADDR_DELAY: 132e-12
+MEMORY_RADDR_TO_BRAM_RADDR_DELAY: 132e-12
+MEMORY_DATA_IN_TO_BRAM_DATA_IN_DELAY: 132e-12
+MEMORY_WEN_TO_BRAM_WEN_DELAY: 132e-12
+MEMORY_REN_TO_BRAM_REN_DELAY: 132e-12
+BRAM_DATA_OUT_TO_MEMORY_DATA_OUT_DELAY: 40e-12
\ No newline at end of file
diff --git a/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram1K_dsp18_fracff_skywater130nm.xml b/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram1K_dsp18_fracff_skywater130nm.xml
index 081680026..a967f67a3 100644
--- a/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram1K_dsp18_fracff_skywater130nm.xml
+++ b/openfpga_flow/vpr_arch/k6_frac_N10_tileable_adder_chain_dpram1K_dsp18_fracff_skywater130nm.xml
@@ -399,10 +399,10 @@
-
+
-
+
@@ -418,7 +418,7 @@
-
+
@@ -428,7 +428,7 @@
-
+
@@ -507,10 +507,10 @@
-
-
-
-
+
+
+
+
@@ -519,12 +519,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -541,13 +541,13 @@
-
-
+
+
-
-
+
+
@@ -584,11 +584,11 @@
398e-12
-->
- 235e-12
- 235e-12
- 235e-12
- 235e-12
- 235e-12
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
@@ -603,8 +603,8 @@
-
-
+
+
@@ -617,8 +617,8 @@
-
-
+
+
@@ -632,9 +632,9 @@
-
-
-
+
+
+
@@ -649,9 +649,9 @@
-
-
-
+
+
+
@@ -666,9 +666,9 @@
-
-
-
+
+
+
@@ -683,9 +683,9 @@
-
-
-
+
+
+
@@ -704,8 +704,8 @@
-
-
+
+
@@ -742,10 +742,10 @@
263e-12
-->
- 195e-12
- 195e-12
- 195e-12
- 195e-12
+ ${LUT4_DELAY}
+ ${LUT4_DELAY}
+ ${LUT4_DELAY}
+ ${LUT4_DELAY}
@@ -754,12 +754,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -773,8 +773,8 @@
-
-
+
+
@@ -787,8 +787,8 @@
-
-
+
+
@@ -802,9 +802,9 @@
-
-
-
+
+
+
@@ -819,9 +819,9 @@
-
-
-
+
+
+
@@ -836,9 +836,9 @@
-
-
-
+
+
+
@@ -853,9 +853,9 @@
-
-
-
+
+
+
@@ -885,8 +885,8 @@
-
-
+
+
@@ -930,12 +930,12 @@
397e-12
-->
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
@@ -950,8 +950,8 @@
-
-
+
+
@@ -964,8 +964,8 @@
-
-
+
+
@@ -979,9 +979,9 @@
-
-
-
+
+
+
@@ -996,9 +996,9 @@
-
-
-
+
+
+
@@ -1013,9 +1013,9 @@
-
-
-
+
+
+
@@ -1030,9 +1030,9 @@
-
-
-
+
+
+
@@ -1051,8 +1051,8 @@
-
-
+
+
@@ -1077,8 +1077,8 @@
25 ps to do so, we subtract 25 ps from the 100 ps delay of a feedback
to get the part that should be marked on the crossbar. -->
-
-
+
+
@@ -1097,7 +1097,7 @@
-
+
@@ -1123,8 +1123,8 @@
-
-
+
+
@@ -1147,13 +1147,13 @@
The interconnect difference for DSP blocks is 0.5523, which leads to a minimum delay of 74 ps
-->
-
+
-
+
-
+
@@ -1183,12 +1183,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1196,22 +1196,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/openfpga_flow/vpr_arch/k6_frac_N10_tileable_chain_dpram1K_dsp18_fracff_skywater130nm.xml b/openfpga_flow/vpr_arch/k6_frac_N10_tileable_chain_dpram1K_dsp18_fracff_skywater130nm.xml
index 0009de0c3..cdec844f1 100644
--- a/openfpga_flow/vpr_arch/k6_frac_N10_tileable_chain_dpram1K_dsp18_fracff_skywater130nm.xml
+++ b/openfpga_flow/vpr_arch/k6_frac_N10_tileable_chain_dpram1K_dsp18_fracff_skywater130nm.xml
@@ -380,10 +380,10 @@
-
+
-
+
@@ -399,7 +399,7 @@
-
+
@@ -409,7 +409,7 @@
-
+
@@ -482,10 +482,10 @@
-
-
-
-
+
+
+
+
@@ -495,13 +495,13 @@
-
-
+
+
-
-
+
+
@@ -536,11 +536,11 @@
398e-12
-->
- 235e-12
- 235e-12
- 235e-12
- 235e-12
- 235e-12
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
+ ${LUT5_DELAY}
@@ -555,8 +555,8 @@
-
-
+
+
@@ -569,8 +569,8 @@
-
-
+
+
@@ -584,9 +584,9 @@
-
-
-
+
+
+
@@ -601,9 +601,9 @@
-
-
-
+
+
+
@@ -618,9 +618,9 @@
-
-
-
+
+
+
@@ -635,9 +635,9 @@
-
-
-
+
+
+
@@ -656,8 +656,8 @@
-
-
+
+
@@ -694,12 +694,12 @@
397e-12
-->
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
+ ${LUT6_DELAY}
@@ -714,8 +714,8 @@
-
-
+
+
@@ -728,8 +728,8 @@
-
-
+
+
@@ -743,9 +743,9 @@
-
-
-
+
+
+
@@ -760,9 +760,9 @@
-
-
-
+
+
+
@@ -777,9 +777,9 @@
-
-
-
+
+
+
@@ -794,9 +794,9 @@
-
-
-
+
+
+
@@ -815,8 +815,8 @@
-
-
+
+
@@ -841,8 +841,8 @@
25 ps to do so, we subtract 25 ps from the 100 ps delay of a feedback
to get the part that should be marked on the crossbar. -->
-
-
+
+
@@ -875,8 +875,8 @@
-
-
+
+
@@ -899,13 +899,13 @@
The interconnect difference for DSP blocks is 0.5523, which leads to a minimum delay of 74 ps
-->
-
+
-
+
-
+
@@ -935,12 +935,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -948,22 +948,22 @@
-
+
-
+
-
+
-
+
-
+
-
+