derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed directory of configuration, added attribute unused to suppress warnings.

Browse Source
This commit is contained in:
Lukas Steiner (2)
2019-09-23 13:24:47 +02:00
parent 650e1d405b
commit c1b741d89b
41 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DRAMSys/library/library.pro
View File

@@ -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 \

2
DRAMSys/library/src/common/DebugManager.cpp
View File

@@ -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)

2
DRAMSys/library/src/common/TlmRecorder.cpp
View File

@@ -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;

2
DRAMSys/library/src/common/XmlAddressDecoder.cpp
View File

@@ -39,7 +39,7 @@
#include <systemc.h>
#include "utils.h"
#include "bitset"
#include "../controller/core/configuration/Configuration.h"
#include "../configuration/Configuration.h"
using namespace tinyxml2;

2
DRAMSys/library/src/common/dramExtensions.cpp
View File

@@ -36,7 +36,7 @@
*/
#include "dramExtensions.h"
#include "../controller/core/configuration/Configuration.h"
#include "../configuration/Configuration.h"
#include "map"
#include "utils.h"

8
DRAMSys/library/src/controller/core/timingCalculations.cpp → DRAMSys/library/src/common/timingCalculations.cpp
View File

@@ -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)

3
DRAMSys/library/src/controller/core/timingCalculations.h → DRAMSys/library/src/common/timingCalculations.h
View File

@@ -39,8 +39,7 @@
#include <systemc.h>
#include <tlm.h>
#include "../../common/dramExtensions.h"
#include "../Command.h"
#include "dramExtensions.h"
sc_time getDelayToMeetConstraint(sc_time previous, sc_time start,
sc_time constraint);

2
DRAMSys/library/src/controller/core/configuration/Configuration.cpp → DRAMSys/library/src/configuration/Configuration.cpp
View File

@@ -40,7 +40,7 @@
#include "Configuration.h"
#include "ConfigurationLoader.h"
#include "../../../common/XmlAddressDecoder.h"
#include "../common/XmlAddressDecoder.h"
using namespace std;

4
DRAMSys/library/src/controller/core/configuration/Configuration.h → DRAMSys/library/src/configuration/Configuration.h
View File

@@ -44,9 +44,9 @@
#include <cstdint>
#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};

4
DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp → DRAMSys/library/src/configuration/ConfigurationLoader.cpp
View File

@@ -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");

4
DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h → DRAMSys/library/src/configuration/ConfigurationLoader.h
View File

@@ -39,8 +39,8 @@
#define CONFIGURATIONLOADER_H
#include <string>
#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

5
DRAMSys/library/src/controller/core/configuration/MemSpec.cpp → DRAMSys/library/src/configuration/MemSpec.cpp
View File

@@ -37,7 +37,7 @@
#include <systemc>
#include <tlm>
#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

6
DRAMSys/library/src/controller/core/configuration/MemSpec.h → DRAMSys/library/src/configuration/MemSpec.h
View File

@@ -40,9 +40,9 @@
#include <systemc.h>
#include <map>
#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;

12
DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h → DRAMSys/library/src/configuration/TemperatureSimConfig.h
View File

@@ -41,9 +41,9 @@
#include <iostream>
#include <string>
#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));
}

6
DRAMSys/library/src/controller/Controller.cpp
View File

@@ -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)

16
DRAMSys/library/src/controller/ControllerRecordable.cpp
View File

