From c1b741d89b2c061c27fdae335502484813f05b56 Mon Sep 17 00:00:00 2001 From: "Lukas Steiner (2)" Date: Mon, 23 Sep 2019 13:24:47 +0200 Subject: [PATCH] Changed directory of configuration, added attribute unused to suppress warnings. --- DRAMSys/library/library.pro | 18 +++++++++--------- DRAMSys/library/src/common/DebugManager.cpp | 2 +- DRAMSys/library/src/common/TlmRecorder.cpp | 2 +- .../library/src/common/XmlAddressDecoder.cpp | 2 +- DRAMSys/library/src/common/dramExtensions.cpp | 2 +- .../core => common}/timingCalculations.cpp | 8 ++++---- .../core => common}/timingCalculations.h | 3 +-- .../core => }/configuration/Configuration.cpp | 2 +- .../core => }/configuration/Configuration.h | 4 ++-- .../configuration/ConfigurationLoader.cpp | 4 ++-- .../configuration/ConfigurationLoader.h | 4 ++-- .../core => }/configuration/MemSpec.cpp | 5 ++++- .../core => }/configuration/MemSpec.h | 6 +++--- .../configuration/TemperatureSimConfig.h | 12 ++++++------ DRAMSys/library/src/controller/Controller.cpp | 6 +++--- .../src/controller/ControllerRecordable.cpp | 16 ++++++++-------- .../library/src/controller/GenericController.h | 2 +- .../src/controller/checker/CheckerDDR3.cpp | 2 +- .../src/controller/checker/CheckerDDR3.h | 6 +++--- .../library/src/controller/checker/CheckerIF.h | 2 +- .../src/controller/checker/CheckerWideIO.cpp | 2 +- .../src/controller/checker/CheckerWideIO.h | 6 +++--- .../core/scheduling/ScheduledCommand.cpp | 4 ++-- .../src/controller/refresh/RefreshManager.cpp | 2 +- .../src/controller/refresh/RefreshManager.h | 2 +- .../refresh/RefreshManagerBankwise.cpp | 2 +- .../refresh/RefreshManagerBankwise.h | 2 +- DRAMSys/library/src/error/errormodel.h | 2 +- DRAMSys/library/src/simulation/Arbiter.h | 4 ++-- DRAMSys/library/src/simulation/DRAMSys.cpp | 4 ++-- DRAMSys/library/src/simulation/Dram.cpp | 4 ++-- DRAMSys/library/src/simulation/Dram.h | 4 ++-- DRAMSys/library/src/simulation/DramDDR3.cpp | 4 ++-- DRAMSys/library/src/simulation/DramDDR4.cpp | 4 ++-- .../library/src/simulation/DramRecordable.cpp | 12 ++++++------ DRAMSys/library/src/simulation/DramWideIO.cpp | 4 ++-- DRAMSys/library/src/simulation/IArbiter.h | 2 +- .../library/src/simulation/MemoryManager.cpp | 2 +- .../src/simulation/TemperatureController.cpp | 6 +++--- .../src/simulation/TemperatureController.h | 2 +- DRAMSys/library/src/simulation/TracePlayer.h | 4 ++-- 41 files changed, 94 insertions(+), 92 deletions(-) rename DRAMSys/library/src/{controller/core => common}/timingCalculations.cpp (94%) rename DRAMSys/library/src/{controller/core => common}/timingCalculations.h (97%) rename DRAMSys/library/src/{controller/core => }/configuration/Configuration.cpp (99%) rename DRAMSys/library/src/{controller/core => }/configuration/Configuration.h (98%) rename DRAMSys/library/src/{controller/core => }/configuration/ConfigurationLoader.cpp (99%) rename DRAMSys/library/src/{controller/core => }/configuration/ConfigurationLoader.h (97%) rename DRAMSys/library/src/{controller/core => }/configuration/MemSpec.cpp (98%) rename DRAMSys/library/src/{controller/core => }/configuration/MemSpec.h (98%) rename DRAMSys/library/src/{controller/core => }/configuration/TemperatureSimConfig.h (93%) diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro index e5232799..b7eae32c 100644 --- a/DRAMSys/library/library.pro +++ b/DRAMSys/library/library.pro @@ -89,14 +89,14 @@ SOURCES += \ src/common/third_party/tinyxml2/tinyxml2.cpp \ src/common/TlmRecorder.cpp \ src/common/DebugManager.cpp \ - src/controller/core/configuration/Configuration.cpp \ + src/configuration/Configuration.cpp \ src/controller/core/powerdown/PowerDownManagerTimeout.cpp \ src/controller/core/powerdown/PowerDownManagerBankwise.cpp \ src/controller/core/powerdown/PowerDownManager.cpp \ src/controller/core/scheduling/ScheduledCommand.cpp \ src/simulation/MemoryManager.cpp \ src/simulation/TemperatureController.cpp \ - src/controller/core/configuration/ConfigurationLoader.cpp \ + src/configuration/ConfigurationLoader.cpp \ src/controller/core/powerdown/NoPowerDown.cpp \ src/controller/Command.cpp \ src/error/errormodel.cpp \ @@ -115,14 +115,14 @@ SOURCES += \ src/simulation/Arbiter.cpp \ src/common/CongenAddressDecoder.cpp \ src/common/XmlAddressDecoder.cpp \ - src/controller/core/timingCalculations.cpp \ + src/common/timingCalculations.cpp \ src/common/dramExtensions.cpp \ src/common/utils.cpp \ src/simulation/DramDDR3.cpp \ src/simulation/DramDDR4.cpp \ src/simulation/DramRecordable.cpp \ src/simulation/DramWideIO.cpp \ - src/controller/core/configuration/MemSpec.cpp \ + src/configuration/MemSpec.cpp \ src/controller/BankMachine.cpp \ src/controller/Controller.cpp \ src/controller/scheduler/SchedulerFifo.cpp \ @@ -142,7 +142,7 @@ HEADERS += \ src/common/tlm2_base_protocol_checker.h \ src/common/protocol.h \ src/common/DebugManager.h \ - src/controller/core/configuration/Configuration.h \ + src/configuration/Configuration.h \ src/controller/core/powerdown/PowerDownManagerTimeout.h \ src/controller/core/powerdown/PowerDownManagerBankwise.h \ src/controller/core/powerdown/PowerDownManager.h \ @@ -153,7 +153,7 @@ HEADERS += \ src/simulation/Arbiter.h \ src/common/libDRAMPower.h \ src/simulation/ReorderBuffer.h \ - src/controller/core/configuration/MemSpec.h \ + src/configuration/MemSpec.h \ src/simulation/StlPlayer.h \ src/simulation/TracePlayerListener.h \ src/simulation/TraceGenerator.h \ @@ -161,7 +161,7 @@ HEADERS += \ src/controller/core/powerdown/NoPowerDown.h \ src/controller/Command.h \ src/controller/core/powerdown/IPowerDownManager.h \ - src/controller/core/configuration/ConfigurationLoader.h \ + src/configuration/ConfigurationLoader.h \ src/error/errormodel.h \ src/simulation/ExampleInitiator.h \ src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h \ @@ -178,10 +178,10 @@ HEADERS += \ src/common/AddressDecoder.h \ src/common/CongenAddressDecoder.h \ src/common/XmlAddressDecoder.h \ - src/controller/core/timingCalculations.h \ + src/common/timingCalculations.h \ src/common/dramExtensions.h \ src/common/utils.h \ - src/controller/core/configuration/TemperatureSimConfig.h \ + src/configuration/TemperatureSimConfig.h \ src/simulation/DramDDR3.h \ src/simulation/DramDDR4.h \ src/simulation/DramRecordable.h \ diff --git a/DRAMSys/library/src/common/DebugManager.cpp b/DRAMSys/library/src/common/DebugManager.cpp index 034e3747..ec50b87e 100644 --- a/DRAMSys/library/src/common/DebugManager.cpp +++ b/DRAMSys/library/src/common/DebugManager.cpp @@ -38,7 +38,7 @@ #ifdef DEBUGGING -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" using namespace std; void DebugManager::printDebugMessage(string sender, string message) diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp index b569823d..97c6709b 100644 --- a/DRAMSys/library/src/common/TlmRecorder.cpp +++ b/DRAMSys/library/src/common/TlmRecorder.cpp @@ -43,7 +43,7 @@ #include "protocol.h" #include "dramExtensions.h" #include "XmlAddressDecoder.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" using namespace std; diff --git a/DRAMSys/library/src/common/XmlAddressDecoder.cpp b/DRAMSys/library/src/common/XmlAddressDecoder.cpp index 786c3335..2da48e45 100644 --- a/DRAMSys/library/src/common/XmlAddressDecoder.cpp +++ b/DRAMSys/library/src/common/XmlAddressDecoder.cpp @@ -39,7 +39,7 @@ #include #include "utils.h" #include "bitset" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" using namespace tinyxml2; diff --git a/DRAMSys/library/src/common/dramExtensions.cpp b/DRAMSys/library/src/common/dramExtensions.cpp index 399d1b2f..d49666bf 100644 --- a/DRAMSys/library/src/common/dramExtensions.cpp +++ b/DRAMSys/library/src/common/dramExtensions.cpp @@ -36,7 +36,7 @@ */ #include "dramExtensions.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "map" #include "utils.h" diff --git a/DRAMSys/library/src/controller/core/timingCalculations.cpp b/DRAMSys/library/src/common/timingCalculations.cpp similarity index 94% rename from DRAMSys/library/src/controller/core/timingCalculations.cpp rename to DRAMSys/library/src/common/timingCalculations.cpp index 2fe9551a..ddf06098 100644 --- a/DRAMSys/library/src/controller/core/timingCalculations.cpp +++ b/DRAMSys/library/src/common/timingCalculations.cpp @@ -35,10 +35,10 @@ */ #include "timingCalculations.h" -#include "configuration/MemSpec.h" -#include "../../common/DebugManager.h" -#include "configuration/Configuration.h" -#include "../../common/utils.h" +#include "../configuration/MemSpec.h" +#include "DebugManager.h" +#include "../configuration/Configuration.h" +#include "utils.h" sc_time getDelayToMeetConstraint(sc_time previous, sc_time start, sc_time constraint) diff --git a/DRAMSys/library/src/controller/core/timingCalculations.h b/DRAMSys/library/src/common/timingCalculations.h similarity index 97% rename from DRAMSys/library/src/controller/core/timingCalculations.h rename to DRAMSys/library/src/common/timingCalculations.h index 4e8966ee..7288b93c 100644 --- a/DRAMSys/library/src/controller/core/timingCalculations.h +++ b/DRAMSys/library/src/common/timingCalculations.h @@ -39,8 +39,7 @@ #include #include -#include "../../common/dramExtensions.h" -#include "../Command.h" +#include "dramExtensions.h" sc_time getDelayToMeetConstraint(sc_time previous, sc_time start, sc_time constraint); diff --git a/DRAMSys/library/src/controller/core/configuration/Configuration.cpp b/DRAMSys/library/src/configuration/Configuration.cpp similarity index 99% rename from DRAMSys/library/src/controller/core/configuration/Configuration.cpp rename to DRAMSys/library/src/configuration/Configuration.cpp index e9adcbec..0624ae55 100644 --- a/DRAMSys/library/src/controller/core/configuration/Configuration.cpp +++ b/DRAMSys/library/src/configuration/Configuration.cpp @@ -40,7 +40,7 @@ #include "Configuration.h" #include "ConfigurationLoader.h" -#include "../../../common/XmlAddressDecoder.h" +#include "../common/XmlAddressDecoder.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/configuration/Configuration.h b/DRAMSys/library/src/configuration/Configuration.h similarity index 98% rename from DRAMSys/library/src/controller/core/configuration/Configuration.h rename to DRAMSys/library/src/configuration/Configuration.h index efab5eeb..9802b58e 100644 --- a/DRAMSys/library/src/controller/core/configuration/Configuration.h +++ b/DRAMSys/library/src/configuration/Configuration.h @@ -44,9 +44,9 @@ #include #include "MemSpec.h" #include "TemperatureSimConfig.h" -#include "../../../common/utils.h" +#include "../common/utils.h" -#include "../../../error/eccbaseclass.h" +#include "../error/eccbaseclass.h" enum class StorageMode {NoStorage, Store, ErrorModel}; diff --git a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/library/src/configuration/ConfigurationLoader.cpp similarity index 99% rename from DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp rename to DRAMSys/library/src/configuration/ConfigurationLoader.cpp index 76b0b971..71ae8b25 100644 --- a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp +++ b/DRAMSys/library/src/configuration/ConfigurationLoader.cpp @@ -37,7 +37,7 @@ #include "ConfigurationLoader.h" #include "MemSpec.h" -#include "../timingCalculations.h" +#include "../common/timingCalculations.h" using namespace tinyxml2; using namespace std; @@ -192,7 +192,7 @@ void ConfigurationLoader::loadCommons(Configuration &config, XMLElement *xmlSpec memSpec->tAL = clk * queryUIntParameter(timings, "AL"); memSpec->tCKE = clk * queryUIntParameter(timings, "CKE"); memSpec->tCKESR = clk * queryUIntParameter(timings, "CKESR"); - memSpec->tDQSCK = clk * queryUIntParameter(timings, "DQSCK"); + //memSpec->tDQSCK = clk * queryUIntParameter(timings, "DQSCK"); memSpec->tRAS = clk * queryUIntParameter(timings, "RAS"); memSpec->tRC = clk * queryUIntParameter(timings, "RC"); memSpec->tRCD = clk * queryUIntParameter(timings, "RCD"); diff --git a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/library/src/configuration/ConfigurationLoader.h similarity index 97% rename from DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h rename to DRAMSys/library/src/configuration/ConfigurationLoader.h index 7a4e0410..142a6918 100644 --- a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h +++ b/DRAMSys/library/src/configuration/ConfigurationLoader.h @@ -39,8 +39,8 @@ #define CONFIGURATIONLOADER_H #include -#include "../../../common/third_party/tinyxml2/tinyxml2.h" -#include "../../../common/utils.h" +#include "../common/third_party/tinyxml2/tinyxml2.h" +#include "../common/utils.h" #include "Configuration.h" class ConfigurationLoader diff --git a/DRAMSys/library/src/controller/core/configuration/MemSpec.cpp b/DRAMSys/library/src/configuration/MemSpec.cpp similarity index 98% rename from DRAMSys/library/src/controller/core/configuration/MemSpec.cpp rename to DRAMSys/library/src/configuration/MemSpec.cpp index dc31e2f5..891252d2 100644 --- a/DRAMSys/library/src/controller/core/configuration/MemSpec.cpp +++ b/DRAMSys/library/src/configuration/MemSpec.cpp @@ -37,7 +37,7 @@ #include #include -#include "../../Command.h" +#include "../controller/Command.h" #include "Configuration.h" using namespace tlm; @@ -84,7 +84,10 @@ TimeInterval MemSpec::getIntervalOnDataStrobe(Command command) const else if (command == Command::WR || command == Command::WRA) return TimeInterval(sc_time_stamp() + tWL, sc_time_stamp() + tWL + getWriteAccessTime()); else + { SC_REPORT_FATAL("MemSpec", "Method was called with invalid argument"); + return TimeInterval(); + } } // Returns the execution time for commands that have a fixed execution time diff --git a/DRAMSys/library/src/controller/core/configuration/MemSpec.h b/DRAMSys/library/src/configuration/MemSpec.h similarity index 98% rename from DRAMSys/library/src/controller/core/configuration/MemSpec.h rename to DRAMSys/library/src/configuration/MemSpec.h index 156f75e8..6d277e5a 100644 --- a/DRAMSys/library/src/controller/core/configuration/MemSpec.h +++ b/DRAMSys/library/src/configuration/MemSpec.h @@ -40,9 +40,9 @@ #include #include -#include "../../../common/dramExtensions.h" -#include "../../Command.h" -#include "../../../common/utils.h" +#include "../common/dramExtensions.h" +#include "../controller/Command.h" +#include "../common/utils.h" using namespace tlm; diff --git a/DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h b/DRAMSys/library/src/configuration/TemperatureSimConfig.h similarity index 93% rename from DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h rename to DRAMSys/library/src/configuration/TemperatureSimConfig.h index f8344541..a0505bbf 100644 --- a/DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h +++ b/DRAMSys/library/src/configuration/TemperatureSimConfig.h @@ -41,9 +41,9 @@ #include #include -#include "../../../common/DebugManager.h" -#include "../../../common/third_party/tinyxml2/tinyxml2.h" -#include "../../../common/utils.h" +#include "../common/DebugManager.h" +#include "../common/third_party/tinyxml2/tinyxml2.h" +#include "../common/utils.h" struct TemperatureSimConfig { @@ -113,13 +113,13 @@ struct TemperatureSimConfig void showTemperatureSimConfig() { - int i = 0; - for (auto e : powerInitialValues) { + int i __attribute__((unused)) = 0; + for (auto e __attribute__((unused)) : powerInitialValues) { PRINTDEBUGMESSAGE("TemperatureSimConfig", "powerInitialValues[" + std::to_string(i++) + "]: " + std::to_string(e)); } i = 0; - for (auto e : powerThresholds) { + for (auto e __attribute__((unused)) : powerThresholds) { PRINTDEBUGMESSAGE("TemperatureSimConfig", "powerThreshold[" + std::to_string(i++) + "]: " + std::to_string(e)); } diff --git a/DRAMSys/library/src/controller/Controller.cpp b/DRAMSys/library/src/controller/Controller.cpp index 20f98d58..335fa01b 100644 --- a/DRAMSys/library/src/controller/Controller.cpp +++ b/DRAMSys/library/src/controller/Controller.cpp @@ -34,7 +34,7 @@ #include "Controller.h" -#include "core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "scheduler/SchedulerFifo.h" #include "scheduler/SchedulerFrFcfs.h" #include "cmdmux/CmdMuxStrict.h" @@ -251,7 +251,7 @@ unsigned int Controller::transport_dbg(tlm_generic_payload &) void Controller::releasePayload() { - uint64_t id = DramExtension::getPayloadID(payloadToRelease); + uint64_t id __attribute__((unused)) = DramExtension::getPayloadID(payloadToRelease); PRINTDEBUGMESSAGE(name(), "Payload " + std::to_string(id) + " left system."); payloadToRelease->release(); @@ -265,7 +265,7 @@ void Controller::releasePayload() void Controller::acquirePayload() { - uint64_t id = DramExtension::getPayloadID(payloadToAcquire); + uint64_t id __attribute__((unused)) = DramExtension::getPayloadID(payloadToAcquire); PRINTDEBUGMESSAGE(name(), "Payload " + std::to_string(id) + " entered system."); if (numberOfPayloads == 0) diff --git a/DRAMSys/library/src/controller/ControllerRecordable.cpp b/DRAMSys/library/src/controller/ControllerRecordable.cpp index 55788b15..aa2c7722 100644 --- a/DRAMSys/library/src/controller/ControllerRecordable.cpp +++ b/DRAMSys/library/src/controller/ControllerRecordable.cpp @@ -35,7 +35,7 @@ #include "ControllerRecordable.h" #include "../common/protocol.h" -#include "core/configuration/Configuration.h" +#include "../configuration/Configuration.h" tlm_sync_enum ControllerRecordable::nb_transport_fw(tlm_generic_payload &trans, tlm_phase &phase, sc_time &delay) @@ -72,13 +72,13 @@ void ControllerRecordable::recordPhase(tlm_generic_payload &trans, tlm_phase pha { sc_time recTime = delay + sc_time_stamp(); - unsigned int thr = DramExtension::getExtension(trans).getThread().ID(); - unsigned int ch = DramExtension::getExtension(trans).getChannel().ID(); - unsigned int bg = DramExtension::getExtension(trans).getBankGroup().ID(); - unsigned int bank = DramExtension::getExtension(trans).getBank().ID(); - unsigned int row = DramExtension::getExtension(trans).getRow().ID(); - unsigned int col = DramExtension::getExtension(trans).getColumn().ID(); - uint64_t id = DramExtension::getExtension(trans).getPayloadID(); + unsigned int thr __attribute__((unused)) = DramExtension::getExtension(trans).getThread().ID(); + unsigned int ch __attribute__((unused)) = DramExtension::getExtension(trans).getChannel().ID(); + unsigned int bg __attribute__((unused)) = DramExtension::getExtension(trans).getBankGroup().ID(); + unsigned int bank __attribute__((unused)) = DramExtension::getExtension(trans).getBank().ID(); + unsigned int row __attribute__((unused)) = DramExtension::getExtension(trans).getRow().ID(); + unsigned int col __attribute__((unused)) = DramExtension::getExtension(trans).getColumn().ID(); + uint64_t id __attribute__((unused)) = DramExtension::getExtension(trans).getPayloadID(); PRINTDEBUGMESSAGE(name(), "Recording " + phaseNameToString(phase) + " thread " + to_string(thr) + " channel " + to_string(ch) + " bank group " + to_string( diff --git a/DRAMSys/library/src/controller/GenericController.h b/DRAMSys/library/src/controller/GenericController.h index 5d49dc68..896d6fcd 100644 --- a/DRAMSys/library/src/controller/GenericController.h +++ b/DRAMSys/library/src/controller/GenericController.h @@ -5,7 +5,7 @@ #include #include #include -#include "core/configuration/Configuration.h" +#include "../configuration/Configuration.h" using namespace tlm; diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp index 6661b967..38da02a6 100644 --- a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp @@ -62,7 +62,7 @@ CheckerDDR3::~CheckerDDR3() delete refreshChecker; } -sc_time CheckerDDR3::delayToSatisfyConstraints(Command command, Rank rank, BankGroup, Bank bank) +sc_time CheckerDDR3::delayToSatisfyConstraints(Command command, Rank rank, BankGroup, Bank bank) const { sc_time lastCommandStart; sc_time earliestTimeToStart = sc_time_stamp(); diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.h b/DRAMSys/library/src/controller/checker/CheckerDDR3.h index 5b5a52b8..b3632ba4 100644 --- a/DRAMSys/library/src/controller/checker/CheckerDDR3.h +++ b/DRAMSys/library/src/controller/checker/CheckerDDR3.h @@ -38,8 +38,8 @@ #include "CheckerIF.h" #include #include -#include "../core/configuration/MemSpec.h" -#include "../core/configuration/Configuration.h" +#include "../../configuration/MemSpec.h" +#include "../../configuration/Configuration.h" class RefreshCheckerDDR3Dummy; @@ -48,7 +48,7 @@ class CheckerDDR3 final : public CheckerIF public: CheckerDDR3(); ~CheckerDDR3(); - sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank); + sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank) const; void insert(Command, Rank, Bank); private: diff --git a/DRAMSys/library/src/controller/checker/CheckerIF.h b/DRAMSys/library/src/controller/checker/CheckerIF.h index 34cd9777..f01350fa 100644 --- a/DRAMSys/library/src/controller/checker/CheckerIF.h +++ b/DRAMSys/library/src/controller/checker/CheckerIF.h @@ -46,7 +46,7 @@ class CheckerIF public: virtual ~CheckerIF() {} - virtual sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank) = 0; + virtual sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank) const = 0; virtual void insert(Command, Rank, Bank) = 0; protected: diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp b/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp index 8369fb0f..60901022 100644 --- a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp @@ -62,7 +62,7 @@ CheckerWideIO::~CheckerWideIO() delete refreshChecker; } -sc_time CheckerWideIO::delayToSatisfyConstraints(Command command, Rank rank, BankGroup, Bank bank) +sc_time CheckerWideIO::delayToSatisfyConstraints(Command command, Rank rank, BankGroup, Bank bank) const { sc_time lastCommandStart; sc_time earliestTimeToStart = sc_time_stamp(); diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.h b/DRAMSys/library/src/controller/checker/CheckerWideIO.h index 6d48bbd9..cddbe9f5 100644 --- a/DRAMSys/library/src/controller/checker/CheckerWideIO.h +++ b/DRAMSys/library/src/controller/checker/CheckerWideIO.h @@ -38,8 +38,8 @@ #include "CheckerIF.h" #include #include -#include "../core/configuration/MemSpec.h" -#include "../core/configuration/Configuration.h" +#include "../../configuration/MemSpec.h" +#include "../../configuration/Configuration.h" class RefreshCheckerWideIODummy; @@ -48,7 +48,7 @@ class CheckerWideIO final : public CheckerIF public: CheckerWideIO(); ~CheckerWideIO(); - sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank); + sc_time delayToSatisfyConstraints(Command, Rank, BankGroup, Bank) const; void insert(Command, Rank, Bank); private: diff --git a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp index bdfebd0e..e26a56c0 100644 --- a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp @@ -35,9 +35,9 @@ */ #include "ScheduledCommand.h" -#include "../timingCalculations.h" +#include "../../../common/timingCalculations.h" #include "../../../common/utils.h" -#include "../configuration/Configuration.h" +#include "../../../configuration/Configuration.h" //#include "../configuration/MemSpec.h" bool ScheduledCommand::isNoCommand() const diff --git a/DRAMSys/library/src/controller/refresh/RefreshManager.cpp b/DRAMSys/library/src/controller/refresh/RefreshManager.cpp index b0a5687f..ce63d093 100644 --- a/DRAMSys/library/src/controller/refresh/RefreshManager.cpp +++ b/DRAMSys/library/src/controller/refresh/RefreshManager.cpp @@ -34,7 +34,7 @@ #include "RefreshManager.h" #include "../../common/dramExtensions.h" -#include "../core/configuration/Configuration.h" +#include "../../configuration/Configuration.h" #include "../../common/utils.h" RefreshManager::RefreshManager(std::vector &bankMachines) : bankMachines(bankMachines) diff --git a/DRAMSys/library/src/controller/refresh/RefreshManager.h b/DRAMSys/library/src/controller/refresh/RefreshManager.h index 4a9ccedf..9c424674 100644 --- a/DRAMSys/library/src/controller/refresh/RefreshManager.h +++ b/DRAMSys/library/src/controller/refresh/RefreshManager.h @@ -36,7 +36,7 @@ #define REFRESHMANAGER_H #include "RefreshManagerIF.h" -#include "../core/configuration/MemSpec.h" +#include "../../configuration/MemSpec.h" #include "../BankMachine.h" using namespace tlm; diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.cpp b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.cpp index 12bd1781..59a45813 100644 --- a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.cpp +++ b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.cpp @@ -33,7 +33,7 @@ */ #include "RefreshManagerBankwise.h" -#include "../core/configuration/Configuration.h" +#include "../../configuration/Configuration.h" #include "../../common/utils.h" #include "../../common/dramExtensions.h" diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h index 97ae782a..c58d4595 100644 --- a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h +++ b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h @@ -36,7 +36,7 @@ #define REFRESHMANAGERBANKWISE_H #include "RefreshManagerIF.h" -#include "../core/configuration/MemSpec.h" +#include "../../configuration/MemSpec.h" #include "../BankMachine.h" #include #include diff --git a/DRAMSys/library/src/error/errormodel.h b/DRAMSys/library/src/error/errormodel.h index 23101b75..d027d9b3 100644 --- a/DRAMSys/library/src/error/errormodel.h +++ b/DRAMSys/library/src/error/errormodel.h @@ -39,7 +39,7 @@ #include #include #include -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "../common/XmlAddressDecoder.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" diff --git a/DRAMSys/library/src/simulation/Arbiter.h b/DRAMSys/library/src/simulation/Arbiter.h index 1be19fe8..b8576eda 100644 --- a/DRAMSys/library/src/simulation/Arbiter.h +++ b/DRAMSys/library/src/simulation/Arbiter.h @@ -48,8 +48,8 @@ #include #include "../common/XmlAddressDecoder.h" #include "../common/dramExtensions.h" -#include "../controller/core/timingCalculations.h" -#include "../controller/core/configuration/ConfigurationLoader.h" +#include "../common/timingCalculations.h" +#include "../configuration/ConfigurationLoader.h" using namespace std; using namespace tlm; diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp index bfb16a85..dcae5552 100644 --- a/DRAMSys/library/src/simulation/DRAMSys.cpp +++ b/DRAMSys/library/src/simulation/DRAMSys.cpp @@ -48,7 +48,7 @@ #include "../common/DebugManager.h" #include "../common/XmlAddressDecoder.h" #include "../common/CongenAddressDecoder.h" -#include "../controller/core/configuration/ConfigurationLoader.h" +#include "../configuration/ConfigurationLoader.h" #include "../common/utils.h" #include "../simulation/TemperatureController.h" #include "../error/ecchamming.h" @@ -178,7 +178,7 @@ void DRAMSys::logo() #undef BOLDBLUETXT } -void DRAMSys::setupDebugManager(const string &traceName) +void DRAMSys::setupDebugManager(const string &traceName __attribute__((unused))) { #ifdef DEBUGGING auto &dbg = DebugManager::getInstance(); diff --git a/DRAMSys/library/src/simulation/Dram.cpp b/DRAMSys/library/src/simulation/Dram.cpp index cca8b2c2..1475747e 100644 --- a/DRAMSys/library/src/simulation/Dram.cpp +++ b/DRAMSys/library/src/simulation/Dram.cpp @@ -50,8 +50,8 @@ #include #include "../common/DebugManager.h" #include "../common/dramExtensions.h" -#include "../controller/core/timingCalculations.h" -#include "../controller/core/configuration/Configuration.h" +#include "../common/timingCalculations.h" +#include "../configuration/Configuration.h" #include "../common/protocol.h" #include "../common/utils.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" diff --git a/DRAMSys/library/src/simulation/Dram.h b/DRAMSys/library/src/simulation/Dram.h index d5dc3ef9..ea0a2822 100644 --- a/DRAMSys/library/src/simulation/Dram.h +++ b/DRAMSys/library/src/simulation/Dram.h @@ -44,8 +44,8 @@ #include #include #include "../common/protocol.h" -#include "../controller/core/configuration/Configuration.h" -#include "../controller/core/configuration/MemSpec.h" +#include "../configuration/Configuration.h" +#include "../configuration/MemSpec.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" using namespace std; diff --git a/DRAMSys/library/src/simulation/DramDDR3.cpp b/DRAMSys/library/src/simulation/DramDDR3.cpp index acc9f865..66d70e08 100644 --- a/DRAMSys/library/src/simulation/DramDDR3.cpp +++ b/DRAMSys/library/src/simulation/DramDDR3.cpp @@ -36,9 +36,9 @@ #include "DramDDR3.h" #include "Dram.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" -#include "../controller/core/configuration/MemSpec.h" +#include "../configuration/MemSpec.h" DramDDR3::DramDDR3(sc_module_name name) : Dram(name) { diff --git a/DRAMSys/library/src/simulation/DramDDR4.cpp b/DRAMSys/library/src/simulation/DramDDR4.cpp index 71517b2e..36caf370 100644 --- a/DRAMSys/library/src/simulation/DramDDR4.cpp +++ b/DRAMSys/library/src/simulation/DramDDR4.cpp @@ -36,9 +36,9 @@ #include "DramDDR4.h" #include "Dram.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" -#include "../controller/core/configuration/MemSpec.h" +#include "../configuration/MemSpec.h" DramDDR4::DramDDR4(sc_module_name name) : Dram(name) { diff --git a/DRAMSys/library/src/simulation/DramRecordable.cpp b/DRAMSys/library/src/simulation/DramRecordable.cpp index e52e679f..c0eeec7d 100644 --- a/DRAMSys/library/src/simulation/DramRecordable.cpp +++ b/DRAMSys/library/src/simulation/DramRecordable.cpp @@ -88,12 +88,12 @@ tlm_sync_enum DramRecordable::nb_transport_fw(tlm_generic_payload &pay else if (phase == END_SREF || phase == END_SREFB) recTime += this->memSpec->getExecutionTime(Command::SREFEX); - unsigned int thr = DramExtension::getExtension(payload).getThread().ID(); - unsigned int ch = DramExtension::getExtension(payload).getChannel().ID(); - unsigned int bg = DramExtension::getExtension(payload).getBankGroup().ID(); - unsigned int bank = DramExtension::getExtension(payload).getBank().ID(); - unsigned int row = DramExtension::getExtension(payload).getRow().ID(); - unsigned int col = DramExtension::getExtension(payload).getColumn().ID(); + unsigned int thr __attribute__((unused)) = DramExtension::getExtension(payload).getThread().ID(); + unsigned int ch __attribute__((unused)) = DramExtension::getExtension(payload).getChannel().ID(); + unsigned int bg __attribute__((unused)) = DramExtension::getExtension(payload).getBankGroup().ID(); + unsigned int bank __attribute__((unused)) = DramExtension::getExtension(payload).getBank().ID(); + unsigned int row __attribute__((unused)) = DramExtension::getExtension(payload).getRow().ID(); + unsigned int col __attribute__((unused)) = DramExtension::getExtension(payload).getColumn().ID(); PRINTDEBUGMESSAGE(this->name(), "Recording " + phaseNameToString(phase) + " thread " + to_string(thr) + " channel " + to_string(ch) + " bank group " + to_string( diff --git a/DRAMSys/library/src/simulation/DramWideIO.cpp b/DRAMSys/library/src/simulation/DramWideIO.cpp index 0bbaf9c5..41f05077 100644 --- a/DRAMSys/library/src/simulation/DramWideIO.cpp +++ b/DRAMSys/library/src/simulation/DramWideIO.cpp @@ -38,10 +38,10 @@ #include #include #include "Dram.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "../error/errormodel.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" -#include "../controller/core/configuration/MemSpec.h" +#include "../configuration/MemSpec.h" using namespace tlm; diff --git a/DRAMSys/library/src/simulation/IArbiter.h b/DRAMSys/library/src/simulation/IArbiter.h index 5b18dc1a..1ad91a0e 100644 --- a/DRAMSys/library/src/simulation/IArbiter.h +++ b/DRAMSys/library/src/simulation/IArbiter.h @@ -44,7 +44,7 @@ #include #include #include -#include "../controller/core/configuration/ConfigurationLoader.h" +#include "../configuration/ConfigurationLoader.h" using namespace std; using namespace tlm; diff --git a/DRAMSys/library/src/simulation/MemoryManager.cpp b/DRAMSys/library/src/simulation/MemoryManager.cpp index 49f2a014..f5dee080 100644 --- a/DRAMSys/library/src/simulation/MemoryManager.cpp +++ b/DRAMSys/library/src/simulation/MemoryManager.cpp @@ -36,7 +36,7 @@ #include "MemoryManager.h" #include "../common/DebugManager.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include using namespace std; diff --git a/DRAMSys/library/src/simulation/TemperatureController.cpp b/DRAMSys/library/src/simulation/TemperatureController.cpp index 09489377..04fb716d 100644 --- a/DRAMSys/library/src/simulation/TemperatureController.cpp +++ b/DRAMSys/library/src/simulation/TemperatureController.cpp @@ -37,7 +37,7 @@ #include #include "TemperatureController.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" double TemperatureController::temperatureConvert(double tKelvin) { @@ -164,8 +164,8 @@ void TemperatureController::temperatureThread() updateTemperatures(); double p = adjustThermalSimPeriod(); - int i = 0; - for (auto t : temperatureValues) { + int i __attribute__((unused)) = 0; + for (auto t __attribute__((unused)) : temperatureValues) { PRINTDEBUGMESSAGE(name(), "Temperature[" + std::to_string(i++) + "] is " + std::to_string(t)); } diff --git a/DRAMSys/library/src/simulation/TemperatureController.h b/DRAMSys/library/src/simulation/TemperatureController.h index fa16c1f0..aeb02e00 100644 --- a/DRAMSys/library/src/simulation/TemperatureController.h +++ b/DRAMSys/library/src/simulation/TemperatureController.h @@ -44,7 +44,7 @@ #include "../common/DebugManager.h" #include "../common/utils.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #ifdef THERMALSIM #include "IceWrapper.h" diff --git a/DRAMSys/library/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h index 9adbcb51..b866e5ce 100644 --- a/DRAMSys/library/src/simulation/TracePlayer.h +++ b/DRAMSys/library/src/simulation/TracePlayer.h @@ -47,10 +47,10 @@ #include #include #include "MemoryManager.h" -#include "../controller/core/configuration/Configuration.h" +#include "../configuration/Configuration.h" #include "../common/DebugManager.h" #include "../common/XmlAddressDecoder.h" -#include "../controller/core/timingCalculations.h" +#include "../common/timingCalculations.h" #include "TracePlayerListener.h" using namespace std;