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

Renaming files (Commit 2 of 2)

Browse Source
This commit is contained in:
Lukas Steiner
2019-06-12 20:25:38 +02:00
parent cd67d638d4
commit abcd2a910b
52 changed files with 66 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DRAMSys/library/library.pro
View File

@@ -141,9 +141,9 @@ SOURCES += \
src/simulation/Arbiter.cpp \
src/common/CongenAddressDecoder.cpp \
src/common/XmlAddressDecoder.cpp \
src/common/rename_utils.cpp \
src/controller/core/timingCalculations.cpp \
src/common/dramExtensions.cpp
src/common/dramExtensions.cpp \
src/common/utils.cpp
HEADERS += \
src/common/third_party/tinyxml2/tinyxml2.h \
@@ -173,7 +173,6 @@ HEADERS += \
src/controller/core/scheduling/checker/ActivateChecker.h \
src/controller/core/scheduling/checker/PreBChecker.h \
src/controller/core/scheduling/checker/ActBChecker.h \
src/controller/core/scheduling/Trigger.h \
src/controller/core/scheduling/ScheduledCommand.h \
src/controller/core/Slots.h \
src/controller/core/ControllerCore.h \
@@ -184,7 +183,6 @@ HEADERS += \
src/common/libDRAMPower.h \
src/simulation/ReorderBuffer.h \
src/controller/core/configuration/MemSpec.h \
src/controller/core/configuration/thermalSimConfig.h \
src/simulation/StlPlayer.h \
src/simulation/TracePlayerListener.h \
src/simulation/TraceGenerator.h \
@@ -219,9 +217,10 @@ HEADERS += \
src/common/AddressDecoder.h \
src/common/CongenAddressDecoder.h \
src/common/XmlAddressDecoder.h \
src/common/rename_utils.h \
src/controller/core/timingCalculations.h \
src/common/dramExtensions.h
src/common/dramExtensions.h \
src/common/utils.h \
src/controller/core/configuration/TemperatureSimConfig.h
#src/common/third_party/json/include/nlohmann/json.hpp \
thermalsim = $$(THERMALSIM)

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

@@ -34,7 +34,7 @@
*/
#include "CongenAddressDecoder.h"
#include "rename_utils.h"
#include "utils.h"
#include <fstream>

3
DRAMSys/library/src/common/CongenAddressDecoder.h
View File

