Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

move helper functions from villas-fpga-pipe into separate file

Browse source
This commit is contained in:
Niklas Eiling 2022-11-08 11:44:57 -05:00
parent 3f69ce6693
commit e029963839
4 changed files with 165 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
fpga/include/villas/fpga/fpgaHelper.hpp Normal file
View file

@ -0,0 +1,38 @@
/** Helper function for directly using VILLASfpga outside of VILLASnode
*
* @file
* @author Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
* @copyright 2022, Steffen Vogel, Niklas Eiling
* @license GNU General Public License (version 3)
*
* VILLASfpga
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#pragma once
#include <string>
#include <villas/fpga/card.hpp>
namespace villas {
namespace fpga {
std::shared_ptr<fpga::PCIeCard>
setupFpgaCard(const std::string &configFile, const std::string &fpgaName);
void setupColorHandling();
} /* namespace fpga */
} /* namespace villas */

1
fpga/lib/CMakeLists.txt
View file

@ -25,6 +25,7 @@ set(SOURCES
card.cpp
core.cpp
node.cpp
fpgaHelper.cpp
ips/timer.cpp
ips/switch.cpp

123
fpga/lib/fpgaHelper.cpp Normal file
View file

@ -0,0 +1,123 @@
/** Helper function for directly using VILLASfpga outside of VILLASnode
*
* @author Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
* @copyright 2022, Steffen Vogel, Niklas Eiling
* @license GNU General Public License (version 3)
*
* VILLASfpga
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <csignal>
#include <iostream>
#include <vector>
#include <string>
#include <algorithm>
#include <jansson.h>
#include <CLI11.hpp>
#include <rang.hpp>
#include <villas/exceptions.hpp>
#include <villas/log.hpp>
#include <villas/utils.hpp>
#include <villas/utils.hpp>
#include <villas/fpga/core.hpp>
#include <villas/fpga/card.hpp>
#include <villas/fpga/vlnv.hpp>
#include <villas/fpga/ips/dma.hpp>
#include <villas/fpga/ips/rtds.hpp>
#include <villas/fpga/ips/aurora_xilinx.hpp>
#include <villas/fpga/fpgaHelper.hpp>
using namespace villas;
static std::shared_ptr<kernel::pci::DeviceList> pciDevices;
static auto logger = villas::logging.get("streamer");
void fpga::setupColorHandling()
{
// Handle Control-C nicely
struct sigaction sigIntHandler;
sigIntHandler.sa_handler = [](int){
std::cout << std::endl << rang::style::reset << rang::fgB::red;
std::cout << "Control-C detected, exiting..." << rang::style::reset << std::endl;
std::exit(1); // Will call the correct exit func, no unwinding of the stack though
};
sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0;
sigaction(SIGINT, &sigIntHandler, nullptr);
// Reset color if exiting not by signal
std::atexit([](){
std::cout << rang::style::reset;
});
}
std::shared_ptr<fpga::PCIeCard>
fpga::setupFpgaCard(const std::string &configFile, const std::string &fpgaName)
{
pciDevices = std::make_shared<kernel::pci::DeviceList>();
auto vfioContainer = kernel::vfio::Container::create();
// Parse FPGA configuration
FILE* f = fopen(configFile.c_str(), "r");
if (!f)
throw RuntimeError("Cannot open config file: {}", configFile);
json_t* json = json_loadf(f, 0, nullptr);
if (!json) {
logger->error("Cannot parse JSON config");
fclose(f);
throw RuntimeError("Cannot parse JSON config");
}
fclose(f);
json_t* fpgas = json_object_get(json, "fpgas");
if (fpgas == nullptr) {
logger->error("No section 'fpgas' found in config");
exit(1);
}
// Get the FPGA card plugin
auto fpgaCardFactory = plugin::registry->lookup<fpga::PCIeCardFactory>("pcie");
if (fpgaCardFactory == nullptr) {
logger->error("No FPGA plugin found");
exit(1);
}
// Create all FPGA card instances using the corresponding plugin
auto cards = fpgaCardFactory->make(fpgas, pciDevices, vfioContainer);
std::shared_ptr<fpga::PCIeCard> card;
for (auto &fpgaCard : cards) {
if (fpgaCard->name == fpgaName) {
return fpgaCard;
}
}
// Deallocate JSON config
json_decref(json);
if (!card)
throw RuntimeError("FPGA card {} not found in config or not working", fpgaName);
return card;
}

78
fpga/src/villas-fpga-pipe.cpp
View file

@ -41,85 +41,13 @@
#include <villas/fpga/ips/dma.hpp>
#include <villas/fpga/ips/rtds.hpp>
#include <villas/fpga/ips/aurora_xilinx.hpp>
#include <villas/fpga/fpgaHelper.hpp>
using namespace villas;
static std::shared_ptr<kernel::pci::DeviceList> pciDevices;
static auto logger = villas::logging.get("streamer");
void setupColorHandling()
{
// Handle Control-C nicely
struct sigaction sigIntHandler;
sigIntHandler.sa_handler = [](int){
std::cout << std::endl << rang::style::reset << rang::fgB::red;
std::cout << "Control-C detected, exiting..." << rang::style::reset << std::endl;
std::exit(1); // Will call the correct exit func, no unwinding of the stack though
};
sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0;
sigaction(SIGINT, &sigIntHandler, nullptr);
// Reset color if exiting not by signal
std::atexit([](){
std::cout << rang::style::reset;
});
}
std::shared_ptr<fpga::PCIeCard>
setupFpgaCard(const std::string &configFile, const std::string &fpgaName)
{
pciDevices = std::make_shared<kernel::pci::DeviceList>();
auto vfioContainer = kernel::vfio::Container::create();
// Parse FPGA configuration
FILE* f = fopen(configFile.c_str(), "r");
if (!f)
throw RuntimeError("Cannot open config file: {}", configFile);
json_t* json = json_loadf(f, 0, nullptr);
if (!json) {
logger->error("Cannot parse JSON config");
fclose(f);
throw RuntimeError("Cannot parse JSON config");
}
fclose(f);
json_t* fpgas = json_object_get(json, "fpgas");
if (fpgas == nullptr) {
logger->error("No section 'fpgas' found in config");
exit(1);
}
// Get the FPGA card plugin
auto fpgaCardFactory = plugin::registry->lookup<fpga::PCIeCardFactory>("pcie");
if (fpgaCardFactory == nullptr) {
logger->error("No FPGA plugin found");
exit(1);
}
// Create all FPGA card instances using the corresponding plugin
auto cards = fpgaCardFactory->make(fpgas, pciDevices, vfioContainer);
std::shared_ptr<fpga::PCIeCard> card;
for (auto &fpgaCard : cards) {
if (fpgaCard->name == fpgaName) {
return fpgaCard;
}
}
// Deallocate JSON config
json_decref(json);
if (!card)
throw RuntimeError("FPGA card {} not found in config or not working", fpgaName);
return card;
}
int main(int argc, char* argv[])
{
// Command Line Parser
@ -136,14 +64,14 @@ int main(int argc, char* argv[])
// Logging setup
spdlog::set_level(spdlog::level::debug);
setupColorHandling();
fpga::setupColorHandling();
if (configFile.empty()) {
logger->error("No configuration file provided/ Please use -c/--config argument");
return 1;
}
auto card = setupFpgaCard(configFile, fpgaName);
auto card = fpga::setupFpgaCard(configFile, fpgaName);
std::vector<fpga::ip::AuroraXilinx::Ptr> aurora_channels;
for (int i = 0; i < 4; i++) {