diff --git a/.gitmodules b/.gitmodules index 677fc1c9..9248a7d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "DRAMSys/dram/src/common/third_party/DRAMPower"] - path = DRAMSys/dram/src/common/third_party/DRAMPower +[submodule "DRAMSys/dramSys/src/common/third_party/DRAMPower"] + path = DRAMSys/dramSys/src/common/third_party/DRAMPower url = https://github.com/ravenrd/DRAMPower.git -[submodule "DRAMSys/dram/src/common/third_party/tinyxml2"] - path = DRAMSys/dram/src/common/third_party/tinyxml2 +[submodule "DRAMSys/dramSys/src/common/third_party/tinyxml2"] + path = DRAMSys/dramSys/src/common/third_party/tinyxml2 url = https://github.com/leethomason/tinyxml2.git diff --git a/DRAMSys/analyzer/analyzer/README.md b/DRAMSys/analyzer/README.md similarity index 100% rename from DRAMSys/analyzer/analyzer/README.md rename to DRAMSys/analyzer/README.md diff --git a/DRAMSys/analyzer/analyzer/businessObjects/calculatedMetric.h b/DRAMSys/analyzer/businessObjects/calculatedMetric.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/calculatedMetric.h rename to DRAMSys/analyzer/businessObjects/calculatedMetric.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/comment.h b/DRAMSys/analyzer/businessObjects/comment.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/comment.h rename to DRAMSys/analyzer/businessObjects/comment.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/generalinfo.h b/DRAMSys/analyzer/businessObjects/generalinfo.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/generalinfo.h rename to DRAMSys/analyzer/businessObjects/generalinfo.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/phases/phase.cpp b/DRAMSys/analyzer/businessObjects/phases/phase.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/phases/phase.cpp rename to DRAMSys/analyzer/businessObjects/phases/phase.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/phases/phase.h b/DRAMSys/analyzer/businessObjects/phases/phase.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/phases/phase.h rename to DRAMSys/analyzer/businessObjects/phases/phase.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.cpp b/DRAMSys/analyzer/businessObjects/phases/phasefactory.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.cpp rename to DRAMSys/analyzer/businessObjects/phases/phasefactory.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.h b/DRAMSys/analyzer/businessObjects/phases/phasefactory.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.h rename to DRAMSys/analyzer/businessObjects/phases/phasefactory.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.cpp b/DRAMSys/analyzer/businessObjects/pythoncaller.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.cpp rename to DRAMSys/analyzer/businessObjects/pythoncaller.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.h b/DRAMSys/analyzer/businessObjects/pythoncaller.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.h rename to DRAMSys/analyzer/businessObjects/pythoncaller.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/testresult.h b/DRAMSys/analyzer/businessObjects/testresult.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/testresult.h rename to DRAMSys/analyzer/businessObjects/testresult.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/timespan.cpp b/DRAMSys/analyzer/businessObjects/timespan.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/timespan.cpp rename to DRAMSys/analyzer/businessObjects/timespan.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/timespan.h b/DRAMSys/analyzer/businessObjects/timespan.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/timespan.h rename to DRAMSys/analyzer/businessObjects/timespan.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/tracecalculatedmetrics.h b/DRAMSys/analyzer/businessObjects/tracecalculatedmetrics.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/tracecalculatedmetrics.h rename to DRAMSys/analyzer/businessObjects/tracecalculatedmetrics.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.cpp b/DRAMSys/analyzer/businessObjects/tracetestresults.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.cpp rename to DRAMSys/analyzer/businessObjects/tracetestresults.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.h b/DRAMSys/analyzer/businessObjects/tracetestresults.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.h rename to DRAMSys/analyzer/businessObjects/tracetestresults.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/tracetime.h b/DRAMSys/analyzer/businessObjects/tracetime.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/tracetime.h rename to DRAMSys/analyzer/businessObjects/tracetime.h diff --git a/DRAMSys/analyzer/analyzer/businessObjects/transaction.cpp b/DRAMSys/analyzer/businessObjects/transaction.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/transaction.cpp rename to DRAMSys/analyzer/businessObjects/transaction.cpp diff --git a/DRAMSys/analyzer/analyzer/businessObjects/transaction.h b/DRAMSys/analyzer/businessObjects/transaction.h similarity index 100% rename from DRAMSys/analyzer/analyzer/businessObjects/transaction.h rename to DRAMSys/analyzer/businessObjects/transaction.h diff --git a/DRAMSys/analyzer/analyzer/data/QueryTexts.h b/DRAMSys/analyzer/data/QueryTexts.h similarity index 100% rename from DRAMSys/analyzer/analyzer/data/QueryTexts.h rename to DRAMSys/analyzer/data/QueryTexts.h diff --git a/DRAMSys/analyzer/analyzer/data/tracedb.cpp b/DRAMSys/analyzer/data/tracedb.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/data/tracedb.cpp rename to DRAMSys/analyzer/data/tracedb.cpp diff --git a/DRAMSys/analyzer/analyzer/data/tracedb.h b/DRAMSys/analyzer/data/tracedb.h similarity index 100% rename from DRAMSys/analyzer/analyzer/data/tracedb.h rename to DRAMSys/analyzer/data/tracedb.h diff --git a/DRAMSys/analyzer/analyzer/evaluationtool.cpp b/DRAMSys/analyzer/evaluationtool.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/evaluationtool.cpp rename to DRAMSys/analyzer/evaluationtool.cpp diff --git a/DRAMSys/analyzer/analyzer/evaluationtool.h b/DRAMSys/analyzer/evaluationtool.h similarity index 100% rename from DRAMSys/analyzer/analyzer/evaluationtool.h rename to DRAMSys/analyzer/evaluationtool.h diff --git a/DRAMSys/analyzer/analyzer/evaluationtool.ui b/DRAMSys/analyzer/evaluationtool.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/evaluationtool.ui rename to DRAMSys/analyzer/evaluationtool.ui diff --git a/DRAMSys/analyzer/analyzer/gototimedialog.cpp b/DRAMSys/analyzer/gototimedialog.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/gototimedialog.cpp rename to DRAMSys/analyzer/gototimedialog.cpp diff --git a/DRAMSys/analyzer/analyzer/gototimedialog.h b/DRAMSys/analyzer/gototimedialog.h similarity index 100% rename from DRAMSys/analyzer/analyzer/gototimedialog.h rename to DRAMSys/analyzer/gototimedialog.h diff --git a/DRAMSys/analyzer/analyzer/gototimedialog.ui b/DRAMSys/analyzer/gototimedialog.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/gototimedialog.ui rename to DRAMSys/analyzer/gototimedialog.ui diff --git a/DRAMSys/analyzer/analyzer/main.cpp b/DRAMSys/analyzer/main.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/main.cpp rename to DRAMSys/analyzer/main.cpp diff --git a/DRAMSys/analyzer/analyzer/mainwindow.cpp b/DRAMSys/analyzer/mainwindow.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/mainwindow.cpp rename to DRAMSys/analyzer/mainwindow.cpp diff --git a/DRAMSys/analyzer/analyzer/mainwindow.h b/DRAMSys/analyzer/mainwindow.h similarity index 100% rename from DRAMSys/analyzer/analyzer/mainwindow.h rename to DRAMSys/analyzer/mainwindow.h diff --git a/DRAMSys/analyzer/analyzer/markerplotitem.cpp b/DRAMSys/analyzer/markerplotitem.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/markerplotitem.cpp rename to DRAMSys/analyzer/markerplotitem.cpp diff --git a/DRAMSys/analyzer/analyzer/markerplotitem.h b/DRAMSys/analyzer/markerplotitem.h similarity index 100% rename from DRAMSys/analyzer/analyzer/markerplotitem.h rename to DRAMSys/analyzer/markerplotitem.h diff --git a/DRAMSys/analyzer/analyzer/paths.pro b/DRAMSys/analyzer/paths.pro similarity index 100% rename from DRAMSys/analyzer/analyzer/paths.pro rename to DRAMSys/analyzer/paths.pro diff --git a/DRAMSys/analyzer/analyzer/preferences.ui b/DRAMSys/analyzer/preferences.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/preferences.ui rename to DRAMSys/analyzer/preferences.ui diff --git a/DRAMSys/analyzer/analyzer/presentation/commenttreewidget.cpp b/DRAMSys/analyzer/presentation/commenttreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/commenttreewidget.cpp rename to DRAMSys/analyzer/presentation/commenttreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/commenttreewidget.h b/DRAMSys/analyzer/presentation/commenttreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/commenttreewidget.h rename to DRAMSys/analyzer/presentation/commenttreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.cpp b/DRAMSys/analyzer/presentation/debugmessagetreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.cpp rename to DRAMSys/analyzer/presentation/debugmessagetreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.h b/DRAMSys/analyzer/presentation/debugmessagetreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.h rename to DRAMSys/analyzer/presentation/debugmessagetreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/pornotracescroller.cpp b/DRAMSys/analyzer/presentation/pornotracescroller.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/pornotracescroller.cpp rename to DRAMSys/analyzer/presentation/pornotracescroller.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/pornotracescroller.h b/DRAMSys/analyzer/presentation/pornotracescroller.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/pornotracescroller.h rename to DRAMSys/analyzer/presentation/pornotracescroller.h diff --git a/DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp b/DRAMSys/analyzer/presentation/selectedtransactiontreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp rename to DRAMSys/analyzer/presentation/selectedtransactiontreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.h b/DRAMSys/analyzer/presentation/selectedtransactiontreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.h rename to DRAMSys/analyzer/presentation/selectedtransactiontreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.cpp b/DRAMSys/analyzer/presentation/tracePlotMouseLabel.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.cpp rename to DRAMSys/analyzer/presentation/tracePlotMouseLabel.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.h b/DRAMSys/analyzer/presentation/tracePlotMouseLabel.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.h rename to DRAMSys/analyzer/presentation/tracePlotMouseLabel.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracedrawing.cpp b/DRAMSys/analyzer/presentation/tracedrawing.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracedrawing.cpp rename to DRAMSys/analyzer/presentation/tracedrawing.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/tracedrawing.h b/DRAMSys/analyzer/presentation/tracedrawing.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracedrawing.h rename to DRAMSys/analyzer/presentation/tracedrawing.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracedrawingproperties.h b/DRAMSys/analyzer/presentation/tracedrawingproperties.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracedrawingproperties.h rename to DRAMSys/analyzer/presentation/tracedrawingproperties.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.cpp b/DRAMSys/analyzer/presentation/tracemetrictreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.cpp rename to DRAMSys/analyzer/presentation/tracemetrictreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.h b/DRAMSys/analyzer/presentation/tracemetrictreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.h rename to DRAMSys/analyzer/presentation/tracemetrictreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracenavigator.cpp b/DRAMSys/analyzer/presentation/tracenavigator.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracenavigator.cpp rename to DRAMSys/analyzer/presentation/tracenavigator.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/tracenavigator.h b/DRAMSys/analyzer/presentation/tracenavigator.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracenavigator.h rename to DRAMSys/analyzer/presentation/tracenavigator.h diff --git a/DRAMSys/analyzer/analyzer/presentation/traceplot.cpp b/DRAMSys/analyzer/presentation/traceplot.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/traceplot.cpp rename to DRAMSys/analyzer/presentation/traceplot.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/traceplot.h b/DRAMSys/analyzer/presentation/traceplot.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/traceplot.h rename to DRAMSys/analyzer/presentation/traceplot.h diff --git a/DRAMSys/analyzer/analyzer/presentation/traceplotitem.cpp b/DRAMSys/analyzer/presentation/traceplotitem.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/traceplotitem.cpp rename to DRAMSys/analyzer/presentation/traceplotitem.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/traceplotitem.h b/DRAMSys/analyzer/presentation/traceplotitem.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/traceplotitem.h rename to DRAMSys/analyzer/presentation/traceplotitem.h diff --git a/DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.cpp b/DRAMSys/analyzer/presentation/tracetesttreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.cpp rename to DRAMSys/analyzer/presentation/tracetesttreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.h b/DRAMSys/analyzer/presentation/tracetesttreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.h rename to DRAMSys/analyzer/presentation/tracetesttreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.cpp b/DRAMSys/analyzer/presentation/transactiontreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.cpp rename to DRAMSys/analyzer/presentation/transactiontreewidget.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.h b/DRAMSys/analyzer/presentation/transactiontreewidget.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.h rename to DRAMSys/analyzer/presentation/transactiontreewidget.h diff --git a/DRAMSys/analyzer/analyzer/presentation/util/clkgrid.cpp b/DRAMSys/analyzer/presentation/util/clkgrid.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/clkgrid.cpp rename to DRAMSys/analyzer/presentation/util/clkgrid.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/util/clkgrid.h b/DRAMSys/analyzer/presentation/util/clkgrid.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/clkgrid.h rename to DRAMSys/analyzer/presentation/util/clkgrid.h diff --git a/DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.cpp b/DRAMSys/analyzer/presentation/util/colorgenerator.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.cpp rename to DRAMSys/analyzer/presentation/util/colorgenerator.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.h b/DRAMSys/analyzer/presentation/util/colorgenerator.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.h rename to DRAMSys/analyzer/presentation/util/colorgenerator.h diff --git a/DRAMSys/analyzer/analyzer/presentation/util/customlabelscaledraw.h b/DRAMSys/analyzer/presentation/util/customlabelscaledraw.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/customlabelscaledraw.h rename to DRAMSys/analyzer/presentation/util/customlabelscaledraw.h diff --git a/DRAMSys/analyzer/analyzer/presentation/util/engineeringScaleDraw.h b/DRAMSys/analyzer/presentation/util/engineeringScaleDraw.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/engineeringScaleDraw.h rename to DRAMSys/analyzer/presentation/util/engineeringScaleDraw.h diff --git a/DRAMSys/analyzer/analyzer/presentation/util/testlight.cpp b/DRAMSys/analyzer/presentation/util/testlight.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/testlight.cpp rename to DRAMSys/analyzer/presentation/util/testlight.cpp diff --git a/DRAMSys/analyzer/analyzer/presentation/util/testlight.h b/DRAMSys/analyzer/presentation/util/testlight.h similarity index 100% rename from DRAMSys/analyzer/analyzer/presentation/util/testlight.h rename to DRAMSys/analyzer/presentation/util/testlight.h diff --git a/DRAMSys/analyzer/analyzer/queryeditor.cpp b/DRAMSys/analyzer/queryeditor.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/queryeditor.cpp rename to DRAMSys/analyzer/queryeditor.cpp diff --git a/DRAMSys/analyzer/analyzer/queryeditor.h b/DRAMSys/analyzer/queryeditor.h similarity index 100% rename from DRAMSys/analyzer/analyzer/queryeditor.h rename to DRAMSys/analyzer/queryeditor.h diff --git a/DRAMSys/analyzer/analyzer/queryeditor.ui b/DRAMSys/analyzer/queryeditor.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/queryeditor.ui rename to DRAMSys/analyzer/queryeditor.ui diff --git a/DRAMSys/analyzer/analyzer/schedulerwrapper.h b/DRAMSys/analyzer/schedulerwrapper.h similarity index 100% rename from DRAMSys/analyzer/analyzer/schedulerwrapper.h rename to DRAMSys/analyzer/schedulerwrapper.h diff --git a/DRAMSys/analyzer/analyzer/scripts/metrics.py b/DRAMSys/analyzer/scripts/metrics.py similarity index 100% rename from DRAMSys/analyzer/analyzer/scripts/metrics.py rename to DRAMSys/analyzer/scripts/metrics.py diff --git a/DRAMSys/analyzer/analyzer/scripts/tests.py b/DRAMSys/analyzer/scripts/tests.py similarity index 100% rename from DRAMSys/analyzer/analyzer/scripts/tests.py rename to DRAMSys/analyzer/scripts/tests.py diff --git a/DRAMSys/analyzer/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/traceAnalyzer.pro similarity index 100% rename from DRAMSys/analyzer/analyzer/traceAnalyzer.pro rename to DRAMSys/analyzer/traceAnalyzer.pro diff --git a/DRAMSys/analyzer/analyzer/traceanalyzer.cpp b/DRAMSys/analyzer/traceanalyzer.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/traceanalyzer.cpp rename to DRAMSys/analyzer/traceanalyzer.cpp diff --git a/DRAMSys/analyzer/analyzer/traceanalyzer.h b/DRAMSys/analyzer/traceanalyzer.h similarity index 100% rename from DRAMSys/analyzer/analyzer/traceanalyzer.h rename to DRAMSys/analyzer/traceanalyzer.h diff --git a/DRAMSys/analyzer/analyzer/traceanalyzer.ui b/DRAMSys/analyzer/traceanalyzer.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/traceanalyzer.ui rename to DRAMSys/analyzer/traceanalyzer.ui diff --git a/DRAMSys/analyzer/analyzer/tracefiletab.cpp b/DRAMSys/analyzer/tracefiletab.cpp similarity index 100% rename from DRAMSys/analyzer/analyzer/tracefiletab.cpp rename to DRAMSys/analyzer/tracefiletab.cpp diff --git a/DRAMSys/analyzer/analyzer/tracefiletab.h b/DRAMSys/analyzer/tracefiletab.h similarity index 100% rename from DRAMSys/analyzer/analyzer/tracefiletab.h rename to DRAMSys/analyzer/tracefiletab.h diff --git a/DRAMSys/analyzer/analyzer/tracefiletab.ui b/DRAMSys/analyzer/tracefiletab.ui similarity index 100% rename from DRAMSys/analyzer/analyzer/tracefiletab.ui rename to DRAMSys/analyzer/tracefiletab.ui diff --git a/DRAMSys/dram.vp.system.pro b/DRAMSys/dram.vp.system.pro index 8a415440..a1d542d7 100644 --- a/DRAMSys/dram.vp.system.pro +++ b/DRAMSys/dram.vp.system.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = dram/dramSys/dramSys.pro -SUBDIRS += analyzer/analyzer/traceAnalyzer.pro +SUBDIRS = dramSys/dramSys.pro +SUBDIRS += analyzer/traceAnalyzer.pro diff --git a/DRAMSys/dram/dramSys/dramSys.pro b/DRAMSys/dram/dramSys/dramSys.pro deleted file mode 100644 index 7c408025..00000000 --- a/DRAMSys/dram/dramSys/dramSys.pro +++ /dev/null @@ -1,132 +0,0 @@ -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG -= qt - -system(cd ../../../DRAMSys/dram/src/common/third_party/DRAMPower; make lib;) - -LIBS += -L/opt/systemc/lib-linux64 -lsystemc -LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system -LIBS += -lsqlite3 -LIBS += -lpthread -LIBS += -L../../../DRAMSys/dram/src/common/third_party/DRAMPower/src/ -ldrampower - -INCLUDEPATH += /opt/systemc/include -INCLUDEPATH += /opt/boost/include -INCLUDEPATH += ../src/common/third_party/DRAMPower/src -INCLUDEPATH += ../src/common/third_party/DRAMPower/src/libdrampower - - -DEFINES += TIXML_USE_STL -DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES -release { - DEFINES += NDEBUG -} - -QMAKE_CXXFLAGS += -std=c++11 -QMAKE_CXXFLAGS += -isystem /opt/systemc/include -QMAKE_CXXFLAGS += -isystem /opt/boost/include - -SOURCES += \ - ../src/common/third_party/tinyxml2/tinyxml2.cpp \ - ../src/common/xmlAddressdecoder.cpp \ - ../src/common/Utils.cpp \ - ../src/common/TlmRecorder.cpp \ - ../src/common/dramExtension.cpp \ - ../src/common/DebugManager.cpp \ - ../src/controller/core/configuration/Configuration.cpp \ - ../src/controller/core/powerdown/PowerDownManagerTimeout.cpp \ - ../src/controller/core/powerdown/PowerDownManagerBankwise.cpp \ - ../src/controller/core/powerdown/PowerDownManager.cpp \ - ../src/controller/scheduler/ThreadLoad.cpp \ - ../src/controller/scheduler/PARBS.cpp \ - ../src/controller/scheduler/Fr_Fcfs.cpp \ - ../src/controller/scheduler/Fifo.cpp \ - ../src/controller/core/refresh/RefreshManagerBankwise.cpp \ - ../src/controller/core/refresh/RefreshManager.cpp \ - ../src/controller/core/scheduling/checker/WriteChecker.cpp \ - ../src/controller/core/scheduling/checker/RefreshChecker.cpp \ - ../src/controller/core/scheduling/checker/ReadChecker.cpp \ - ../src/controller/core/scheduling/checker/PrechargeChecker.cpp \ - ../src/controller/core/scheduling/checker/PrechargeAllChecker.cpp \ - ../src/controller/core/scheduling/checker/PowerDownChecker.cpp \ - ../src/controller/core/scheduling/checker/ActivateChecker.cpp \ - ../src/controller/core/scheduling/ScheduledCommand.cpp \ - ../src/controller/core/TimingCalculation.cpp \ - ../src/controller/core/Slots.cpp \ - ../src/controller/core/ControllerCore.cpp \ - ../src/simulation/SimulationManager.cpp \ - ../src/simulation/Simulation.cpp \ - ../src/simulation/MemoryManager.cpp \ - ../src/simulation/main.cpp \ - ../src/controller/scheduler/readwritegrouper.cpp \ - ../src/controller/core/configuration/ConfigurationLoader.cpp \ - ../src/controller/core/powerdown/NoPowerDown.cpp \ - ../src/controller/Command.cpp \ - ../src/controller/Controller.cpp \ - ../src/controller/ControllerState.cpp \ - ../src/controller/RowBufferStates.cpp \ - ../src/controller/scheduler/IScheduler.cpp \ - ../src/controller/scheduler/FifoStrict.cpp \ - ../src/error/nest_map.cpp \ - ../src/error/flip_memory.cpp - -HEADERS += \ - ../src/common/third_party/tinyxml2/tinyxml2.h \ - ../src/common/xmlAddressdecoder.h \ - ../src/common/Utils.h \ - ../src/common/TlmRecorder.h \ - ../src/common/tlm2_base_protocol_checker.h \ - ../src/common/protocol.h \ - ../src/common/dramExtension.h \ - ../src/common/DebugManager.h \ - ../src/controller/core/configuration/Configuration.h \ - ../src/controller/core/powerdown/PowerDownManagerTimeout.h \ - ../src/controller/core/powerdown/PowerDownManagerBankwise.h \ - ../src/controller/core/powerdown/PowerDownManager.h \ - ../src/controller/scheduler/ThreadLoad.h \ - ../src/controller/scheduler/PARBS.h \ - ../src/controller/scheduler/Fr_Fcfs.h \ - ../src/controller/scheduler/Fifo.h \ - ../src/controller/Controller.h \ - ../src/controller/core/refresh/RefreshManagerBankwise.h \ - ../src/controller/core/refresh/RefreshManager.h \ - ../src/controller/core/refresh/IRefreshManager.h \ - ../src/controller/core/scheduling/checker/WriteChecker.h \ - ../src/controller/core/scheduling/checker/RefreshChecker.h \ - ../src/controller/core/scheduling/checker/ReadChecker.h \ - ../src/controller/core/scheduling/checker/PrechargeChecker.h \ - ../src/controller/core/scheduling/checker/PrechargeAllChecker.h \ - ../src/controller/core/scheduling/checker/PowerDownChecker.h \ - ../src/controller/core/scheduling/checker/ICommandChecker.h \ - ../src/controller/core/scheduling/checker/ActivateChecker.h \ - ../src/controller/core/scheduling/Trigger.h \ - ../src/controller/core/scheduling/ScheduledCommand.h \ - ../src/controller/core/TimingCalculation.h \ - ../src/controller/core/Slots.h \ - ../src/controller/core/ControllerCore.h \ - ../src/simulation/TracePlayer.h \ - ../src/simulation/SimulationManager.h \ - ../src/simulation/Simulation.h \ - ../src/simulation/MemoryManager.h \ - ../src/simulation/Dram.h \ - ../src/simulation/Arbiter.h \ - ../src/common/libDRAMPower.h \ - ../src/controller/scheduler/readwritegrouper.h \ - ../src/simulation/ReorderBuffer.h \ - ../src/controller/core/configuration/MemSpec.h \ - ../src/simulation/StlPlayer.h \ - ../src/simulation/TracePlayerListener.h \ - ../src/simulation/TraceGenerator.h \ - ../src/controller/core/powerdown/NoPowerDown.h \ - ../src/controller/Command.h \ - ../src/controller/RowBufferStates.h \ - ../src/controller/ControllerState.h \ - ../src/controller/core/powerdown/IPowerDownManager.h \ - ../src/controller/scheduler/IScheduler.h \ - ../src/controller/scheduler/FifoStrict.h \ - ../src/controller/IController.h \ - ../src/controller/core/configuration/ConfigurationLoader.h \ - ../src/error/nest_map.h \ - ../src/error/flip_memory.h - diff --git a/DRAMSys/dramSys/dramSys.pro b/DRAMSys/dramSys/dramSys.pro new file mode 100644 index 00000000..0d3d894e --- /dev/null +++ b/DRAMSys/dramSys/dramSys.pro @@ -0,0 +1,132 @@ +TEMPLATE = app +CONFIG += console +CONFIG -= app_bundle +CONFIG -= qt + +system(cd ../../DRAMSys/dramSys/src/common/third_party/DRAMPower; make lib;) + +LIBS += -L/opt/systemc/lib-linux64 -lsystemc +LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system +LIBS += -lsqlite3 +LIBS += -lpthread +LIBS += -L../../DRAMSys/dramSys/src/common/third_party/DRAMPower/src/ -ldrampower + +INCLUDEPATH += /opt/systemc/include +INCLUDEPATH += /opt/boost/include +INCLUDEPATH += src/common/third_party/DRAMPower/src +INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower + + +DEFINES += TIXML_USE_STL +DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES +release { + DEFINES += NDEBUG +} + +QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -isystem /opt/systemc/include +QMAKE_CXXFLAGS += -isystem /opt/boost/include + +SOURCES += \ + src/common/third_party/tinyxml2/tinyxml2.cpp \ + src/common/xmlAddressdecoder.cpp \ + src/common/Utils.cpp \ + src/common/TlmRecorder.cpp \ + src/common/dramExtension.cpp \ + src/common/DebugManager.cpp \ + src/controller/core/configuration/Configuration.cpp \ + src/controller/core/powerdown/PowerDownManagerTimeout.cpp \ + src/controller/core/powerdown/PowerDownManagerBankwise.cpp \ + src/controller/core/powerdown/PowerDownManager.cpp \ + src/controller/scheduler/ThreadLoad.cpp \ + src/controller/scheduler/PARBS.cpp \ + src/controller/scheduler/Fr_Fcfs.cpp \ + src/controller/scheduler/Fifo.cpp \ + src/controller/core/refresh/RefreshManagerBankwise.cpp \ + src/controller/core/refresh/RefreshManager.cpp \ + src/controller/core/scheduling/checker/WriteChecker.cpp \ + src/controller/core/scheduling/checker/RefreshChecker.cpp \ + src/controller/core/scheduling/checker/ReadChecker.cpp \ + src/controller/core/scheduling/checker/PrechargeChecker.cpp \ + src/controller/core/scheduling/checker/PrechargeAllChecker.cpp \ + src/controller/core/scheduling/checker/PowerDownChecker.cpp \ + src/controller/core/scheduling/checker/ActivateChecker.cpp \ + src/controller/core/scheduling/ScheduledCommand.cpp \ + src/controller/core/TimingCalculation.cpp \ + src/controller/core/Slots.cpp \ + src/controller/core/ControllerCore.cpp \ + src/simulation/SimulationManager.cpp \ + src/simulation/Simulation.cpp \ + src/simulation/MemoryManager.cpp \ + src/simulation/main.cpp \ + src/controller/scheduler/readwritegrouper.cpp \ + src/controller/core/configuration/ConfigurationLoader.cpp \ + src/controller/core/powerdown/NoPowerDown.cpp \ + src/controller/Command.cpp \ + src/controller/Controller.cpp \ + src/controller/ControllerState.cpp \ + src/controller/RowBufferStates.cpp \ + src/controller/scheduler/IScheduler.cpp \ + src/controller/scheduler/FifoStrict.cpp \ + src/error/nest_map.cpp \ + src/error/flip_memory.cpp + +HEADERS += \ + src/common/third_party/tinyxml2/tinyxml2.h \ + src/common/xmlAddressdecoder.h \ + src/common/Utils.h \ + src/common/TlmRecorder.h \ + src/common/tlm2_base_protocol_checker.h \ + src/common/protocol.h \ + src/common/dramExtension.h \ + src/common/DebugManager.h \ + src/controller/core/configuration/Configuration.h \ + src/controller/core/powerdown/PowerDownManagerTimeout.h \ + src/controller/core/powerdown/PowerDownManagerBankwise.h \ + src/controller/core/powerdown/PowerDownManager.h \ + src/controller/scheduler/ThreadLoad.h \ + src/controller/scheduler/PARBS.h \ + src/controller/scheduler/Fr_Fcfs.h \ + src/controller/scheduler/Fifo.h \ + src/controller/Controller.h \ + src/controller/core/refresh/RefreshManagerBankwise.h \ + src/controller/core/refresh/RefreshManager.h \ + src/controller/core/refresh/IRefreshManager.h \ + src/controller/core/scheduling/checker/WriteChecker.h \ + src/controller/core/scheduling/checker/RefreshChecker.h \ + src/controller/core/scheduling/checker/ReadChecker.h \ + src/controller/core/scheduling/checker/PrechargeChecker.h \ + src/controller/core/scheduling/checker/PrechargeAllChecker.h \ + src/controller/core/scheduling/checker/PowerDownChecker.h \ + src/controller/core/scheduling/checker/ICommandChecker.h \ + src/controller/core/scheduling/checker/ActivateChecker.h \ + src/controller/core/scheduling/Trigger.h \ + src/controller/core/scheduling/ScheduledCommand.h \ + src/controller/core/TimingCalculation.h \ + src/controller/core/Slots.h \ + src/controller/core/ControllerCore.h \ + src/simulation/TracePlayer.h \ + src/simulation/SimulationManager.h \ + src/simulation/Simulation.h \ + src/simulation/MemoryManager.h \ + src/simulation/Dram.h \ + src/simulation/Arbiter.h \ + src/common/libDRAMPower.h \ + src/controller/scheduler/readwritegrouper.h \ + src/simulation/ReorderBuffer.h \ + src/controller/core/configuration/MemSpec.h \ + src/simulation/StlPlayer.h \ + src/simulation/TracePlayerListener.h \ + src/simulation/TraceGenerator.h \ + src/controller/core/powerdown/NoPowerDown.h \ + src/controller/Command.h \ + src/controller/RowBufferStates.h \ + src/controller/ControllerState.h \ + src/controller/core/powerdown/IPowerDownManager.h \ + src/controller/scheduler/IScheduler.h \ + src/controller/scheduler/FifoStrict.h \ + src/controller/IController.h \ + src/controller/core/configuration/ConfigurationLoader.h \ + src/error/nest_map.h \ + src/error/flip_memory.h + diff --git a/DRAMSys/dram/resources/.gitignore b/DRAMSys/dramSys/resources/.gitignore similarity index 100% rename from DRAMSys/dram/resources/.gitignore rename to DRAMSys/dramSys/resources/.gitignore diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_ddr4.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_ddr4.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_ddr4.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_ddr4.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_highHits.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_highHits.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_highHits.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_highHits.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_highPara.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_highPara.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_highPara.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_highPara.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_lowHits.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_lowHits.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_lowHits.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_lowHits.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_lowPara.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_lowPara.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_lowPara.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_lowPara.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_wideio.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_wideio.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml diff --git a/DRAMSys/dram/resources/configs/amconfigs/am_wideioFourBanks.xml b/DRAMSys/dramSys/resources/configs/amconfigs/am_wideioFourBanks.xml similarity index 100% rename from DRAMSys/dram/resources/configs/amconfigs/am_wideioFourBanks.xml rename to DRAMSys/dramSys/resources/configs/amconfigs/am_wideioFourBanks.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/.gitignore b/DRAMSys/dramSys/resources/configs/memconfigs/.gitignore similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/.gitignore rename to DRAMSys/dramSys/resources/configs/memconfigs/.gitignore diff --git a/DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml b/DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml b/DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/_old/grouper.xml b/DRAMSys/dramSys/resources/configs/memconfigs/_old/grouper.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/_old/grouper.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/_old/grouper.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/_old/par_bs.xml b/DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/_old/par_bs.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/_old/par_bs_unaware.xml b/DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs_unaware.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/_old/par_bs_unaware.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/_old/par_bs_unaware.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/fifo.xml b/DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/fifo.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/fifoStrict.xml b/DRAMSys/dramSys/resources/configs/memconfigs/fifoStrict.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/fifoStrict.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/fifoStrict.xml diff --git a/DRAMSys/dram/resources/configs/memconfigs/fr_fcfs.xml b/DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memconfigs/fr_fcfs.xml rename to DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/DDR4.xml b/DRAMSys/dramSys/resources/configs/memspecs/DDR4.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/DDR4.xml rename to DRAMSys/dramSys/resources/configs/memspecs/DDR4.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml b/DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml rename to DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml b/DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml rename to DRAMSys/dramSys/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml b/DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml rename to DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml b/DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml rename to DRAMSys/dramSys/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/MatzesWideIO-short.xml b/DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO-short.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/MatzesWideIO-short.xml rename to DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO-short.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/MatzesWideIO.xml b/DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/MatzesWideIO.xml rename to DRAMSys/dramSys/resources/configs/memspecs/MatzesWideIO.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/WideIO.xml b/DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/WideIO.xml rename to DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml diff --git a/DRAMSys/dram/resources/configs/memspecs/memspec.dtd b/DRAMSys/dramSys/resources/configs/memspecs/memspec.dtd similarity index 100% rename from DRAMSys/dram/resources/configs/memspecs/memspec.dtd rename to DRAMSys/dramSys/resources/configs/memspecs/memspec.dtd diff --git a/DRAMSys/dram/resources/scripts/address_scrambler.pl b/DRAMSys/dramSys/resources/scripts/address_scrambler.pl similarity index 100% rename from DRAMSys/dram/resources/scripts/address_scrambler.pl rename to DRAMSys/dramSys/resources/scripts/address_scrambler.pl diff --git a/DRAMSys/dram/resources/scripts/analyse_trace.pl b/DRAMSys/dramSys/resources/scripts/analyse_trace.pl similarity index 100% rename from DRAMSys/dram/resources/scripts/analyse_trace.pl rename to DRAMSys/dramSys/resources/scripts/analyse_trace.pl diff --git a/DRAMSys/dram/resources/scripts/createTraceDB.sql b/DRAMSys/dramSys/resources/scripts/createTraceDB.sql similarity index 100% rename from DRAMSys/dram/resources/scripts/createTraceDB.sql rename to DRAMSys/dramSys/resources/scripts/createTraceDB.sql diff --git a/DRAMSys/dram/resources/scripts/stride_detection.pl b/DRAMSys/dramSys/resources/scripts/stride_detection.pl similarity index 100% rename from DRAMSys/dram/resources/scripts/stride_detection.pl rename to DRAMSys/dramSys/resources/scripts/stride_detection.pl diff --git a/DRAMSys/dram/resources/simulations/sim-batch.xml b/DRAMSys/dramSys/resources/simulations/sim-batch.xml similarity index 76% rename from DRAMSys/dram/resources/simulations/sim-batch.xml rename to DRAMSys/dramSys/resources/simulations/sim-batch.xml index 25d3aa43..3f2170e5 100644 --- a/DRAMSys/dram/resources/simulations/sim-batch.xml +++ b/DRAMSys/dramSys/resources/simulations/sim-batch.xml @@ -8,15 +8,15 @@ - + - + - + diff --git a/DRAMSys/dram/resources/traces/prettyTest b/DRAMSys/dramSys/resources/traces/prettyTest similarity index 100% rename from DRAMSys/dram/resources/traces/prettyTest rename to DRAMSys/dramSys/resources/traces/prettyTest diff --git a/DRAMSys/dram/src/common/DebugManager.cpp b/DRAMSys/dramSys/src/common/DebugManager.cpp similarity index 100% rename from DRAMSys/dram/src/common/DebugManager.cpp rename to DRAMSys/dramSys/src/common/DebugManager.cpp diff --git a/DRAMSys/dram/src/common/DebugManager.h b/DRAMSys/dramSys/src/common/DebugManager.h similarity index 100% rename from DRAMSys/dram/src/common/DebugManager.h rename to DRAMSys/dramSys/src/common/DebugManager.h diff --git a/DRAMSys/dram/src/common/TlmRecorder.cpp b/DRAMSys/dramSys/src/common/TlmRecorder.cpp similarity index 100% rename from DRAMSys/dram/src/common/TlmRecorder.cpp rename to DRAMSys/dramSys/src/common/TlmRecorder.cpp diff --git a/DRAMSys/dram/src/common/TlmRecorder.h b/DRAMSys/dramSys/src/common/TlmRecorder.h similarity index 100% rename from DRAMSys/dram/src/common/TlmRecorder.h rename to DRAMSys/dramSys/src/common/TlmRecorder.h diff --git a/DRAMSys/dram/src/common/Utils.cpp b/DRAMSys/dramSys/src/common/Utils.cpp similarity index 100% rename from DRAMSys/dram/src/common/Utils.cpp rename to DRAMSys/dramSys/src/common/Utils.cpp diff --git a/DRAMSys/dram/src/common/Utils.h b/DRAMSys/dramSys/src/common/Utils.h similarity index 100% rename from DRAMSys/dram/src/common/Utils.h rename to DRAMSys/dramSys/src/common/Utils.h diff --git a/DRAMSys/dram/src/common/dramExtension.cpp b/DRAMSys/dramSys/src/common/dramExtension.cpp similarity index 100% rename from DRAMSys/dram/src/common/dramExtension.cpp rename to DRAMSys/dramSys/src/common/dramExtension.cpp diff --git a/DRAMSys/dram/src/common/dramExtension.h b/DRAMSys/dramSys/src/common/dramExtension.h similarity index 100% rename from DRAMSys/dram/src/common/dramExtension.h rename to DRAMSys/dramSys/src/common/dramExtension.h diff --git a/DRAMSys/dram/src/common/protocol.h b/DRAMSys/dramSys/src/common/protocol.h similarity index 100% rename from DRAMSys/dram/src/common/protocol.h rename to DRAMSys/dramSys/src/common/protocol.h diff --git a/DRAMSys/dram/src/common/third_party/DRAMPower b/DRAMSys/dramSys/src/common/third_party/DRAMPower similarity index 100% rename from DRAMSys/dram/src/common/third_party/DRAMPower rename to DRAMSys/dramSys/src/common/third_party/DRAMPower diff --git a/DRAMSys/dram/src/common/third_party/tinyxml2 b/DRAMSys/dramSys/src/common/third_party/tinyxml2 similarity index 100% rename from DRAMSys/dram/src/common/third_party/tinyxml2 rename to DRAMSys/dramSys/src/common/third_party/tinyxml2 diff --git a/DRAMSys/dram/src/common/tlm2_base_protocol_checker.h b/DRAMSys/dramSys/src/common/tlm2_base_protocol_checker.h similarity index 100% rename from DRAMSys/dram/src/common/tlm2_base_protocol_checker.h rename to DRAMSys/dramSys/src/common/tlm2_base_protocol_checker.h diff --git a/DRAMSys/dram/src/common/xmlAddressdecoder.cpp b/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp similarity index 100% rename from DRAMSys/dram/src/common/xmlAddressdecoder.cpp rename to DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp diff --git a/DRAMSys/dram/src/common/xmlAddressdecoder.h b/DRAMSys/dramSys/src/common/xmlAddressdecoder.h similarity index 100% rename from DRAMSys/dram/src/common/xmlAddressdecoder.h rename to DRAMSys/dramSys/src/common/xmlAddressdecoder.h diff --git a/DRAMSys/dram/src/controller/Command.cpp b/DRAMSys/dramSys/src/controller/Command.cpp similarity index 100% rename from DRAMSys/dram/src/controller/Command.cpp rename to DRAMSys/dramSys/src/controller/Command.cpp diff --git a/DRAMSys/dram/src/controller/Command.h b/DRAMSys/dramSys/src/controller/Command.h similarity index 100% rename from DRAMSys/dram/src/controller/Command.h rename to DRAMSys/dramSys/src/controller/Command.h diff --git a/DRAMSys/dram/src/controller/Controller.cpp b/DRAMSys/dramSys/src/controller/Controller.cpp similarity index 100% rename from DRAMSys/dram/src/controller/Controller.cpp rename to DRAMSys/dramSys/src/controller/Controller.cpp diff --git a/DRAMSys/dram/src/controller/Controller.h b/DRAMSys/dramSys/src/controller/Controller.h similarity index 100% rename from DRAMSys/dram/src/controller/Controller.h rename to DRAMSys/dramSys/src/controller/Controller.h diff --git a/DRAMSys/dram/src/controller/ControllerState.cpp b/DRAMSys/dramSys/src/controller/ControllerState.cpp similarity index 100% rename from DRAMSys/dram/src/controller/ControllerState.cpp rename to DRAMSys/dramSys/src/controller/ControllerState.cpp diff --git a/DRAMSys/dram/src/controller/ControllerState.h b/DRAMSys/dramSys/src/controller/ControllerState.h similarity index 100% rename from DRAMSys/dram/src/controller/ControllerState.h rename to DRAMSys/dramSys/src/controller/ControllerState.h diff --git a/DRAMSys/dram/src/controller/IController.h b/DRAMSys/dramSys/src/controller/IController.h similarity index 100% rename from DRAMSys/dram/src/controller/IController.h rename to DRAMSys/dramSys/src/controller/IController.h diff --git a/DRAMSys/dram/src/controller/RowBufferStates.cpp b/DRAMSys/dramSys/src/controller/RowBufferStates.cpp similarity index 100% rename from DRAMSys/dram/src/controller/RowBufferStates.cpp rename to DRAMSys/dramSys/src/controller/RowBufferStates.cpp diff --git a/DRAMSys/dram/src/controller/RowBufferStates.h b/DRAMSys/dramSys/src/controller/RowBufferStates.h similarity index 100% rename from DRAMSys/dram/src/controller/RowBufferStates.h rename to DRAMSys/dramSys/src/controller/RowBufferStates.h diff --git a/DRAMSys/dram/src/controller/core/ControllerCore.cpp b/DRAMSys/dramSys/src/controller/core/ControllerCore.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/ControllerCore.cpp rename to DRAMSys/dramSys/src/controller/core/ControllerCore.cpp diff --git a/DRAMSys/dram/src/controller/core/ControllerCore.h b/DRAMSys/dramSys/src/controller/core/ControllerCore.h similarity index 100% rename from DRAMSys/dram/src/controller/core/ControllerCore.h rename to DRAMSys/dramSys/src/controller/core/ControllerCore.h diff --git a/DRAMSys/dram/src/controller/core/Slots.cpp b/DRAMSys/dramSys/src/controller/core/Slots.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/Slots.cpp rename to DRAMSys/dramSys/src/controller/core/Slots.cpp diff --git a/DRAMSys/dram/src/controller/core/Slots.h b/DRAMSys/dramSys/src/controller/core/Slots.h similarity index 100% rename from DRAMSys/dram/src/controller/core/Slots.h rename to DRAMSys/dramSys/src/controller/core/Slots.h diff --git a/DRAMSys/dram/src/controller/core/TimingCalculation.cpp b/DRAMSys/dramSys/src/controller/core/TimingCalculation.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/TimingCalculation.cpp rename to DRAMSys/dramSys/src/controller/core/TimingCalculation.cpp diff --git a/DRAMSys/dram/src/controller/core/TimingCalculation.h b/DRAMSys/dramSys/src/controller/core/TimingCalculation.h similarity index 100% rename from DRAMSys/dram/src/controller/core/TimingCalculation.h rename to DRAMSys/dramSys/src/controller/core/TimingCalculation.h diff --git a/DRAMSys/dram/src/controller/core/configuration/Configuration.cpp b/DRAMSys/dramSys/src/controller/core/configuration/Configuration.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/Configuration.cpp rename to DRAMSys/dramSys/src/controller/core/configuration/Configuration.cpp diff --git a/DRAMSys/dram/src/controller/core/configuration/Configuration.h b/DRAMSys/dramSys/src/controller/core/configuration/Configuration.h similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/Configuration.h rename to DRAMSys/dramSys/src/controller/core/configuration/Configuration.h diff --git a/DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.cpp rename to DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.cpp diff --git a/DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.h similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.h rename to DRAMSys/dramSys/src/controller/core/configuration/ConfigurationLoader.h diff --git a/DRAMSys/dram/src/controller/core/configuration/MemSpec.h b/DRAMSys/dramSys/src/controller/core/configuration/MemSpec.h similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/MemSpec.h rename to DRAMSys/dramSys/src/controller/core/configuration/MemSpec.h diff --git a/DRAMSys/dram/src/controller/core/configuration/MemSpecLoader.h.autosave b/DRAMSys/dramSys/src/controller/core/configuration/MemSpecLoader.h.autosave similarity index 100% rename from DRAMSys/dram/src/controller/core/configuration/MemSpecLoader.h.autosave rename to DRAMSys/dramSys/src/controller/core/configuration/MemSpecLoader.h.autosave diff --git a/DRAMSys/dram/src/controller/core/powerdown/IPowerDownManager.h b/DRAMSys/dramSys/src/controller/core/powerdown/IPowerDownManager.h similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/IPowerDownManager.h rename to DRAMSys/dramSys/src/controller/core/powerdown/IPowerDownManager.h diff --git a/DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.cpp b/DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.cpp rename to DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.cpp diff --git a/DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.h similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.h rename to DRAMSys/dramSys/src/controller/core/powerdown/NoPowerDown.h diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.cpp rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.cpp diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.h b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.h similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.h rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManager.h diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.cpp diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.h b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.h similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.h rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerBankwise.h diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.cpp diff --git a/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.h b/DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.h similarity index 100% rename from DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.h rename to DRAMSys/dramSys/src/controller/core/powerdown/PowerDownManagerTimeout.h diff --git a/DRAMSys/dram/src/controller/core/refresh/IRefreshManager.h b/DRAMSys/dramSys/src/controller/core/refresh/IRefreshManager.h similarity index 100% rename from DRAMSys/dram/src/controller/core/refresh/IRefreshManager.h rename to DRAMSys/dramSys/src/controller/core/refresh/IRefreshManager.h diff --git a/DRAMSys/dram/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/refresh/RefreshManager.cpp rename to DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.cpp diff --git a/DRAMSys/dram/src/controller/core/refresh/RefreshManager.h b/DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.h similarity index 100% rename from DRAMSys/dram/src/controller/core/refresh/RefreshManager.h rename to DRAMSys/dramSys/src/controller/core/refresh/RefreshManager.h diff --git a/DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp rename to DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.cpp diff --git a/DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.h similarity index 100% rename from DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.h rename to DRAMSys/dramSys/src/controller/core/refresh/RefreshManagerBankwise.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.h rename to DRAMSys/dramSys/src/controller/core/scheduling/ScheduledCommand.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/Trigger.h b/DRAMSys/dramSys/src/controller/core/scheduling/Trigger.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/Trigger.h rename to DRAMSys/dramSys/src/controller/core/scheduling/Trigger.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/ActivateChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/ICommandChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/ICommandChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/ICommandChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/ICommandChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PowerDownChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeAllChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/PrechargeChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/ReadChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/RefreshChecker.h diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.cpp similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.cpp rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.cpp diff --git a/DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.h similarity index 100% rename from DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.h rename to DRAMSys/dramSys/src/controller/core/scheduling/checker/WriteChecker.h diff --git a/DRAMSys/dram/src/controller/scheduler/Fifo.cpp b/DRAMSys/dramSys/src/controller/scheduler/Fifo.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/Fifo.cpp rename to DRAMSys/dramSys/src/controller/scheduler/Fifo.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/Fifo.h b/DRAMSys/dramSys/src/controller/scheduler/Fifo.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/Fifo.h rename to DRAMSys/dramSys/src/controller/scheduler/Fifo.h diff --git a/DRAMSys/dram/src/controller/scheduler/FifoStrict.cpp b/DRAMSys/dramSys/src/controller/scheduler/FifoStrict.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/FifoStrict.cpp rename to DRAMSys/dramSys/src/controller/scheduler/FifoStrict.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/FifoStrict.h b/DRAMSys/dramSys/src/controller/scheduler/FifoStrict.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/FifoStrict.h rename to DRAMSys/dramSys/src/controller/scheduler/FifoStrict.h diff --git a/DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.cpp b/DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.cpp rename to DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.h b/DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.h rename to DRAMSys/dramSys/src/controller/scheduler/Fr_Fcfs.h diff --git a/DRAMSys/dram/src/controller/scheduler/IScheduler.cpp b/DRAMSys/dramSys/src/controller/scheduler/IScheduler.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/IScheduler.cpp rename to DRAMSys/dramSys/src/controller/scheduler/IScheduler.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/IScheduler.h b/DRAMSys/dramSys/src/controller/scheduler/IScheduler.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/IScheduler.h rename to DRAMSys/dramSys/src/controller/scheduler/IScheduler.h diff --git a/DRAMSys/dram/src/controller/scheduler/PARBS.cpp b/DRAMSys/dramSys/src/controller/scheduler/PARBS.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/PARBS.cpp rename to DRAMSys/dramSys/src/controller/scheduler/PARBS.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/PARBS.h b/DRAMSys/dramSys/src/controller/scheduler/PARBS.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/PARBS.h rename to DRAMSys/dramSys/src/controller/scheduler/PARBS.h diff --git a/DRAMSys/dram/src/controller/scheduler/ThreadLoad.cpp b/DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/ThreadLoad.cpp rename to DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/ThreadLoad.h b/DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/ThreadLoad.h rename to DRAMSys/dramSys/src/controller/scheduler/ThreadLoad.h diff --git a/DRAMSys/dram/src/controller/scheduler/readwritegrouper.cpp b/DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.cpp similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/readwritegrouper.cpp rename to DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.cpp diff --git a/DRAMSys/dram/src/controller/scheduler/readwritegrouper.h b/DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.h similarity index 100% rename from DRAMSys/dram/src/controller/scheduler/readwritegrouper.h rename to DRAMSys/dramSys/src/controller/scheduler/readwritegrouper.h diff --git a/DRAMSys/dram/src/error/error_new.csv b/DRAMSys/dramSys/src/error/error_new.csv similarity index 100% rename from DRAMSys/dram/src/error/error_new.csv rename to DRAMSys/dramSys/src/error/error_new.csv diff --git a/DRAMSys/dram/src/error/flip_memory.cpp b/DRAMSys/dramSys/src/error/flip_memory.cpp similarity index 100% rename from DRAMSys/dram/src/error/flip_memory.cpp rename to DRAMSys/dramSys/src/error/flip_memory.cpp diff --git a/DRAMSys/dram/src/error/flip_memory.h b/DRAMSys/dramSys/src/error/flip_memory.h similarity index 100% rename from DRAMSys/dram/src/error/flip_memory.h rename to DRAMSys/dramSys/src/error/flip_memory.h diff --git a/DRAMSys/dram/src/error/nest_map.cpp b/DRAMSys/dramSys/src/error/nest_map.cpp similarity index 100% rename from DRAMSys/dram/src/error/nest_map.cpp rename to DRAMSys/dramSys/src/error/nest_map.cpp diff --git a/DRAMSys/dram/src/error/nest_map.h b/DRAMSys/dramSys/src/error/nest_map.h similarity index 100% rename from DRAMSys/dram/src/error/nest_map.h rename to DRAMSys/dramSys/src/error/nest_map.h diff --git a/DRAMSys/dram/src/simulation/Arbiter.h b/DRAMSys/dramSys/src/simulation/Arbiter.h similarity index 100% rename from DRAMSys/dram/src/simulation/Arbiter.h rename to DRAMSys/dramSys/src/simulation/Arbiter.h diff --git a/DRAMSys/dram/src/simulation/Dram.h b/DRAMSys/dramSys/src/simulation/Dram.h similarity index 100% rename from DRAMSys/dram/src/simulation/Dram.h rename to DRAMSys/dramSys/src/simulation/Dram.h diff --git a/DRAMSys/dram/src/simulation/MemoryManager.cpp b/DRAMSys/dramSys/src/simulation/MemoryManager.cpp similarity index 100% rename from DRAMSys/dram/src/simulation/MemoryManager.cpp rename to DRAMSys/dramSys/src/simulation/MemoryManager.cpp diff --git a/DRAMSys/dram/src/simulation/MemoryManager.h b/DRAMSys/dramSys/src/simulation/MemoryManager.h similarity index 100% rename from DRAMSys/dram/src/simulation/MemoryManager.h rename to DRAMSys/dramSys/src/simulation/MemoryManager.h diff --git a/DRAMSys/dram/src/simulation/ReorderBuffer.h b/DRAMSys/dramSys/src/simulation/ReorderBuffer.h similarity index 100% rename from DRAMSys/dram/src/simulation/ReorderBuffer.h rename to DRAMSys/dramSys/src/simulation/ReorderBuffer.h diff --git a/DRAMSys/dram/src/simulation/Simulation.cpp b/DRAMSys/dramSys/src/simulation/Simulation.cpp similarity index 100% rename from DRAMSys/dram/src/simulation/Simulation.cpp rename to DRAMSys/dramSys/src/simulation/Simulation.cpp diff --git a/DRAMSys/dram/src/simulation/Simulation.h b/DRAMSys/dramSys/src/simulation/Simulation.h similarity index 100% rename from DRAMSys/dram/src/simulation/Simulation.h rename to DRAMSys/dramSys/src/simulation/Simulation.h diff --git a/DRAMSys/dram/src/simulation/SimulationManager.cpp b/DRAMSys/dramSys/src/simulation/SimulationManager.cpp similarity index 100% rename from DRAMSys/dram/src/simulation/SimulationManager.cpp rename to DRAMSys/dramSys/src/simulation/SimulationManager.cpp diff --git a/DRAMSys/dram/src/simulation/SimulationManager.h b/DRAMSys/dramSys/src/simulation/SimulationManager.h similarity index 100% rename from DRAMSys/dram/src/simulation/SimulationManager.h rename to DRAMSys/dramSys/src/simulation/SimulationManager.h diff --git a/DRAMSys/dram/src/simulation/StlPlayer.h b/DRAMSys/dramSys/src/simulation/StlPlayer.h similarity index 100% rename from DRAMSys/dram/src/simulation/StlPlayer.h rename to DRAMSys/dramSys/src/simulation/StlPlayer.h diff --git a/DRAMSys/dram/src/simulation/TraceGenerator.h b/DRAMSys/dramSys/src/simulation/TraceGenerator.h similarity index 100% rename from DRAMSys/dram/src/simulation/TraceGenerator.h rename to DRAMSys/dramSys/src/simulation/TraceGenerator.h diff --git a/DRAMSys/dram/src/simulation/TracePlayer.h b/DRAMSys/dramSys/src/simulation/TracePlayer.h similarity index 100% rename from DRAMSys/dram/src/simulation/TracePlayer.h rename to DRAMSys/dramSys/src/simulation/TracePlayer.h diff --git a/DRAMSys/dram/src/simulation/TracePlayerListener.h b/DRAMSys/dramSys/src/simulation/TracePlayerListener.h similarity index 100% rename from DRAMSys/dram/src/simulation/TracePlayerListener.h rename to DRAMSys/dramSys/src/simulation/TracePlayerListener.h diff --git a/DRAMSys/dram/src/simulation/main.cpp b/DRAMSys/dramSys/src/simulation/main.cpp similarity index 96% rename from DRAMSys/dram/src/simulation/main.cpp rename to DRAMSys/dramSys/src/simulation/main.cpp index 7acd8a98..86038a7b 100644 --- a/DRAMSys/dram/src/simulation/main.cpp +++ b/DRAMSys/dramSys/src/simulation/main.cpp @@ -59,7 +59,7 @@ int main(int argc, char **argv) int sc_main(int argc, char **argv) { sc_set_time_resolution(1, SC_PS); - resources = pathOfFile(argv[0]) + string("/../../../DRAMSys/dram/resources/"); + resources = pathOfFile(argv[0]) + string("/../../DRAMSys/dramSys/resources/"); cout< - + - + - + @@ -236,7 +236,7 @@ Below are listed the configuration sections and configuration fields. XML files describe the address mapping to be used in the simulation. - The file [am_wideio.xml](DRAMSys/dram/resources/configs/amconfigs/am_wideio.xml) is + The file [am_wideio.xml](DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml) is a good example. ``` xml @@ -265,7 +265,7 @@ Below are listed the configuration sections and configuration fields. - **Memory Configuration** - The content of [fifo.xml](DRAMSys/dram/resources/configs/memconfigs/fifo.xml) is + The content of [fifo.xml](DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml) is presented below as an example. ``` xml @@ -340,7 +340,7 @@ Resources of the simulator are available inside of the **resources** directory and its sub-directories. ``` bash -$ cd DRAMSys/dram/resources +$ cd DRAMSys/dramSys/resources ``` A description of the content each directory follows.