[crorc,cru,bench-dma] Remove outdated generator* options

Author: kostorr

CMakeLists.txt

@@ -89,7 +89,6 @@ find_package(PDA)
 ####################################
 
 add_library(ReadoutCard SHARED
-  #src/CardConfigurator.cxx
   src/CardType.cxx
   src/Factory/ChannelFactory.cxx
   src/DmaChannelBase.cxx
@@ -104,7 +103,6 @@ add_library(ReadoutCard SHARED
   src/ParameterTypes/DownstreamData.cxx
   src/ParameterTypes/GbtMode.cxx
   src/ParameterTypes/GbtMux.cxx
-  src/ParameterTypes/GeneratorPattern.cxx
   src/ParameterTypes/Hex.cxx
   src/ParameterTypes/LoopbackMode.cxx
   src/ParameterTypes/PciAddress.cxx

include/ReadoutCard/ParameterTypes/GeneratorPattern.h

@@ -23,7 +23,6 @@
 #include <boost/optional.hpp>
 #include <boost/variant.hpp>
 #include "ReadoutCard/ParameterTypes/BufferParameters.h"
-#include "ReadoutCard/ParameterTypes/GeneratorPattern.h"
 #include "ReadoutCard/ParameterTypes/LoopbackMode.h"
 #include "ReadoutCard/ParameterTypes/PciAddress.h"
 #include "ReadoutCard/ParameterTypes/PciSequenceNumber.h"
@@ -83,9 +82,6 @@ class Parameters
   /// Type for the LoopbackMode parameter
   using GeneratorLoopbackType = LoopbackMode::type;
 
-  /// Type for the generator pattern parameter
-  using GeneratorPatternType = GeneratorPattern::type;
-
   /// Type for the generator data size parameter
   using GeneratorRandomSizeEnabledType = bool;
 
@@ -227,19 +223,6 @@ class Parameters
   /// \return Reference to this object for chaining calls
   auto setGeneratorLoopback(GeneratorLoopbackType value) -> Parameters&;
 
-  /// Sets the GeneratorPattern parameter.
-  ///
-  /// Determines the content of the generated data.
-  /// Supported formats:
-  /// * C-RORC: all formats (I think...)
-  /// * CRU: Constant, Alternating, Incremental
-  ///
-  /// If not set, the driver will default to the incremental pattern (GeneratorPattern::Incremental).
-  ///
-  /// \param value The value to set
-  /// \return Reference to this object for chaining calls
-  auto setGeneratorPattern(GeneratorPatternType value) -> Parameters&;
-
   /// Sets the GeneratorRandomSizeEnabled parameter.
   ///
   /// If enabled, the content of the DMA pages will have a random size.
@@ -407,10 +390,6 @@ class Parameters
   /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
   auto getGeneratorLoopback() const -> boost::optional<GeneratorLoopbackType>;
 
-  /// Gets the GeneratorPattern parameter
-  /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
-  auto getGeneratorPattern() const -> boost::optional<GeneratorPatternType>;
-
   /// Gets the GeneratorRandomSizeEnabled parameter
   /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
   auto getGeneratorRandomSizeEnabled() const -> boost::optional<GeneratorRandomSizeEnabledType>;
@@ -503,11 +482,6 @@ class Parameters
   /// \return The value
   auto getGeneratorLoopbackRequired() const -> GeneratorLoopbackType;
 
-  /// Gets the GeneratorPattern parameter
-  /// \exception ParameterException The parameter was not present
-  /// \return The value
-  auto getGeneratorPatternRequired() const -> GeneratorPatternType;
-
   /// Gets the GeneratorRandomSizeEnabled parameter
   /// \exception ParameterException The parameter was not present
   /// \return The value

include/ReadoutCard/ParameterTypes/SourceParameters.h

@@ -21,7 +21,6 @@
 #include <boost/program_options.hpp>
 #include "ReadoutCard/Exception.h"
 #include "ReadoutCard/Parameters.h"
-#include "ReadoutCard/ParameterTypes/GeneratorPattern.h"
 #include "ReadoutCard/ParameterTypes/ResetLevel.h"
 
 namespace AliceO2

include/ReadoutCard/Parameters.h

@@ -184,9 +184,6 @@ class ProgramDmaBench : public Program
     options.add_options()("page-size",
                           SuffixOption<size_t>::make(&mOptions.dmaPageSize)->default_value("8Ki"),
                           "Card DMA page size");
-    options.add_options()("pattern",
-                          po::value<std::string>(&mOptions.generatorPatternString)->default_value("INCREMENTAL"),
-                          "Error check with given pattern [INCREMENTAL, ALTERNATING, CONSTANT, RANDOM]");
     options.add_options()("pause-push",
                           po::value<uint64_t>(&mOptions.pausePush)->default_value(1),
                           "Push thread pause time in microseconds if no work can be done");
@@ -258,11 +255,6 @@ class ProgramDmaBench : public Program
       }
     }
 
