Emp updates

IntegrationTests/DualFPGA/firmware/Makefile

@@ -6,11 +6,11 @@ input_file_fpga2 = mem/in_fpga2.txt
 fpga1_hls_script_path = ../../CombinedConfig_FPGA1/script 
 fpga2_hls_script_path = ../../CombinedConfig_FPGA2/script
 
-all: add_common_files $(core_file_fpga1) $(core_file_fpga2) hdl_add_files_fpga1 hdl_add_files_fpga2 xciCreation_fpga1 xciCreation_fpga2 kfin_adj $(input_file_fpga1) $(input_file_fpga2) apollo_input_fpga1 apollo_input_fpga2 
+all: add_common_files $(core_file_fpga1) $(core_file_fpga2) hdl_add_files_fpga1 hdl_add_files_fpga2 xciCreation_fpga1 xciCreation_fpga2 kfin_adj $(input_file_fpga1) $(input_file_fpga2)
 
-fpga1: add_common_files $(core_file_fpga1) hdl_add_files_fpga1 xciCreation_fpga1 kfin_adj $(input_file_fpga1) apollo_input_fpga1
+fpga1: add_common_files $(core_file_fpga1) hdl_add_files_fpga1 xciCreation_fpga1 kfin_adj $(input_file_fpga1)
 
-fpga2: add_common_files $(core_file_fpga2) hdl_add_files_fpga2 xciCreation_fpga2 kfin_adj $(input_file_fpga2) apollo_input_fpga2 
+fpga2: add_common_files $(core_file_fpga2) hdl_add_files_fpga2 xciCreation_fpga2 kfin_adj $(input_file_fpga2)
 
 $(core_dir):
 	@mkdir cgn mem
@@ -51,15 +51,9 @@ hdl_add_files_fpga2: $(core_file)
 	cd hdl; ln -s ../../../CombinedConfig_FPGA2/hdl/memUtil_pkg.vhd memUtil_pkg_f2.vhd
 
 $(input_file_fpga1): $(core_dir)
-	@python3 scripts/convert_emData2EMP_Link.py -d mem/MemPrintsSplit/InputStubs -o $(input_file_fpga1)
+	@python3 scripts/generate_fpga1_input.py -i mem/MemPrintsSplit/ -o $(input_file_fpga1)
 
 $(input_file_fpga2): $(core_dir)
-	@python3 scripts/convert_emData2EMP_Link_FPGA2.py -d mem/MemPrintsSplit/ -o $(input_file_fpga2)
+	@python3 scripts/generate_fpga2_input.py -i mem/MemPrintsSplit/ -o $(input_file_fpga2)
 
-apollo_input_fpga1: $(input_file_fpga1)
-	@python3 scripts/split_emp_input.py -i $(input_file_fpga1) -o mem/in_fpga1_
-
-apollo_input_fpga2: $(input_file_fpga2)
-	@python3 scripts/split_emp_input.py -i $(input_file_fpga2) -o mem/in_fpga2_
-
-.PHONY: all fpga1 fpga2 add_common_files hdl_add_files_fpga1 hdl_add_files_fpga2 xciCreation_fpga1 xciCreation_fpga2 kfin_adj apollo_input_fpga1 apollo_input_fpga2 
+.PHONY: all fpga1 fpga2 add_common_files hdl_add_files_fpga1 hdl_add_files_fpga2 xciCreation_fpga1 xciCreation_fpga2 kfin_adj

IntegrationTests/DualFPGA/firmware/cfg/payload_f1.dep

@@ -12,14 +12,16 @@ src conv_pkg_f1.vhd
 include -c firmware-hls:KalmanFilter/common components.dep 
 
 #Track Builder dependencies
-src common/hdl/CreateStartSignal.vhd
 #src --vhdl2008 common/hdl/tf_lut.vhd
 src --vhdl2008 common/hdl/tf_mem_bin.vhd
 src --vhdl2008 common/hdl/tf_mem_format.vhd
 src --vhdl2008 common/hdl/tf_mem.vhd
 src --vhdl2008 common/hdl/tf_merge_streamer.vhd
 src common/hdl/tf_pkg.vhd
-src --vhdl2008 common/hdl/tf_pipe_delay.vhd
+src --vhdl2008 common/hdl/pipelining.vhd
+
+#Floorplan
+src ../ucf/floorplan_f1.tcl
 
 ################
 # Include Cores

IntegrationTests/DualFPGA/firmware/cfg/payload_f2.dep

@@ -18,7 +18,6 @@ include -c firmware-hls:KalmanFilter/tq components.dep
 include -c firmware-hls:KalmanFilter/common components.dep 
 
 #Tracklet dependencies
-src common/hdl/CreateStartSignal.vhd
 #src --vhdl2008 common/hdl/tf_lut.vhd
 src --vhdl2008 common/hdl/tf_mem_bin.vhd
 src --vhdl2008 common/hdl/tf_mem_format.vhd
