Skip to content

Commit

Permalink
First version of a reduced split FPGA2 project
Browse files Browse the repository at this point in the history
  • Loading branch information
Anders Ryd committed Jan 28, 2025
1 parent 54688a1 commit d3083d4
Show file tree
Hide file tree
Showing 13 changed files with 1,620 additions and 171 deletions.
3 changes: 2 additions & 1 deletion IntegrationTests/CombinedConfig_FPGA2/script/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ FIRMWARE=$(shell git rev-parse --show-toplevel)

# MODIFY THESE LINES WHEN COPYING AND PASTING THIS MAKEFILE
TOP_FUNCS=$(FIRMWARE)/TopFunctions/CombinedConfig_FPGA2
MODULES=ProjectionCalculator_L1L2ABC ProjectionCalculator_L1L2DE ProjectionCalculator_L1L2F ProjectionCalculator_L1L2G ProjectionCalculator_L1L2HI ProjectionCalculator_L1L2JKL ProjectionCalculator_L2L3ABCD ProjectionCalculator_L3L4AB ProjectionCalculator_L3L4CD ProjectionCalculator_L5L6ABCD ProjectionCalculator_D1D2ABCD ProjectionCalculator_D3D4ABCD ProjectionCalculator_L1D1ABCD ProjectionCalculator_L1D1EFGH ProjectionCalculator_L2D1ABCD MatchProcessor_L3PHIB_E MatchProcessor_L3PHIC_E MatchProcessor_L4PHIB_E MatchProcessor_L4PHIC_E MatchProcessor_L5PHIB_E MatchProcessor_L5PHIC_E MatchProcessor_L6PHIB_E MatchProcessor_L6PHIC_E MatchProcessor_D3PHIB_E MatchProcessor_D3PHIC_E MatchProcessor_D4PHIB_E MatchProcessor_D4PHIC_E MatchProcessor_L1PHIA MatchProcessor_L1PHIB MatchProcessor_L1PHIC MatchProcessor_L1PHID MatchProcessor_L1PHIE MatchProcessor_L1PHIF MatchProcessor_L1PHIG MatchProcessor_L1PHIH MatchProcessor_L2PHIA MatchProcessor_L2PHIB MatchProcessor_L2PHIC MatchProcessor_L2PHID MatchProcessor_L3PHIA MatchProcessor_L3PHIB MatchProcessor_L3PHIC MatchProcessor_L3PHID MatchProcessor_L4PHIA MatchProcessor_L4PHIB MatchProcessor_L4PHIC MatchProcessor_L4PHID MatchProcessor_L5PHIA MatchProcessor_L5PHIB MatchProcessor_L5PHIC MatchProcessor_L5PHID MatchProcessor_L6PHIA MatchProcessor_L6PHIB MatchProcessor_L6PHIC MatchProcessor_L6PHID MatchProcessor_D1PHIA MatchProcessor_D1PHIB MatchProcessor_D1PHIC MatchProcessor_D1PHID MatchProcessor_D2PHIA MatchProcessor_D2PHIB MatchProcessor_D2PHIC MatchProcessor_D2PHID MatchProcessor_D3PHIA MatchProcessor_D3PHIB MatchProcessor_D3PHIC MatchProcessor_D3PHID MatchProcessor_D4PHIA MatchProcessor_D4PHIB MatchProcessor_D4PHIC MatchProcessor_D4PHID MatchProcessor_D5PHIA MatchProcessor_D5PHIB MatchProcessor_D5PHIC MatchProcessor_D5PHID TrackBuilder_AAAA TrackBuilder_BBBB VMStubMERouterTop_L1PHIA VMStubMERouterTop_L1PHIB VMStubMERouterTop_L1PHIC VMStubMERouterTop_L1PHID VMStubMERouterTop_L1PHIE VMStubMERouterTop_L1PHIF VMStubMERouterTop_L1PHIG VMStubMERouterTop_L1PHIH VMStubMERouterTop_L2PHIA VMStubMERouterTop_L2PHIB VMStubMERouterTop_L2PHIC VMStubMERouterTop_L2PHID VMStubMERouterTop_L3PHIA VMStubMERouterTop_L3PHIB VMStubMERouterTop_L3PHIC VMStubMERouterTop_L3PHID VMStubMERouterTop_L4PHIA VMStubMERouterTop_L4PHIB VMStubMERouterTop_L4PHIC VMStubMERouterTop_L4PHID VMStubMERouterTop_L5PHIA VMStubMERouterTop_L5PHIB VMStubMERouterTop_L5PHIC VMStubMERouterTop_L5PHID VMStubMERouterTop_L6PHIA VMStubMERouterTop_L6PHIB VMStubMERouterTop_L6PHIC VMStubMERouterTop_L6PHID VMStubMERouterTop_D1PHIA VMStubMERouterTop_D1PHIB VMStubMERouterTop_D1PHIC VMStubMERouterTop_D1PHID VMStubMERouterTop_D2PHIA VMStubMERouterTop_D2PHIB VMStubMERouterTop_D2PHIC VMStubMERouterTop_D2PHID VMStubMERouterTop_D3PHIA VMStubMERouterTop_D3PHIB VMStubMERouterTop_D3PHIC VMStubMERouterTop_D3PHID VMStubMERouterTop_D4PHIA VMStubMERouterTop_D4PHIB VMStubMERouterTop_D4PHIC VMStubMERouterTop_D4PHID VMStubMERouterTop_D5PHIA VMStubMERouterTop_D5PHIB VMStubMERouterTop_D5PHIC VMStubMERouterTop_D5PHID
MODULES=ProjectionCalculator_L1L2ABC ProjectionCalculator_L1L2DE ProjectionCalculator_L1L2F ProjectionCalculator_L1L2G ProjectionCalculator_L1L2HI ProjectionCalculator_L1L2JKL ProjectionCalculator_L2L3ABCD ProjectionCalculator_L3L4AB ProjectionCalculator_L3L4CD ProjectionCalculator_L5L6ABCD ProjectionCalculator_D1D2ABCD ProjectionCalculator_D3D4ABCD ProjectionCalculator_L1D1ABCD ProjectionCalculator_L1D1EFGH ProjectionCalculator_L2D1ABCD MatchProcessor_L1PHIA MatchProcessor_L1PHIB MatchProcessor_L1PHIC MatchProcessor_L1PHID MatchProcessor_L1PHIE MatchProcessor_L1PHIF MatchProcessor_L1PHIG MatchProcessor_L1PHIH MatchProcessor_L2PHIA MatchProcessor_L2PHIB MatchProcessor_L2PHIC MatchProcessor_L2PHID MatchProcessor_L3PHIA MatchProcessor_L3PHIB MatchProcessor_L3PHIC MatchProcessor_L3PHID MatchProcessor_L4PHIA MatchProcessor_L4PHIB MatchProcessor_L4PHIC MatchProcessor_L4PHID MatchProcessor_L5PHIA MatchProcessor_L5PHIB MatchProcessor_L5PHIC MatchProcessor_L5PHID MatchProcessor_L6PHIA MatchProcessor_L6PHIB MatchProcessor_L6PHIC MatchProcessor_L6PHID MatchProcessor_D1PHIA MatchProcessor_D1PHIB MatchProcessor_D1PHIC MatchProcessor_D1PHID MatchProcessor_D2PHIA MatchProcessor_D2PHIB MatchProcessor_D2PHIC MatchProcessor_D2PHID MatchProcessor_D3PHIA MatchProcessor_D3PHIB MatchProcessor_D3PHIC MatchProcessor_D3PHID MatchProcessor_D4PHIA MatchProcessor_D4PHIB MatchProcessor_D4PHIC MatchProcessor_D4PHID MatchProcessor_D5PHIA MatchProcessor_D5PHIB MatchProcessor_D5PHIC MatchProcessor_D5PHID TrackBuilder_AAAA TrackBuilder_BBBB VMStubMERouterTop_L1PHIA VMStubMERouterTop_L1PHIB VMStubMERouterTop_L1PHIC VMStubMERouterTop_L1PHID VMStubMERouterTop_L1PHIE VMStubMERouterTop_L1PHIF VMStubMERouterTop_L1PHIG VMStubMERouterTop_L1PHIH VMStubMERouterTop_L2PHIA VMStubMERouterTop_L2PHIB VMStubMERouterTop_L2PHIC VMStubMERouterTop_L2PHID VMStubMERouterTop_L3PHIA VMStubMERouterTop_L3PHIB VMStubMERouterTop_L3PHIC VMStubMERouterTop_L3PHID VMStubMERouterTop_L4PHIA VMStubMERouterTop_L4PHIB VMStubMERouterTop_L4PHIC VMStubMERouterTop_L4PHID VMStubMERouterTop_L5PHIA VMStubMERouterTop_L5PHIB VMStubMERouterTop_L5PHIC VMStubMERouterTop_L5PHID VMStubMERouterTop_L6PHIA VMStubMERouterTop_L6PHIB VMStubMERouterTop_L6PHIC VMStubMERouterTop_L6PHID VMStubMERouterTop_D1PHIA VMStubMERouterTop_D1PHIB VMStubMERouterTop_D1PHIC VMStubMERouterTop_D1PHID VMStubMERouterTop_D2PHIA VMStubMERouterTop_D2PHIB VMStubMERouterTop_D2PHIC VMStubMERouterTop_D2PHID VMStubMERouterTop_D3PHIA VMStubMERouterTop_D3PHIB VMStubMERouterTop_D3PHIC VMStubMERouterTop_D3PHID VMStubMERouterTop_D4PHIA VMStubMERouterTop_D4PHIB VMStubMERouterTop_D4PHIC VMStubMERouterTop_D4PHID VMStubMERouterTop_D5PHIA VMStubMERouterTop_D5PHIB VMStubMERouterTop_D5PHIC VMStubMERouterTop_D5PHID

