RoC: Add rudimentary CRU data format interface

Author: PascalBoeschoten

src/Cru/DataFormat.h

@@ -1,8 +1,47 @@
-//
-// Created by pboescho on 8/4/17.
-//
+/// \file Cru/DataFormat.h
+/// \brief Definitions of CRU data format functions
+///
+/// \author Pascal Boeschoten ([email protected])
 
-#ifndef READOUTCARD_DATAFORMAT_H
-#define READOUTCARD_DATAFORMAT_H
+#ifndef ALICEO2_READOUTCARD_CRU_DATAFORMAT
+#define ALICEO2_READOUTCARD_CRU_DATAFORMAT
 
-#endif //READOUTCARD_DATAFORMAT_H
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include "Utilities/Util.h"
+
+namespace AliceO2
+{
+namespace roc
+{
+namespace Cru
+{
+namespace DataFormat
+{
+namespace
+{
+  uint32_t getWord(const char* data, int i)
+  {
+    uint32_t word = 0;
+    memcpy(&word, &data[sizeof(word)*i], sizeof(word));
+    return word;
+  }
+} // Anonymous namespace
+
+uint32_t getLinkId(const char* data)
+{
+  return Utilities::getBits(getWord(data, 2), 4, 4+8-1);
+}
+
+uint32_t getEventSize(const char* data)
+{
+  return Utilities::getBits(getWord(data, 3), 4, 4+12-1);
+}
+
+} // namespace DataFormat
+} // namespace Cru
+} // namespace roc
+} // namespace AliceO2
+
+#endif // ALICEO2_READOUTCARD_CRU_DATAFORMAT

src/Pda/PdaDmaBuffer.cxx

