Commit Graph

423 Commits

Author SHA1 Message Date
a94bdacea9 Revert "FPGA: use 4 HBM interfaces for load and save to HBM"
This reverts commit 28a29ea3183a35d8ba0dda0628ac727f8bfe4f17.
2023-09-19 07:36:56 +02:00
1fe5c474ee FPGA: use 4 HBM interfaces for load and save to HBM 2023-09-19 07:36:56 +02:00
e041e7bf26 Revert "FPGA: double HBM latency & number of outstanding operations"
This reverts commit 0f903607a028e1827dd965b13f87f913cc81d6b1.
2023-09-19 07:36:56 +02:00
480eb5527b FPGA: double HBM latency & number of outstanding operations 2023-09-19 07:36:56 +02:00
357e2c01f6 FPGA: hbm_size_bytes is constant in action_config.v 2023-09-19 07:36:56 +02:00
6700fe54f8 FPGA: hbm_size_bytes in load_from_hbm and save_to_hbm is read after first data package is exchanged 2023-09-19 07:36:56 +02:00
5f5b59ef30 FPGA: Increase FIFO just before save_to_hbm 2023-09-19 07:36:56 +02:00
95d4844aa4 FPGA: Use both HBM pseudo-channels 2023-09-19 07:36:56 +02:00
e194d31ee1 FPGA: Add register slices 2023-09-19 07:36:56 +02:00
36cd247377 FPGA: Integrate HBM cache into the FPGA 2023-09-19 07:36:56 +02:00
2982097b8c FPGA: Use HBM as intermediary cache for images 2023-09-19 07:36:56 +02:00
5b448c1b1a GPUImageAnalysis: Fix to allow compilation without CUDA 2023-09-19 07:36:20 +02:00
4375d992ff CMake: Use static HDF5 library 2023-09-19 07:28:40 +02:00
121aef36ba recv.json: Update host address 2023-09-16 13:19:51 +02:00
e0fd52b31b jjofhc_grpc2http.py use relative directory 2023-09-16 12:57:01 +02:00
a67da96bee broker.json: Adapt to 9M 2023-09-16 12:56:41 +02:00
ca55ade211 Merge branch 'fpga_easy_recover' into 'main'
Recent updates

See merge request jungfraujoch/nextgendcu!6
2023-09-15 12:35:36 +02:00
90cd9602e2 Update slsDetectorPackage to 7.0.2
Signed-off-by: Filip Leonarski <filip.leonarski@psi.ch>
2023-09-15 12:21:31 +02:00
16bbf54f2a Remove open source license (for now) 2023-09-15 10:47:21 +02:00
46c1cebab5 Merge branch 'fpga_frame_generator' into 'fpga_easy_recover'
FPGA: Replace internal_packet_generator with frame_generator

See merge request jungfraujoch/nextgendcu!5
2023-09-15 09:53:34 +02:00
362eb62d4b FPGA: Use own function to merge streams instead of AXI-Switch + more FIFO status saved 2023-09-14 23:58:17 +02:00
7a026b89d0 FPGAIntegrationTest: Use blocking mode for one remaining test 2023-09-14 23:48:02 +02:00
0a152f7b5a PCIe driver: check Ethernet aligned twice 2023-09-14 23:43:01 +02:00
aee9d0e6fc jfjoch_action_test: Set IPv4 and MAC addresses 2023-09-14 17:54:33 +02:00
ab1a8fbfca PCIExpressDevice: Get MAC/IPv4 Address for internal packet generator via ioctl 2023-09-14 17:48:30 +02:00
48ee2ca305 FPGAAcquisitionDevice: Fix reporting of FIFO status 2023-09-14 16:31:24 +02:00
886a84ee9f PCIExpressDevice: Wrong function parameter 2023-09-14 16:16:30 +02:00
5d8a85071e PCIe driver: Fix missing return value in a function 2023-09-14 15:56:52 +02:00
aa263a329e Make test more repeatable by removing non-blocking mode in HLS simulation 2023-09-13 21:51:40 +02:00
0b95456d3d Adapt PCIe driver and tests for the new frame generator 2023-09-13 21:44:20 +02:00
f3e85deb31 FPGA: Increase PCIe BAR size to 16 MB 2023-09-13 20:55:10 +02:00
0c471b3760 FPGA: Some clean-up of frame generator 2023-09-13 20:53:55 +02:00
496d016c31 FPGA: Replace internal_packet_generator with frame_generator (generating UDP packets, instead of internal JFJoch packets) 2023-09-13 20:06:09 +02:00
95d20085dd FPGA: Use volatile variable for counter 2023-09-13 10:35:02 +02:00
33a15e87df PCIe driver: minor fixes 2023-09-13 08:00:55 +02:00
0b4320c381 PCIe driver: enable DMA 2023-09-13 07:58:20 +02:00
56993d3597 FPGA: minor clean-up of network routines 2023-09-12 21:35:37 +02:00
b7239331ac FPGA: remove script from OC-Accel 2023-09-12 21:10:15 +02:00
5e137a514a FPGA: add more FIFOs to monitoring 2023-09-12 20:35:48 +02:00
8626195091 FPGA: fix to deadlock 2023-09-12 20:09:11 +02:00
9d01630cfc FPGA: load calibration works as dedicated function of the card 2023-09-12 14:34:42 +02:00
7a635f1ee8 FPGA: load_calibration clean-up + simplification 2023-09-12 09:16:45 +02:00
2b29381f87 FPGA: update in timer code 2023-09-12 08:16:44 +02:00
8c3a25a8ad FPGA: load calibration operates directly on HBM 2023-09-11 21:47:29 +02:00
f98b5fe389 FPGA: use only two HBM channels to write calibration in JF conversion 2023-09-11 20:30:46 +02:00
05000bab1f FPGA: remove transfer to HBM for the time being 2023-09-11 20:24:20 +02:00
0c524f9a3c FPGA: Add module to load images from HBM 2023-09-11 12:42:38 +02:00
253b409d38 FPGA: Mark last completion saved to HBM 2023-09-11 12:20:07 +02:00
309dabd32b FPGA: Use dedicated struct for address exchange 2023-09-11 11:19:05 +02:00
9ff8e039d7 FPGA: use HBM channels 12 and 13 for save_to_hbm 2023-09-11 10:50:30 +02:00