leonarski_f
040cdeacf1
The base AcquisitionDevice no longer allocates or frees frame buffers; buffer_device is now just a non-owning view of addresses. Each subclass owns its backing memory and the matching lifecycle: - PCIExpressDevice mmap's the kernel DMA buffers and munmap's them in its own destructor (and on ctor failure), symmetric with MapKernelBuffer. - HLSSimulatedDevice owns plain zeroed heap buffers it points buffer_device into, declared before the HLSDevice so they outlive the action thread that writes them. The buffers are page-aligned to match the real device's kernel DMA buffers - the modelled AXI datamover and FPGAIntegrationTest require aligned output buffers. This drops the NUMA/mmap dance from the simulated path (not performance-critical) - removing libnuma from acquisition_device - and replaces the base-class cleanup that had to guess the allocation strategy with a single clear owner per device. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
113 lines
4.0 KiB
C++
113 lines
4.0 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "HLSSimulatedDevice.h"
|
|
|
|
HLSSimulatedDevice::HLSSimulatedDevice(uint16_t data_stream, size_t in_frame_buffer_size_modules)
|
|
: FPGAAcquisitionDevice(data_stream) {
|
|
mac_addr = 0xCCAA11223344;
|
|
ipv4_addr = 0x0132010A;
|
|
|
|
max_modules = MAX_MODULES_FPGA;
|
|
|
|
buffers.reserve(in_frame_buffer_size_modules);
|
|
for (size_t i = 0; i < in_frame_buffer_size_modules; i++) {
|
|
buffers.push_back(std::make_unique<FrameBuffer>()); // zero-initialised, 64-byte aligned
|
|
buffer_device.push_back(reinterpret_cast<DeviceOutput *>(buffers.back().get()));
|
|
}
|
|
|
|
device = std::make_unique<HLSDevice>(buffer_device);
|
|
}
|
|
|
|
void HLSSimulatedDevice::CreateFinalPacket(const DiffractionExperiment& experiment) {
|
|
device->CreateFinalPacket();
|
|
}
|
|
|
|
void HLSSimulatedDevice::CreateJFPacket(const DiffractionExperiment& experiment, uint64_t frame_number, uint32_t eth_packet,
|
|
uint32_t module_number, const uint16_t *data, int8_t adjust_axis, uint8_t user) {
|
|
device->CreateJFPacket(frame_number, eth_packet, module_number, data, adjust_axis, user);
|
|
}
|
|
|
|
void HLSSimulatedDevice::CreateJFPackets(const DiffractionExperiment& experiment, uint64_t frame_number_0, uint64_t frames,
|
|
uint32_t module_number, const uint16_t *data) {
|
|
for (uint64_t i = 0; i < frames; i++) {
|
|
for (int j = 0; j < 128; j++)
|
|
CreateJFPacket(experiment, frame_number_0 + i, j, module_number, data + (i * 128 + j) * 4096, 0, 0);
|
|
}
|
|
}
|
|
|
|
void HLSSimulatedDevice::CreateEIGERPacket(const DiffractionExperiment &experiment, uint64_t frame_number,
|
|
uint32_t eth_packet, uint32_t module_number, uint32_t col, uint32_t row,
|
|
const uint16_t *data) {
|
|
device->CreateEIGERPacket(frame_number, eth_packet, module_number, col, row, data);
|
|
}
|
|
|
|
void HLSSimulatedDevice::HW_ReadActionRegister(DataCollectionConfig *job) {
|
|
device->HW_ReadActionRegister(job);
|
|
}
|
|
|
|
void HLSSimulatedDevice::HW_WriteActionRegister(const DataCollectionConfig *job) {
|
|
device->HW_WriteActionRegister(job);
|
|
}
|
|
|
|
void HLSSimulatedDevice::FPGA_StartAction(const DiffractionExperiment &experiment) {
|
|
device->FPGA_StartAction();
|
|
}
|
|
|
|
void HLSSimulatedDevice::HW_RunInternalGenerator(const FrameGeneratorConfig &config) {
|
|
device->HW_RunInternalGenerator(config);
|
|
}
|
|
|
|
void HLSSimulatedDevice::FPGA_EndAction() {
|
|
device->FPGA_EndAction();
|
|
}
|
|
|
|
|
|
bool HLSSimulatedDevice::HW_ReadMailbox(uint32_t *values) {
|
|
return device->HW_ReadMailbox(values);
|
|
}
|
|
|
|
void HLSSimulatedDevice::Cancel() {
|
|
device->Cancel();
|
|
}
|
|
|
|
bool HLSSimulatedDevice::HW_IsIdle() const {
|
|
return device->HW_IsIdle();
|
|
}
|
|
|
|
|
|
bool HLSSimulatedDevice::HW_SendWorkRequest(uint32_t handle) {
|
|
return device->HW_SendWorkRequest(handle);
|
|
}
|
|
|
|
DataCollectionStatus HLSSimulatedDevice::GetDataCollectionStatus() const {
|
|
return device->GetDataCollectionStatus();
|
|
}
|
|
|
|
void HLSSimulatedDevice::HW_LoadCalibration(const LoadCalibrationConfig &config) {
|
|
device->HW_LoadCalibration(config);
|
|
}
|
|
|
|
void HLSSimulatedDevice::HW_SetSpotFinderParameters(const SpotFinderParameters ¶ms) {
|
|
device->HW_SetSpotFinderParameters(params);
|
|
}
|
|
|
|
void HLSSimulatedDevice::CreateXfelBunchIDPacket(double pulse_id, uint32_t event_code) {
|
|
device->CreateXfelBunchIDPacket(pulse_id, event_code);
|
|
}
|
|
|
|
DeviceStatus HLSSimulatedDevice::GetDeviceStatus() const {
|
|
DeviceStatus status{};
|
|
|
|
strncpy(status.serial_number, "HLS1", sizeof(status.device_number));
|
|
strncpy(status.device_number, "HLS device", sizeof(status.device_number));
|
|
status.fpga_default_mac_addr = mac_addr;
|
|
status.eth_link_count = 1;
|
|
status.eth_link_status = 1;
|
|
status.packets_sls = device->GetSLSPackets();
|
|
status.packets_udp = device->GetUDPPackets();
|
|
status.hbm_0_temp_C = 0;
|
|
status.hbm_1_temp_C = 0;
|
|
status.fpga_temp_C = 0;
|
|
return status;
|
|
} |