@@ -47,8 +47,7 @@ using std::vector;
using std::pair;
using std::map;
class CongenAddressDecoder
: private AddressDecoder
class CongenAddressDecoder : private AddressDecoder
{
// Friendship needed so that the AddressDecoder can access the
// constructor of this class to create the object in CreateInstance.

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

@@ -40,7 +40,7 @@
#include <systemc.h>
#include <string>
#include <set>
#include "rename_utils.h"
#include "utils.h"
class DebugManager
{

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

@@ -51,7 +51,7 @@
#include <systemc.h>
#include "XmlAddressDecoder.h"
#include "DebugManager.h"
#include "rename_utils.h"
#include "utils.h"
using namespace std;

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

@@ -37,7 +37,7 @@
#include "XmlAddressDecoder.h"
#include <systemc.h>
#include "rename_utils.h"
#include "utils.h"
#include "bitset"
#include "../controller/core/configuration/Configuration.h"

5
DRAMSys/library/src/common/XmlAddressDecoder.h
View File

@@ -40,12 +40,11 @@
#include <math.h>
#include "rename_utils.h"
#include "utils.h"
#include "third_party/tinyxml2/tinyxml2.h"
#include "AddressDecoder.h"
class XmlAddressDecoder
: private AddressDecoder
class XmlAddressDecoder : private AddressDecoder
{
// Friendship needed so that the AddressDecoder can access the
// constructor of this class to create the object in CreateInstance.

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

@@ -38,7 +38,7 @@
#include "dramExtensions.h"
#include "../controller/core/configuration/Configuration.h"
#include "map"
#include "rename_utils.h"
#include "utils.h"
using namespace tlm;

1
DRAMSys/library/src/common/dramExtensions.h
View File

@@ -41,7 +41,6 @@
#include <iostream>
#include <systemc.h>
class Thread
{
public:

2
DRAMSys/library/src/common/rename_utils.cpp → DRAMSys/library/src/common/utils.cpp
View File

@@ -35,7 +35,7 @@
* Matthias Jung
*/
#include "rename_utils.h"
#include "utils.h"
#include <string>
#include <tlm.h>
#include <fstream>

0
DRAMSys/library/src/common/rename_utils.h → DRAMSys/library/src/common/utils.h
View File

1
DRAMSys/library/src/controller/Command.h
View File

@@ -39,7 +39,6 @@
#include <string>
#include <vector>
enum class Command {
NOP,
PreB,

3
DRAMSys/library/src/controller/Controller.h
View File

@@ -53,7 +53,7 @@
#include "../common/DebugManager.h"
#include "../common/protocol.h"
#include "../common/TlmRecorder.h"
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "core/configuration/Configuration.h"
#include "core/configuration/MemSpec.h"
#include "Command.h"
@@ -62,7 +62,6 @@
#include "IController.h"
#include "core/powerdown/IPowerDownManager.h"
#include "core/scheduling/ScheduledCommand.h"
#include "core/scheduling/Trigger.h"
#include "core/timingCalculations.h"
#include "scheduler/Fifo.h"
#include "scheduler/Grp.h"

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

@@ -41,9 +41,9 @@
#include <queue>
#include <systemc.h>
#include "core/scheduling/ScheduledCommand.h"
#include "core/scheduling/Trigger.h"
#include "../common/dramExtensions.h"
enum Trigger {REFTrigger, PDNTrigger};
// Utiliy class to pass around the Controller class to the controller Core and various schedulers, without having to propagate the template defintions
// throughout all classes

2
DRAMSys/library/src/controller/RowBufferStates.cpp
View File

@@ -37,7 +37,7 @@
#include "RowBufferStates.h"
#include "core/ControllerCore.h"
#include "../common/DebugManager.h"
#include "../common/rename_utils.h"
#include "../common/utils.h"
using namespace std;

2
DRAMSys/library/src/controller/core/ControllerCore.cpp
View File

@@ -50,7 +50,7 @@
#include "refresh/RefreshManager.h"
#include "refresh/RGR.h"
#include "../../common/dramExtensions.h"
#include "../../common/rename_utils.h"
#include "../../common/utils.h"
#include "timingCalculations.h"
#include "powerdown/PowerDownManager.h"

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

@@ -43,8 +43,8 @@
#include <string>
#include <cstdint>
#include "MemSpec.h"
#include "thermalSimConfig.h"
#include "../../../common/rename_utils.h"
#include "TemperatureSimConfig.h"
#include "../../../common/utils.h"
#include "../../../error/eccbaseclass.h"

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

@@ -39,7 +39,7 @@
#include <string>
#include "../../../common/third_party/tinyxml2/tinyxml2.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#include "Configuration.h"
class ConfigurationLoader

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

@@ -34,14 +34,13 @@
* Matthias Jung
*/
#ifndef MemSpec_H_
#define MemSpec_H_
#ifndef MEMSPEC_H
#define MEMSPEC_H
#include <systemc.h>
#include <map>
#include "../../../common/dramExtensions.h"
struct RefreshTiming {
RefreshTiming() {}
RefreshTiming(sc_time tRFC, sc_time tREFI) : tRFC(tRFC), tRFC2(SC_ZERO_TIME),
@@ -165,5 +164,5 @@ struct MemSpec {
}
};
#endif /* MemSpec_H_ */
#endif // MEMSPEC_H

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

@@ -34,8 +34,8 @@
* Matthias Jung
*/
#ifndef THERMALSIM_CONFIG_H
#define THERMALSIM_CONFIG_H
#ifndef TEMPERATURESIMCONFIG_H
#define TEMPERATURESIMCONFIG_H
#include <systemc.h>
#include <iostream>
@@ -43,10 +43,10 @@
#include "../../../common/DebugManager.h"
#include "../../../common/third_party/tinyxml2/tinyxml2.h"
#include "../../../common/rename_utils.h"
struct TemperatureSimConfig {
#include "../../../common/utils.h"
struct TemperatureSimConfig
{
// Temperature Scale
std::string TemperatureScale;
std::string pathToResources;
@@ -132,5 +132,5 @@ struct TemperatureSimConfig {
}
};
#endif /* THERMALSIM_CONFIG_H */
#endif // TEMPERATURESIMCONFIG_H

2
DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h
View File

@@ -45,7 +45,7 @@
class NoPowerDown: public IPowerDownManager
class NoPowerDown : public IPowerDownManager
{
public:
NoPowerDown() {}

2
DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp
View File

@@ -42,7 +42,7 @@
#include "../timingCalculations.h"
#include "../../../common/DebugManager.h"
#include <algorithm>
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
using namespace tlm;
using namespace std;

2
DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
View File

@@ -36,7 +36,7 @@
#include "PowerDownManager.h"
#include "../ControllerCore.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#include "../../../common/DebugManager.h"
#include "../timingCalculations.h"

2
DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
View File

@@ -38,7 +38,7 @@
#include "PowerDownManagerTimeout.h"
#include "../ControllerCore.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#include "../../../common/DebugManager.h"
#include "../timingCalculations.h"

2
DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp
View File

@@ -38,7 +38,7 @@
#include "PowerDownManagerTimeoutBankwise.h"
#include "../ControllerCore.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#include "../../../common/DebugManager.h"
#include "../timingCalculations.h"

2
DRAMSys/library/src/controller/core/refresh/RGR.cpp
View File

@@ -37,7 +37,7 @@
#include "RGR.h"
#include "../ControllerCore.h"
#include "../timingCalculations.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#define TRUE 1
#define FALSE !(TRUE)

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

@@ -40,7 +40,7 @@
#include "RefreshManager.h"
#include "../ControllerCore.h"
#include "../timingCalculations.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
using namespace tlm;

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

@@ -38,7 +38,7 @@
#include "RefreshManagerBankwise.h"
#include "../ControllerCore.h"
#include "../timingCalculations.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
using namespace std;

6
DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h
View File

@@ -35,8 +35,8 @@
* Éder F. Zulian
*/
#ifndef BANKWISEREFRESHMANAGER_H
#define BANKWISEREFRESHMANAGER_H
#ifndef REFRESHMANAGERBANKWISE_H
#define REFRESHMANAGERBANKWISE_H
//#include "../../../common/dramExtension.h"
#include "IRefreshManager.h"
@@ -79,5 +79,5 @@ private:
void printDebugMessage(std::string message);
};
#endif // BANKWISEREFRESHMANAGER_H
#endif // REFRESHMANAGERBANKWISE_H

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

@@ -36,7 +36,7 @@
#include "ScheduledCommand.h"
#include "../timingCalculations.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
#include "../configuration/Configuration.h"
bool ScheduledCommand::isNoCommand() const

2
DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h
View File

@@ -41,7 +41,7 @@
#include <tlm.h>
#include "../../Command.h"
#include "../../../common/dramExtensions.h"
#include "../../../common/rename_utils.h"
#include "../../../common/utils.h"
class ScheduledCommand
{

44
DRAMSys/library/src/controller/core/scheduling/Trigger.h
View File

@@ -1,44 +0,0 @@
/*
* Copyright (c) 2015, University of Kaiserslautern
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors:
* Janik Schlemminger
* Matthias Jung
*/
#ifndef TRIGGER_H
#define TRIGGER_H
enum Trigger {REFTrigger, PDNTrigger};
#endif // TRIGGER_H

2
DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp
View File

@@ -39,7 +39,7 @@
#include "../../timingCalculations.h"
#include "../../../../common/DebugManager.h"
#include "../../../Command.h"
#include "../../../../common/rename_utils.h"
#include "../../../../common/utils.h"
using namespace std;

2
DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp
View File

@@ -41,7 +41,7 @@
#include "../../timingCalculations.h"
#include "../../../../common/DebugManager.h"
#include "../../../Command.h"
#include "../../../../common/rename_utils.h"
#include "../../../../common/utils.h"
using namespace std;

2
DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp
View File

@@ -36,7 +36,7 @@
#include "ReadChecker.h"
#include "../../timingCalculations.h"
#include "../../../../common/rename_utils.h"
#include "../../../../common/utils.h"
#include "WriteChecker.h"
using namespace std;

2
DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h
View File

@@ -42,7 +42,7 @@
#include "../../configuration/Configuration.h"
#include <systemc>
class RefreshChecker: public ICommandChecker
class RefreshChecker : public ICommandChecker
{
public:
RefreshChecker(const Configuration &config, ControllerState &state) :

2
DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp
View File

@@ -36,7 +36,7 @@
#include "WriteChecker.h"
#include "../../timingCalculations.h"
#include "../../../../common/rename_utils.h"
#include "../../../../common/utils.h"
#include "ReadChecker.h"
using namespace std;

2
DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h
View File

@@ -41,7 +41,7 @@
#include "../../configuration/Configuration.h"
#include "../../../ControllerState.h"
class WriteChecker: public ICommandChecker
class WriteChecker : public ICommandChecker
{
public:
WriteChecker(const Configuration &config,

2
DRAMSys/library/src/controller/core/timingCalculations.cpp
View File

@@ -39,7 +39,7 @@
#include "ControllerCore.h"
#include "../../common/DebugManager.h"
#include "configuration/Configuration.h"
#include "../../common/rename_utils.h"
#include "../../common/utils.h"

1
DRAMSys/library/src/controller/core/timingCalculations.h
View File

@@ -42,7 +42,6 @@
#include "../../common/dramExtensions.h"
#include "../Command.h"
sc_time getMinExecutionTimeForPowerDownCmd(Command command);
sc_time getExecutionTime(Command command, tlm::tlm_generic_payload &payload);

1
DRAMSys/library/src/controller/scheduler/IScheduler.h
View File

@@ -38,7 +38,6 @@
#ifndef ISCHEDULER_H
#define ISCHEDULER_H
#include <tlm.h>
#include "../../common/dramExtensions.h"
#include "../Command.h"

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

@@ -50,7 +50,7 @@
#include "../common/CongenAddressDecoder.h"
#include "../controller/core/ControllerCore.h"
#include "../controller/core/configuration/ConfigurationLoader.h"
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "../simulation/TemperatureController.h"
#include "../controller/Controller.h"
#include "../error/ecchamming.h"

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

@@ -53,7 +53,7 @@
#include "../common/tlm2_base_protocol_checker.h"
#include "../error/eccbaseclass.h"
class DRAMSys: public sc_module
class DRAMSys : public sc_module
{
public:
tlm_utils::multi_passthrough_target_socket<DRAMSys> tSocket;

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

@@ -54,7 +54,7 @@
#include "../controller/core/timingCalculations.h"
#include "../controller/core/configuration/Configuration.h"
#include "../common/protocol.h"
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
#include "../error/errormodel.h"

3
DRAMSys/library/src/simulation/ExampleInitiator.h
View File

@@ -10,7 +10,8 @@
using namespace std;
struct ExampleInitiator: sc_module {
struct ExampleInitiator : sc_module
{
// TLM-2 socket, defaults to 32-bits wide, base protocol
tlm_utils::simple_initiator_socket<ExampleInitiator> socket;

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

@@ -49,7 +49,8 @@
using namespace std;
using namespace tlm;
struct IArbiter: public sc_module {
struct IArbiter : public sc_module
{
public:
tlm_utils::multi_passthrough_target_socket<IArbiter> tSocket;
tlm_utils::multi_passthrough_initiator_socket<IArbiter> iSocket;

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

@@ -39,7 +39,7 @@
#include <vector>
#include <string>
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "TracePlayer.h"
#include "StlPlayer.h"

3
DRAMSys/library/src/simulation/StlPlayer.h
View File

@@ -46,7 +46,8 @@
using namespace std;
using namespace tlm;
template <bool relative> class StlPlayer: public TracePlayer
template<bool relative>
class StlPlayer : public TracePlayer
{
public:
StlPlayer(sc_module_name /*name*/,

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

@@ -43,7 +43,7 @@
#include <fstream>
#include "../common/DebugManager.h"
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "../controller/core/configuration/Configuration.h"
#ifdef THERMALSIM

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

@@ -38,13 +38,13 @@
#ifndef TRACEGENERATOR_H
#define TRACEGENERATOR_H
#include "TracePlayer.h"
using namespace std;
using namespace tlm;
struct TraceGenerator: public TracePlayer {
struct TraceGenerator : public TracePlayer
{
public:
TraceGenerator(sc_module_name /*name*/, unsigned int clkMhz,
TracePlayerListener *listener) : TracePlayer(listener), transCounter(0)

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

@@ -56,7 +56,8 @@
using namespace std;
using namespace tlm;
struct TracePlayer: public sc_module {
struct TracePlayer : public sc_module
{
public:
tlm_utils::simple_initiator_socket<TracePlayer> iSocket;
TracePlayer(TracePlayerListener *listener);

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

@@ -39,7 +39,7 @@
#include <vector>
#include <string>
#include "../common/rename_utils.h"
#include "../common/utils.h"
#include "TracePlayer.h"
#include "StlPlayer.h"