Merge develop

extensions/apps/traceAnalyzer/CMakeLists.txt

@@ -28,7 +28,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: 
+# Authors:
 #    Matthias Jung
 #    Lukas Steiner
 #    Derek Christ
@@ -94,10 +94,9 @@ target_link_libraries(TraceAnalyzer
 
 set(DRAMSYS_TRACEANALYZER_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
-target_compile_definitions(${PROJECT_NAME} 
-    PUBLIC 
+target_compile_definitions(${PROJECT_NAME}
+    PUBLIC
         DRAMSYS_TRACEANALYZER_DIR="${DRAMSYS_TRACEANALYZER_DIR}"
 )
 
 build_source_group()
-diagnostics_print(${PROJECT_NAME})

extensions/apps/traceAnalyzer/data/tracedb.cpp

@@ -290,11 +290,6 @@ ID TraceDB::getTransactionIDFromPhaseID(ID phaseID)
 GeneralInfo TraceDB::getGeneralInfoFromDB()
 {
     QVariant parameter;
-    parameter = getParameterFromTable("NumberOfTransactions", "GeneralInfo");
-    uint64_t numberOfTransactions = parameter.isValid() ? parameter.toULongLong() : 0;
-    parameter = getParameterFromTable("TraceEnd", "GeneralInfo");
-    traceTime traceEnd = parameter.isValid() ? static_cast<traceTime>(parameter.toULongLong()) : 0;
-    parameter = getParameterFromTable("NumberOfRanks", "GeneralInfo");
     unsigned numberOfRanks = parameter.isValid() ? parameter.toUInt() : 1;
     parameter = getParameterFromTable("NumberOfBankgroups", "GeneralInfo");
     unsigned numberOfBankGroups = parameter.isValid() ? parameter.toUInt() : numberOfRanks;
@@ -328,6 +323,8 @@ GeneralInfo TraceDB::getGeneralInfoFromDB()
     bool pseudoChannelMode = parameter.isValid() && parameter.toBool();
 
     uint64_t numberOfPhases = getNumberOfPhases();
+    uint64_t numberOfTransactions = getNumberOfTransactions();
+    auto traceEnd = static_cast<traceTime>(getTraceLength());
 
     QString description = (traces + "\n");
     description += mcconfig + "\n";
@@ -417,6 +414,26 @@ QVariant TraceDB::getParameterFromTable(const std::string& parameter, const std:
     }
 }
 
+uint64_t TraceDB::getTraceLength()
+{
+    QSqlQuery query(database);
+    query.prepare("SELECT MAX(PhaseEnd) FROM Phases");
+    executeQuery(query);
+
+    query.next();
+    return query.value(0).toULongLong();
+}
+
+uint64_t TraceDB::getNumberOfTransactions()
+{
+    QSqlQuery query(database);
+    query.prepare("SELECT COUNT(ID) FROM Transactions");
+    executeQuery(query);
+
+    query.next();
+    return query.value(0).toULongLong();
+}
+
 uint64_t TraceDB::getNumberOfPhases()
 {
     QSqlQuery query(database);
@@ -480,7 +497,7 @@ DependencyInfos TraceDB::getDependencyInfos(DependencyInfos::Type infoType)
             selectTimeDependencyPercentages = QSqlQuery(database);
             if (!selectTimeDependencyPercentages.prepare(queryTexts.selectTimeDependencyPercentages))
                 qDebug() << database.lastError().text();
-                
+
             executeQuery(selectTimeDependencyPercentages);
             return parseDependencyInfos(selectTimeDependencyPercentages, infoType);
         }
@@ -714,4 +731,3 @@ void TraceDB::executeScriptFile(const QString& fileName)
         }
     }
 }
-

extensions/apps/traceAnalyzer/data/tracedb.h

@@ -145,6 +145,8 @@ private:
     void executeScriptFile(const QString& fileName);
     void dropAndCreateTables();
 
+    uint64_t getTraceLength();
+    uint64_t getNumberOfTransactions();
     uint64_t getNumberOfPhases();
     GeneralInfo getGeneralInfoFromDB();
     CommandLengths getCommandLengthsFromDB();
@@ -174,6 +176,3 @@ public:
     }
 };
 #endif // TRACEDB_H
-
-
-

extensions/apps/traceAnalyzer/simulationdialog.cpp

@@ -246,7 +246,7 @@ void SimulationDialog::loadConfigurationFromTextFields()
     MemSpec memSpec;
     SimConfig simConfig;
     std::string simulationId;
-    TraceSetup traceSetup;
+    std::vector<Initiator> traceSetup;
 
     simulationId = ui->simulationIdLineEdit->text().toStdString();
 
@@ -266,12 +266,14 @@ void SimulationDialog::loadConfigurationFromTextFields()
         return;
     }
 
-    configuration = DRAMSys::Config::Configuration{addressMapping,
-                                                        mcConfig,
-                                                        memSpec,
-                                                        simConfig,
-                                                        simulationId,
-                                                        std::make_optional<TraceSetup>(std::move(traceSetup))};
+    configuration = DRAMSys::Config::Configuration{
+        addressMapping,
+        mcConfig,
+        memSpec,
+        simConfig,
+        simulationId,
+        std::make_optional<std::vector<Initiator>>(std::move(traceSetup))
+    };
 
     loadConfiguration();
 }