#MatchProcessor_L3PHIB_E MatchProcessor_L3PHIC_E MatchProcessor_L4PHIB_E MatchProcessor_L4PHIC_E MatchProcessor_L5PHIB_E MatchProcessor_L5PHIC_E MatchProcessor_L6PHIB_E MatchProcessor_L6PHIC_E MatchProcessor_D3PHIB_E MatchProcessor_D3PHIC_E MatchProcessor_D4PHIB_E MatchProcessor_D4PHIC_E

# Include rules for making the project.
include $(FIRMWARE)/IntegrationTests/common/script/Makefile.mk
24 changes: 12 additions & 12 deletions IntegrationTests/CombinedConfig_FPGA2/script/makeProject.tcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,18 @@ create_ip -name MatchProcessor_D5PHIA -module_name MP_D5PHIA -vendor xilinx.com
create_ip -name MatchProcessor_D5PHIB -module_name MP_D5PHIB -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D5PHIC -module_name MP_D5PHIC -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D5PHID -module_name MP_D5PHID -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L3PHIB_E -module_name MP_L3PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L3PHIC_E -module_name MP_L3PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L4PHIB_E -module_name MP_L4PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L4PHIC_E -module_name MP_L4PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L5PHIB_E -module_name MP_L5PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L5PHIC_E -module_name MP_L5PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L6PHIB_E -module_name MP_L6PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_L6PHIC_E -module_name MP_L6PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D3PHIB_E -module_name MP_D3PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D3PHIC_E -module_name MP_D3PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D4PHIB_E -module_name MP_D4PHIB_E -vendor xilinx.com -library hls -version 1.0
create_ip -name MatchProcessor_D4PHIC_E -module_name MP_D4PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L3PHIB_E -module_name MP_L3PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L3PHIC_E -module_name MP_L3PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L4PHIB_E -module_name MP_L4PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L4PHIC_E -module_name MP_L4PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L5PHIB_E -module_name MP_L5PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L5PHIC_E -module_name MP_L5PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L6PHIB_E -module_name MP_L6PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_L6PHIC_E -module_name MP_L6PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_D3PHIB_E -module_name MP_D3PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_D3PHIC_E -module_name MP_D3PHIC_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_D4PHIB_E -module_name MP_D4PHIB_E -vendor xilinx.com -library hls -version 1.0
#create_ip -name MatchProcessor_D4PHIC_E -module_name MP_D4PHIC_E -vendor xilinx.com -library hls -version 1.0
create_ip -name TrackBuilder_AAAA -module_name TB_AAAA -vendor xilinx.com -library hls -version 1.0
create_ip -name TrackBuilder_BBBB -module_name TB_BBBB -vendor xilinx.com -library hls -version 1.0