-    // Handle generator pattern option
-    if (!mOptions.generatorPatternString.empty()) {
-      mOptions.generatorPattern = GeneratorPattern::fromString(mOptions.generatorPatternString);
-    }
-
     // Log IOMMU status
     getLogger() << "IOMMU " << (AliceO2::Common::Iommu::isEnabled() ? "enabled" : "not enabled") << endm;
 
@@ -285,8 +277,6 @@ class ProgramDmaBench : public Program
     mPageSize = params.getDmaPageSize().get();
     params.setCardId(cardId);
     params.setChannelNumber(mOptions.dmaChannel);
-    params.setGeneratorDataSize(mPageSize);
-    params.setGeneratorPattern(mOptions.generatorPattern);
     params.setBufferParameters(buffer_parameters::Memory{ mMemoryMappedFile->getAddress(),
                                                           mMemoryMappedFile->getSize() });
     params.setLinkMask(Parameters::linkMaskFromString(mOptions.links));
@@ -325,13 +315,6 @@ class ProgramDmaBench : public Program
       getLogger() << "Maximum RDH packet counter" << mMaxRdhPacketCounter << endm;
     }
 
-    if (mOptions.dataGeneratorSize != 0) {
-      params.setGeneratorDataSize(mOptions.dataGeneratorSize);
-      getLogger() << "Generator data size: " << mOptions.dataGeneratorSize << endm;
-    } else {
-      getLogger() << "Generator data size: <internal default>" << endm;
-    }
-
     // Get DMA channel object
     try {
       mChannel = ChannelFactory().getDmaChannel(params);
@@ -1113,10 +1096,8 @@ class ProgramDmaBench : public Program
     bool noResyncCounter = false;
     bool barHammer = false;
     bool noRemovePagesFile = false;
-    std::string generatorPatternString;
     std::string fileOutputPathBin;
     std::string fileOutputPathAscii;
-    GeneratorPattern::type generatorPattern = GeneratorPattern::Incremental;
     std::string links;
     bool generatorEnabled = false;
     bool bufferFullCheck = false;

src/CommandLineUtilities/Options.h

@@ -349,7 +349,7 @@ void programFlash(RegisterReadWriteInterface& channel, std::string dataFilePath,
   }
 }
 