@@ -27,7 +26,7 @@ src --vhdl2008 common/hdl/tf_mem_tproj.vhd
 src --vhdl2008 common/hdl/tf_mem_tpar.vhd
 src --vhdl2008 common/hdl/mem_reader.vhd
 src common/hdl/tf_pkg.vhd
-src --vhdl2008 common/hdl/tf_pipe_delay.vhd
+src --vhdl2008 common/hdl/pipelining.vhd
 
 #Floorplan
 src ../ucf/floorplan_f2.tcl

IntegrationTests/DualFPGA/firmware/hdl/emp_project_decl_f1.vhd

@@ -19,43 +19,43 @@ package emp_project_decl is
   constant CLOCK_AUX_DIV      : clock_divisor_array_t := (18, 9, 4);  -- Dividers of CLOCK_COMMON_RATIO * 40 MHz
 
   -- Readdjust if latency changes for FPGA1 algorithm
-  constant PAYLOAD_LATENCY : integer := 140;
+  constant PAYLOAD_LATENCY : integer := 399;
 
   -- F1 transmits to F2 on inter-fpga links
   constant REGION_CONF : region_conf_array_t := (
      0   => kDummyRegion,                     -- service c2c
-     1   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     2   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     3   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
+     1   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     2   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     3   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
      4   => kDummyRegion,                     -- not routed
-     5   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     6   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     7   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     8   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-     9   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-    10   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-    11   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-    12   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-    13   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
-    14   => (no_mgt, no_buf, no_fmt, buf, gty25), -- fpga-fpga
+     5   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     6   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     7   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     8   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+     9   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+    10   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+    11   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+    12   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+    13   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
+    14   => (no_mgt, no_buf, no_fmt, buf, csp25), -- fpga-fpga
     15   => kDummyRegion,                     -- not routed
 ------cross
 ----- all MGTs instantiated bidirectionally for now
     16  => kDummyRegion,                      -- not routed
-    17  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    18  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    19  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
+    17  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    18  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    19  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
     20  => kDummyRegion,                      -- not routed                  
-    21  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    22  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    23  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    24  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    25  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    26  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    27  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    28  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    29  => (gty25, buf, no_fmt, buf, gty25),  -- firefly
-    30  => (gty25, buf, no_fmt, buf, gty25),  -- firefly     
+    21  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    22  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    23  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    24  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    25  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    26  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    27  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    28  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    29  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly
+    30  => (csp25, buf, no_fmt, no_buf, no_mgt),  -- firefly     
     31  => kDummyRegion,                      -- service tcds
 
     others => kDummyRegion

IntegrationTests/DualFPGA/firmware/hdl/emp_project_decl_f2.vhd

@@ -18,26 +18,25 @@ package emp_project_decl is
   constant CLOCK_RATIO        : integer               := 6;
   constant CLOCK_AUX_DIV      : clock_divisor_array_t := (18, 9, 4);  -- Dividers of CLOCK_COMMON_RATIO * 40 MHz
 
-  -- Only used by nullalgo   
-  constant PAYLOAD_LATENCY : integer := 891; --was 823
+  constant PAYLOAD_LATENCY : integer := 711; 
 
   -- F2 receives from F1 on inter-fpga links
   constant REGION_CONF : region_conf_array_t := (
      0   => kDummyRegion,                     -- service c2c
-     1   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     2   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     3   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     4   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     5   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     6   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     7   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     8   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-     9   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-    10   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     1   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     2   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     3   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     4   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     5   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     6   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     7   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     8   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+     9   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+    10   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
     11   => kDummyRegion,                         -- not routed
-    12   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-    13   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
-    14   => (gty25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+    12   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+    13   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
+    14   => (csp25, buf, no_fmt, no_buf, no_mgt), -- fpga-fpga
     15   => kDummyRegion,                         -- not routed
 ------cross
 ----- all MGTs instantiated bidirectionally for now
@@ -48,7 +47,7 @@ package emp_project_decl is
     20  => kDummyRegion,                      -- not routed                  
     21  => (no_mgt, no_buf, no_fmt, no_buf, no_mgt),  -- firefly
     22  => (no_mgt, no_buf, no_fmt, no_buf, no_mgt),  -- firefly
-    23  => (no_mgt, no_buf, no_fmt, buf,    gty25),  -- firefly
+    23  => (no_mgt, no_buf, no_fmt, buf,    csp25),  -- firefly
     24  => (no_mgt, no_buf, no_fmt, no_buf, no_mgt),  -- firefly
     25  => (no_mgt, no_buf, no_fmt, no_buf, no_mgt),  -- firefly
     26  => (no_mgt, no_buf, no_fmt, no_buf, no_mgt),  -- firefly