@@ -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(

2
DRAMSys/library/src/controller/GenericController.h
View File

@@ -5,7 +5,7 @@
#include <tlm.h>
#include <tlm_utils/simple_initiator_socket.h>
#include <tlm_utils/simple_target_socket.h>
#include "core/configuration/Configuration.h"
#include "../configuration/Configuration.h"
using namespace tlm;

2
DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
View File

@@ -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();

6
DRAMSys/library/src/controller/checker/CheckerDDR3.h
View File

@@ -38,8 +38,8 @@
#include "CheckerIF.h"
#include <queue>
#include <vector>
#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:

2
DRAMSys/library/src/controller/checker/CheckerIF.h
View File

@@ -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:

2
DRAMSys/library/src/controller/checker/CheckerWideIO.cpp
View File

@@ -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();

6
DRAMSys/library/src/controller/checker/CheckerWideIO.h
View File

@@ -38,8 +38,8 @@
#include "CheckerIF.h"
#include <queue>
#include <vector>
#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:

4
DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp
View File

@@ -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

2
DRAMSys/library/src/controller/refresh/RefreshManager.cpp
View File

@@ -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<BankMachine *> &bankMachines) : bankMachines(bankMachines)

2
DRAMSys/library/src/controller/refresh/RefreshManager.h
View File

@@ -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;

2
DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.cpp
View File

@@ -33,7 +33,7 @@
*/
#include "RefreshManagerBankwise.h"
#include "../core/configuration/Configuration.h"
#include "../../configuration/Configuration.h"
#include "../../common/utils.h"
#include "../../common/dramExtensions.h"

2
DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h
View File

@@ -36,7 +36,7 @@
#define REFRESHMANAGERBANKWISE_H
#include "RefreshManagerIF.h"
#include "../core/configuration/MemSpec.h"
#include "../../configuration/MemSpec.h"
#include "../BankMachine.h"
#include <vector>
#include <utility>

2
DRAMSys/library/src/error/errormodel.h
View File

@@ -39,7 +39,7 @@
#include <map>
#include <iostream>
#include <systemc.h>
#include "../controller/core/configuration/Configuration.h"
#include "../configuration/Configuration.h"
#include "../common/XmlAddressDecoder.h"
#include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"

4
DRAMSys/library/src/simulation/Arbiter.h
View File

@@ -48,8 +48,8 @@
#include <tlm_utils/peq_with_cb_and_phase.h>
#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;

4
DRAMSys/library/src/simulation/DRAMSys.cpp
View File

@@ -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();

4
DRAMSys/library/src/simulation/Dram.cpp
View File

@@ -50,8 +50,8 @@
#include <stdlib.h>
#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"

4
DRAMSys/library/src/simulation/Dram.h
View File

@@ -44,8 +44,8 @@
#include <systemc>
#include <tlm_utils/simple_target_socket.h>
#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;

4
DRAMSys/library/src/simulation/DramDDR3.cpp
View File

@@ -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)
{

4
DRAMSys/library/src/simulation/DramDDR4.cpp
View File

@@ -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)
{

12
DRAMSys/library/src/simulation/DramRecordable.cpp
View File

@@ -88,12 +88,12 @@ tlm_sync_enum DramRecordable<BaseDram>::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(

4
DRAMSys/library/src/simulation/DramWideIO.cpp
View File

@@ -38,10 +38,10 @@
#include <systemc>
#include <tlm>
#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;

2
DRAMSys/library/src/simulation/IArbiter.h
View File

@@ -44,7 +44,7 @@
#include <queue>
#include <tlm_utils/multi_passthrough_target_socket.h>
#include <tlm_utils/multi_passthrough_initiator_socket.h>
#include "../controller/core/configuration/ConfigurationLoader.h"
#include "../configuration/ConfigurationLoader.h"
using namespace std;
using namespace tlm;

2
DRAMSys/library/src/simulation/MemoryManager.cpp
View File

@@ -36,7 +36,7 @@
#include "MemoryManager.h"
#include "../common/DebugManager.h"
#include "../controller/core/configuration/Configuration.h"
#include "../configuration/Configuration.h"
#include <iostream>
using namespace std;

6
DRAMSys/library/src/simulation/TemperatureController.cpp
View File

@@ -37,7 +37,7 @@
#include <cmath>
#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));
}

2
DRAMSys/library/src/simulation/TemperatureController.h
View File

@@ -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"

4
DRAMSys/library/src/simulation/TracePlayer.h
View File

@@ -47,10 +47,10 @@
#include <iostream>
#include <string>
#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;