Fix bug in TLM recorder and for single device addressing.

Author: lsteiner-tukl

src/libdramsys/DRAMSys/common/TlmRecorder.cpp

@@ -54,7 +54,10 @@ namespace DRAMSys
 
 TlmRecorder::TlmRecorder(const std::string& name,
                          const Configuration& config,
-                         const std::string& dbName) :
+                         const std::string& dbName,
+                         std::string mcconfig,
+                         std::string memspec,
+                         std::string traces) :
     name(name),
     config(config),
     memSpec(*config.memSpec),
@@ -76,7 +79,7 @@ TlmRecorder::TlmRecorder(const std::string& name,
     executeInitialSqlCommand();
     prepareSqlStatements();
 
-    insertGeneralInfo();
+    insertGeneralInfo(mcconfig, memspec, traces);
     insertCommandLengths();
 
     PRINTDEBUGMESSAGE(name, "Starting new database transaction");
@@ -432,7 +435,7 @@ void TlmRecorder::insertDebugMessageInDB(const std::string& message, const sc_ti
     executeSqlStatement(insertDebugMessageStatement);
 }
 
-void TlmRecorder::insertGeneralInfo()
+void TlmRecorder::insertGeneralInfo(std::string mcconfig, std::string memspec, std::string traces)
 {
     sqlite3_bind_int(
         insertGeneralInfoStatement, 1, static_cast<int>(config.memSpec->ranksPerChannel));

src/libdramsys/DRAMSys/common/TlmRecorder.h

@@ -62,19 +62,18 @@ namespace DRAMSys
 class TlmRecorder
 {
 public:
-    TlmRecorder(const std::string& name, const Configuration& config, const std::string& dbName);
+    TlmRecorder(const std::string& name,
+                const Configuration& config,
+                const std::string& dbName,
+                std::string mcconfig,
+                std::string memspec,
+                std::string traces);
     TlmRecorder(const TlmRecorder&) = delete;
     TlmRecorder(TlmRecorder&&) = default;
     TlmRecorder& operator=(const TlmRecorder&) = delete;
     TlmRecorder& operator=(TlmRecorder&&) = delete;
     ~TlmRecorder() = default;
 
-    void recordMcConfig(std::string _mcconfig) { mcconfig = std::move(_mcconfig); }
-
-    void recordMemspec(std::string _memspec) { memspec = std::move(_memspec); }
-
-    void recordTraceNames(std::string _traces) { traces = std::move(_traces); }
-
     void recordPhase(tlm::tlm_generic_payload& trans,
                      const tlm::tlm_phase& phase,
                      const sc_core::sc_time& delay);
@@ -157,8 +156,6 @@ class TlmRecorder
         std::vector<Phase> recordedPhases;
     };
 
-    std::string mcconfig, memspec, traces;
-
     void prepareSqlStatements();
     void executeInitialSqlCommand();
     static void executeSqlStatement(sqlite3_stmt* statement);
@@ -171,7 +168,7 @@ class TlmRecorder
 
     void terminateRemainingTransactions();
     void commitRecordedDataToDB();
-    void insertGeneralInfo();
+    void insertGeneralInfo(std::string mcconfig, std::string memspec, std::string traces);
     void insertCommandLengths();
     void insertTransactionInDB(const Transaction& recordingData);
     void insertRangeInDB(uint64_t id, const sc_core::sc_time& begin, const sc_core::sc_time& end);

src/libdramsys/DRAMSys/simulation/AddressDecoder.cpp

@@ -125,12 +125,17 @@ AddressDecoder::AddressDecoder(const DRAMSys::Config::AddressMapping& addressMap
             SC_REPORT_FATAL("AddressDecoder", "Not all address bits occur exactly once");
     }
 
-    unsigned highestByteBit = *std::max_element(vByteBits.begin(), vByteBits.end());
+    int highestByteBit = -1;
 
-    for (unsigned bitPosition = 0; bitPosition <= highestByteBit; bitPosition++)
+    if (!vByteBits.empty())
     {
-        if (std::find(vByteBits.begin(), vByteBits.end(), bitPosition) == vByteBits.end())
-            SC_REPORT_FATAL("AddressDecoder", "Byte bits are not continuous starting from 0");
+        highestByteBit = static_cast<int>(*std::max_element(vByteBits.begin(), vByteBits.end()));
+
+        for (unsigned bitPosition = 0; bitPosition <= highestByteBit; bitPosition++)
+        {
+            if (std::find(vByteBits.begin(), vByteBits.end(), bitPosition) == vByteBits.end())
+                SC_REPORT_FATAL("AddressDecoder", "Byte bits are not continuous starting from 0");
+        }
     }
 
     auto maxBurstLengthBits = static_cast<unsigned>(std::log2(memSpec.maxBurstLength));

src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.cpp

@@ -118,10 +118,8 @@ void DRAMSysRecordable::setupTlmRecorders(const std::string& traceName,
         mcconfig[Config::McConfig::KEY] = configLib.mcconfig;
         memspec[Config::MemSpec::KEY] = configLib.memspec;
 
-        tlmRecorders.emplace_back(recorderName, config, dbName);
-        tlmRecorders.back().recordMcConfig(mcconfig.dump());
-        tlmRecorders.back().recordMemspec(memspec.dump());
-        tlmRecorders.back().recordTraceNames(config.simulationName);
+        tlmRecorders.emplace_back(
+            recorderName, config, dbName, mcconfig.dump(), memspec.dump(), config.simulationName);
     }
 }