Expand Down
10 changes: 10 additions & 0 deletions IntegrationTests/ReducedCombinedConfig_FPGA2/script/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Define base directory of firmware-hls clone.
FIRMWARE=$(shell git rev-parse --show-toplevel)

# MODIFY THESE LINES WHEN COPYING AND PASTING THIS MAKEFILE
TOP_FUNCS=$(FIRMWARE)/TopFunctions/ReducedCombinedConfig
MODULES=ProjectionCalculator_L5L6ABCD MatchProcessor_L1PHIA MatchProcessor_L1PHIB MatchProcessor_L1PHIC MatchProcessor_L1PHID MatchProcessor_L1PHIE MatchProcessor_L1PHIF MatchProcessor_L1PHIG MatchProcessor_L1PHIH MatchProcessor_L2PHIA MatchProcessor_L2PHIB MatchProcessor_L2PHIC MatchProcessor_L2PHID MatchProcessor_L3PHIA MatchProcessor_L3PHIB MatchProcessor_L3PHIC MatchProcessor_L3PHID MatchProcessor_L4PHIA MatchProcessor_L4PHIB MatchProcessor_L4PHIC MatchProcessor_L4PHID TrackBuilder_AAAA VMStubMERouterTop_L1PHIA VMStubMERouterTop_L1PHIB VMStubMERouterTop_L1PHIC VMStubMERouterTop_L1PHID VMStubMERouterTop_L1PHIE VMStubMERouterTop_L1PHIF VMStubMERouterTop_L1PHIG VMStubMERouterTop_L1PHIH VMStubMERouterTop_L2PHIA VMStubMERouterTop_L2PHIB VMStubMERouterTop_L2PHIC VMStubMERouterTop_L2PHID VMStubMERouterTop_L3PHIA VMStubMERouterTop_L3PHIB VMStubMERouterTop_L3PHIC VMStubMERouterTop_L3PHID VMStubMERouterTop_L4PHIA VMStubMERouterTop_L4PHIB VMStubMERouterTop_L4PHIC VMStubMERouterTop_L4PHID
#MODULES=MatchProcessor_L1PHIC

# Include rules for making the project.
include $(FIRMWARE)/IntegrationTests/common/script/Makefile.mk
Loading

0 comments on commit d3083d4

Please sign in to comment.