From 922b77820e2c02ae325937b4375ff8e721530d59 Mon Sep 17 00:00:00 2001 From: Iron Prando da Silva Date: Mon, 17 Jan 2022 14:00:35 +0100 Subject: [PATCH] Renamed variable clk to tCk. --- .../DDR3TimeDependencies.cpp | 62 +++++++++---------- .../DDR3TimeDependencies.h | 4 +- .../dramtimedependenciesIF.cpp | 8 +-- .../dramtimedependenciesIF.h | 8 +-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp index 83b45c18..f09f3cfc 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp @@ -35,7 +35,7 @@ #include "DDR3TimeDependencies.h" -DDR3TimeDependencies::DDR3TimeDependencies(const QJsonObject& memspec, const uint clk) : DRAMTimeDependenciesIF(memspec, clk) { +DDR3TimeDependencies::DDR3TimeDependencies(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { mInitializeValues(); } @@ -44,43 +44,43 @@ void DDR3TimeDependencies::mInitializeValues() { dataRate = mMemspecJson["memarchitecturespec"].toObject()["dataRate"].toInt(); nActivateWindow = 4; - tRP = clk * mMemspecJson["memtimingspec"].toObject()["RP"].toInt(); - tRAS = clk * mMemspecJson["memtimingspec"].toObject()["RAS"].toInt(); - tRC = clk * mMemspecJson["memtimingspec"].toObject()["RC"].toInt(); - tRTP = clk * mMemspecJson["memtimingspec"].toObject()["RTP"].toInt(); - tRRD = clk * mMemspecJson["memtimingspec"].toObject()["RRD"].toInt(); - tCCD = clk * mMemspecJson["memtimingspec"].toObject()["CCD"].toInt(); - tRCD = clk * mMemspecJson["memtimingspec"].toObject()["RCD"].toInt(); - tNAW = clk * mMemspecJson["memtimingspec"].toObject()["FAW"].toInt(); - tRL = clk * mMemspecJson["memtimingspec"].toObject()["RL"].toInt(); - tWL = clk * mMemspecJson["memtimingspec"].toObject()["WL"].toInt(); - tWR = clk * mMemspecJson["memtimingspec"].toObject()["WR"].toInt(); - tWTR = clk * mMemspecJson["memtimingspec"].toObject()["WTR"].toInt(); - tCKESR = clk * mMemspecJson["memtimingspec"].toObject()["CKESR"].toInt(); - tCKE = clk * mMemspecJson["memtimingspec"].toObject()["CKE"].toInt(); - tXP = clk * mMemspecJson["memtimingspec"].toObject()["XP"].toInt(); - tXPDLL = clk * mMemspecJson["memtimingspec"].toObject()["XPDLL"].toInt(); - tXS = clk * mMemspecJson["memtimingspec"].toObject()["XS"].toInt(); - tXSDLL = clk * mMemspecJson["memtimingspec"].toObject()["XSDLL"].toInt(); - tAL = clk * mMemspecJson["memtimingspec"].toObject()["AL"].toInt(); - tRFC = clk * mMemspecJson["memtimingspec"].toObject()["RFC"].toInt(); - tREFI = clk * mMemspecJson["memtimingspec"].toObject()["REFI"].toInt(); - tRTRS = clk * mMemspecJson["memtimingspec"].toObject()["RTRS"].toInt(); - tACTPDEN = clk * mMemspecJson["memtimingspec"].toObject()["ACTPDEN"].toInt(); - tPRPDEN = clk * mMemspecJson["memtimingspec"].toObject()["PRPDEN"].toInt(); - tREFPDEN = clk * mMemspecJson["memtimingspec"].toObject()["REFPDEN"].toInt(); - tCKE = clk * mMemspecJson["memtimingspec"].toObject()["CKE"].toInt(); + tRP = tCK * mMemspecJson["memtimingspec"].toObject()["RP"].toInt(); + tRAS = tCK * mMemspecJson["memtimingspec"].toObject()["RAS"].toInt(); + tRC = tCK * mMemspecJson["memtimingspec"].toObject()["RC"].toInt(); + tRTP = tCK * mMemspecJson["memtimingspec"].toObject()["RTP"].toInt(); + tRRD = tCK * mMemspecJson["memtimingspec"].toObject()["RRD"].toInt(); + tCCD = tCK * mMemspecJson["memtimingspec"].toObject()["CCD"].toInt(); + tRCD = tCK * mMemspecJson["memtimingspec"].toObject()["RCD"].toInt(); + tNAW = tCK * mMemspecJson["memtimingspec"].toObject()["FAW"].toInt(); + tRL = tCK * mMemspecJson["memtimingspec"].toObject()["RL"].toInt(); + tWL = tCK * mMemspecJson["memtimingspec"].toObject()["WL"].toInt(); + tWR = tCK * mMemspecJson["memtimingspec"].toObject()["WR"].toInt(); + tWTR = tCK * mMemspecJson["memtimingspec"].toObject()["WTR"].toInt(); + tCKESR = tCK * mMemspecJson["memtimingspec"].toObject()["CKESR"].toInt(); + tCKE = tCK * mMemspecJson["memtimingspec"].toObject()["CKE"].toInt(); + tXP = tCK * mMemspecJson["memtimingspec"].toObject()["XP"].toInt(); + tXPDLL = tCK * mMemspecJson["memtimingspec"].toObject()["XPDLL"].toInt(); + tXS = tCK * mMemspecJson["memtimingspec"].toObject()["XS"].toInt(); + tXSDLL = tCK * mMemspecJson["memtimingspec"].toObject()["XSDLL"].toInt(); + tAL = tCK * mMemspecJson["memtimingspec"].toObject()["AL"].toInt(); + tRFC = tCK * mMemspecJson["memtimingspec"].toObject()["RFC"].toInt(); + tREFI = tCK * mMemspecJson["memtimingspec"].toObject()["REFI"].toInt(); + tRTRS = tCK * mMemspecJson["memtimingspec"].toObject()["RTRS"].toInt(); + tACTPDEN = tCK * mMemspecJson["memtimingspec"].toObject()["ACTPDEN"].toInt(); + tPRPDEN = tCK * mMemspecJson["memtimingspec"].toObject()["PRPDEN"].toInt(); + tREFPDEN = tCK * mMemspecJson["memtimingspec"].toObject()["REFPDEN"].toInt(); + tCKE = tCK * mMemspecJson["memtimingspec"].toObject()["CKE"].toInt(); tPD = tCKE; - tBURST = (uint) ((burstLength / (float) dataRate) * clk); - tRDWR = tRL + tBURST + 2 * clk - tWL; + tBURST = (uint) ((burstLength / (float) dataRate) * tCK); + tRDWR = tRL + tBURST + 2 * tCK - tWL; tRDWR_R = tRL + tBURST + tRTRS - tWL; tWRRD = tWL + tBURST + tWTR; tWRRD_R = tWL + tBURST + tRTRS - tRL; tWRPRE = tWL + tBURST + tWR; - tRDPDEN = tRL + tBURST + clk; + tRDPDEN = tRL + tBURST + tCK; tWRPDEN = tWL + tBURST + tWR; - tWRAPDEN = tWL + tBURST + tWR + clk; + tWRAPDEN = tWL + tBURST + tWR + tCK; } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h index 15f746a3..98daf4f6 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/DDR3TimeDependencies.h @@ -37,9 +37,9 @@ #include "dramtimedependenciesIF.h" -class DDR3TimeDependencies : public DRAMTimeDependenciesIF { +class DDR3TimeDependencies final : public DRAMTimeDependenciesIF { public: - DDR3TimeDependencies(const QJsonObject& memspec, const uint clk); + DDR3TimeDependencies(const QJsonObject& memspec, const uint tCK); static const std::vector getPossiblePhases(); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp index ae3521d4..16132ec3 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp @@ -37,9 +37,9 @@ #include -DRAMTimeDependenciesIF::DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint inClk) { +DRAMTimeDependenciesIF::DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint inTCK) { mMemspecJson = memspec; - clk = inClk; + tCK = inTCK; } @@ -69,13 +69,13 @@ DRAMTimeDependenciesIF::getDependencies(std::vector& dependencyFilter) return dependenciesMap; } -const QJsonObject DRAMTimeDependenciesIF::getMemspec(const TraceDB& tdb, uint& clk) { +const QJsonObject DRAMTimeDependenciesIF::getMemspec(const TraceDB& tdb, uint& tCK) { QSqlDatabase db = tdb.getDatabase(); QString query = "SELECT clk, Memspec FROM GeneralInfo"; QSqlQuery sqlQuery = db.exec(query); sqlQuery.next(); - clk = sqlQuery.value(0).toInt(); + tCK = sqlQuery.value(0).toInt(); QString memSpecJson = sqlQuery.value(1).toString(); sqlQuery.finish(); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h index ef2ff05b..016c52e2 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dramtimedependenciesIF.h @@ -81,14 +81,14 @@ typedef std::map DependencyM class DRAMTimeDependenciesIF { public: - DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint clk); + DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint tCK); virtual ~DRAMTimeDependenciesIF() = default; DependencyMap getDependencies(std::vector& dependencyFilter) const; - static const QJsonObject getMemspec(const TraceDB& tdb, uint& clk); + static const QJsonObject getMemspec(const TraceDB& tdb, uint& tCK); - const uint getClk() const { return clk; } + const uint getClk() const { return tCK; } const uint getNAW() const { return nActivateWindow; }; const uint getClk() const { return clk; } @@ -107,7 +107,7 @@ protected: virtual void mInitializeValues() {} ; virtual DependencyMap mSpecializedGetDependencies() const { DependencyMap map; return map; } ; - uint clk = 0; + uint tCK = 0; uint nActivateWindow = 0; };