@@ -71,7 +71,6 @@ PdaDmaBuffer::PdaDmaBuffer(PdaDevice::PdaPciDevice pciDevice, void* userBufferAd
     while (node != nullptr) {
       if (requireHugepage) {
         size_t hugePageMinSize = 1024 * 1024 * 2; // 2 MiB, the smallest hugepage size
-        printf("node->length=%lu\n", node->length);
         if (node->length < hugePageMinSize) {
           BOOST_THROW_EXCEPTION(
             PdaException() << ErrorInfo::Message("Scatter-gather node smaller than 2 MiB (minimum hugepage"

test/TestCruDataFormat.cxx

@@ -1,93 +1,42 @@
-/// \file TestBarAcessor.cxx
-/// \brief Tests for BarAccessor
+/// \file TestCruDataFormat.cxx
+/// \brief Tests for CruDataFormat
 ///
 /// \author Pascal Boeschoten ([email protected])
 
-#define BOOST_TEST_MODULE RORC_TestBarAccessor
+#define BOOST_TEST_MODULE RORC_TestCruDataFormat
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <assert.h>
-#include "ReadoutCard/BarInterface.h"
-#include "Cru/BarAccessor.h"
+#include "Cru/DataFormat.h"
 
 using namespace AliceO2::roc;
+using namespace Cru::DataFormat;
 
-BOOST_AUTO_TEST_CASE(TestFirmwareFeatures)
+static const std::vector<uint32_t> link18Test1 = {
+  0xabcd, 0x0, 0x212d, 0xead01001, 0x0, 0x0, 0xda1e5afe, 0x0,
+  0x0, 0x0, 0x111caf, 0xebeef102, 0x0, 0x0, 0x12345, 0x67810000,
+};
+
+static const std::vector<uint32_t> link18Test2 = {
+  0x85, 0x0, 0x212d, 0xead01001, 0x0, 0x0, 0xda1e5afe, 0x3fb,
+  0x0, 0x0, 0x111caf, 0xebeefbb7, 0x0, 0x0, 0x12345, 0x67810000,
+};
+
+static const std::vector<uint32_t> link21Test1 = {
+  0x0, 0x0, 0x215d, 0xead01001, 0x0, 0x0, 0xda1e5afe, 0x0,
+  0x0, 0x0, 0x111caf, 0xebeef405, 0x0, 0x0, 0x12345, 0x67810000,
+};
+
+BOOST_AUTO_TEST_CASE(TestGetLinkId)
 {
-  {
-    // Integrated firmware should have everything
-    FirmwareFeatures f = Cru::BarAccessor::convertToFirmwareFeatures(0x40000000);
-    BOOST_CHECK(!f.standalone);
-    BOOST_CHECK(f.serial);
-    BOOST_CHECK(f.dataSelection);
-    BOOST_CHECK(f.temperature);
-    BOOST_CHECK(f.firmwareInfo);
-  }
-  {
-    // Standalone with everything enabled
-    FirmwareFeatures f = Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE);
-    BOOST_CHECK(f.standalone);
-    BOOST_CHECK(f.serial);
-    BOOST_CHECK(f.dataSelection);
-    BOOST_CHECK(f.temperature);
-    BOOST_CHECK(f.firmwareInfo);
-  }
-  {
-    // Standalone with everything disabled
-    FirmwareFeatures f = Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE + (0b1111 << 16));
-    BOOST_CHECK(f.standalone);
-    BOOST_CHECK(!f.serial);
-    BOOST_CHECK(!f.dataSelection);
-    BOOST_CHECK(!f.temperature);
-    BOOST_CHECK(!f.firmwareInfo);
-  }
-  {
-    // Standalone individual features disabled
-    BOOST_CHECK(!Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE + (1 << 16)).dataSelection);
-    BOOST_CHECK(!Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE + (1 << 17)).temperature);
-    BOOST_CHECK(!Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE + (1 << 18)).serial);
-    BOOST_CHECK(!Cru::BarAccessor::convertToFirmwareFeatures(0x40005AFE + (1 << 19)).firmwareInfo);
-  }
+  BOOST_CHECK_EQUAL(getLinkId(reinterpret_cast<const char*>(link18Test1.data())), 18);
+  BOOST_CHECK_EQUAL(getLinkId(reinterpret_cast<const char*>(link18Test2.data())), 18);
+  BOOST_CHECK_EQUAL(getLinkId(reinterpret_cast<const char*>(link21Test1.data())), 21);
 }
 
-BOOST_AUTO_TEST_CASE(TestDataGeneratorConfiguration)
+BOOST_AUTO_TEST_CASE(TestGetEventSize)
 {
-  {
-    uint32_t bits = 0;
-    Cru::BarAccessor::setDataGeneratorEnableBits(bits, true);
-    BOOST_CHECK(bits == 0x1);
-    Cru::BarAccessor::setDataGeneratorEnableBits(bits, false);
-    BOOST_CHECK(bits == 0x0);
-  }
-  {
-    uint32_t bits = 0;
-    Cru::BarAccessor::setDataGeneratorRandomSizeBits(bits, true);
-    BOOST_CHECK(bits == (1 << 16));
-    Cru::BarAccessor::setDataGeneratorRandomSizeBits(bits, false);
-    BOOST_CHECK(bits != (1 << 16));
-  }
-  {
-    uint32_t bits = 0;
-    Cru::BarAccessor::setDataGeneratorEnableBits(bits, true);
-    BOOST_CHECK(bits == 0x1);
-    Cru::BarAccessor::setDataGeneratorPatternBits(bits, GeneratorPattern::Incremental);
-    BOOST_CHECK(bits == 0x3);
-    Cru::BarAccessor::setDataGeneratorSizeBits(bits, 8*1024);
-    BOOST_CHECK(bits == 0xff03);
-  }
-  {
-    uint32_t bits = 0;
-    Cru::BarAccessor::setDataGeneratorEnableBits(bits, true);
-    Cru::BarAccessor::setDataGeneratorPatternBits(bits, GeneratorPattern::Incremental);
-    Cru::BarAccessor::setDataGeneratorSizeBits(bits, 32);
-    BOOST_CHECK(bits == 0x0003);
-  }
-  {
-    uint32_t bits = 0;
-    // Too high value
-    BOOST_CHECK_THROW(Cru::BarAccessor::setDataGeneratorSizeBits(bits, 8*1024 + 1), std::exception);
-    // Not a multiple of 256 bits
-    BOOST_CHECK_THROW(Cru::BarAccessor::setDataGeneratorSizeBits(bits, 257), std::exception);
-  }
+  BOOST_CHECK_EQUAL(getEventSize(reinterpret_cast<const char*>(link18Test1.data())), 256);
+  BOOST_CHECK_EQUAL(getEventSize(reinterpret_cast<const char*>(link18Test2.data())), 256);
+  BOOST_CHECK_EQUAL(getEventSize(reinterpret_cast<const char*>(link21Test1.data())), 256);
 }