-int Crorc::armDataGenerator(uint32_t initEventNumber, uint32_t initDataWord, GeneratorPattern::type dataPattern,
+int Crorc::armDataGenerator(int dataPattern, uint32_t initEventNumber, uint32_t initDataWord,
                             int dataSize, int seed)
 {
   int eventLen = dataSize / 4;

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 #include <boost/optional.hpp>
-#include "ReadoutCard/ParameterTypes/GeneratorPattern.h"
 #include "ReadoutCard/RegisterReadWriteInterface.h"
 #include "RxFreeFifoState.h"
 #include "StWord.h"
@@ -65,10 +64,13 @@ class Crorc
   void armDdl(int resetMask, const DiuConfig& diuConfig);
 
   /// Arms C-RORC data generator
-  int armDataGenerator(uint32_t initEventNumber, uint32_t initDataWord, GeneratorPattern::type dataPattern,
-                       int dataSize, int seed);
+  int armDataGenerator(int dataSize,
+                       uint32_t initEventNumber = 0,
+                       uint32_t initDataWord = 0,
+                       int dataPattern = 5,
+                       int seed = 0);
 
-  void startDataGenerator(uint32_t maxLoop);
+  void startDataGenerator(uint32_t maxLoop = 0);
 
   /// Stops C-RORC data generator
   void stopDataGenerator();

src/Crorc/Crorc.cxx

@@ -46,13 +46,7 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
     mSTBRD(parameters.getStbrdEnabled().get_value_or(false)),                              //TODO: Set as a parameter
     mUseFeeAddress(false),                                                                 // Not sure
     mLoopbackMode(parameters.getGeneratorLoopback().get_value_or(LoopbackMode::Internal)), // Internal loopback by default
-    mGeneratorEnabled(parameters.getGeneratorEnabled().get_value_or(true)),                // Use data generator by default
-    mGeneratorPattern(parameters.getGeneratorPattern().get_value_or(GeneratorPattern::Incremental)),
-    mGeneratorMaximumEvents(0),                                                   // Infinite events
-    mGeneratorInitialValue(0),                                                    // Start from 0
-    mGeneratorInitialWord(0),                                                     // First word
-    mGeneratorSeed(mGeneratorPattern == GeneratorPattern::Random ? 1 : 0),        // We use a seed for random only
-    mGeneratorDataSize(parameters.getGeneratorDataSize().get_value_or(mPageSize)) // Can use page size
+    mGeneratorEnabled(parameters.getGeneratorEnabled().get_value_or(true))                 // Use data generator by default
 {
   // Check that the DMA page is valid
   if (mPageSize != DMA_PAGE_SIZE) {
@@ -286,8 +280,7 @@ void CrorcDmaChannel::armDdl(ResetLevel::type resetLevel)
 
 void CrorcDmaChannel::startDataGenerator()
 {
-  getCrorc().armDataGenerator(mGeneratorInitialValue, mGeneratorInitialWord, mGeneratorPattern, mGeneratorDataSize,
-                              mGeneratorSeed); //TODO: To be simplified
+  getCrorc().armDataGenerator(mPageSize); //TODO: To be simplified
 
   if (LoopbackMode::Internal == mLoopbackMode) {
     getCrorc().setLoopbackOn();
@@ -308,7 +301,7 @@ void CrorcDmaChannel::startDataGenerator()
     getCrorc().diuCommand(Ddl::RandCIFST);
   }
 
-  getCrorc().startDataGenerator(mGeneratorMaximumEvents);
+  getCrorc().startDataGenerator();
 }
 
 void CrorcDmaChannel::startDataReceiving()

src/Crorc/Crorc.h

@@ -200,24 +200,6 @@ class CrorcDmaChannel final : public DmaChannelPdaBase
   /// Enables the data generator
   const bool mGeneratorEnabled;
 
-  /// Data pattern for the data generator
-  const GeneratorPattern::type mGeneratorPattern;
-
-  /// Maximum number of events
-  const int mGeneratorMaximumEvents;
-
-  /// Initial value of the first data in a data block
-  const uint32_t mGeneratorInitialValue;
-
-  /// Sets the second word of each fragment when the data generator is used
-  const uint32_t mGeneratorInitialWord;
-
-  /// Random seed parameter in case the data generator is set to produce random data
-  const int mGeneratorSeed;
-
-  /// Length of data written to each page
-  const size_t mGeneratorDataSize;
-
   Crorc::Crorc::DiuConfig mDiuConfig;
 };