diff --git a/.gitignore b/.gitignore index 8e70d78d..5e63ad0d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ /build-simulation /release-simulation *.*~ -dram/build-*/ +build-*/ ._.DS_Store .DS_Store *.swp diff --git a/.gitmodules b/.gitmodules index 53c14add..677fc1c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "dram/src/common/third_party/DRAMPower"] - path = dram/src/common/third_party/DRAMPower +[submodule "DRAMSys/dram/src/common/third_party/DRAMPower"] + path = DRAMSys/dram/src/common/third_party/DRAMPower url = https://github.com/ravenrd/DRAMPower.git -[submodule "dram/src/common/third_party/tinyxml2"] - path = dram/src/common/third_party/tinyxml2 +[submodule "DRAMSys/dram/src/common/third_party/tinyxml2"] + path = DRAMSys/dram/src/common/third_party/tinyxml2 url = https://github.com/leethomason/tinyxml2.git diff --git a/analyzer/.gitignore b/DRAMSys/analyzer/.gitignore similarity index 100% rename from analyzer/.gitignore rename to DRAMSys/analyzer/.gitignore diff --git a/analyzer/analyzer/.gitignore b/DRAMSys/analyzer/analyzer/.gitignore similarity index 100% rename from analyzer/analyzer/.gitignore rename to DRAMSys/analyzer/analyzer/.gitignore diff --git a/analyzer/analyzer/README.md b/DRAMSys/analyzer/analyzer/README.md similarity index 100% rename from analyzer/analyzer/README.md rename to DRAMSys/analyzer/analyzer/README.md diff --git a/analyzer/analyzer/businessObjects/calculatedMetric.h b/DRAMSys/analyzer/analyzer/businessObjects/calculatedMetric.h similarity index 100% rename from analyzer/analyzer/businessObjects/calculatedMetric.h rename to DRAMSys/analyzer/analyzer/businessObjects/calculatedMetric.h diff --git a/analyzer/analyzer/businessObjects/comment.h b/DRAMSys/analyzer/analyzer/businessObjects/comment.h similarity index 100% rename from analyzer/analyzer/businessObjects/comment.h rename to DRAMSys/analyzer/analyzer/businessObjects/comment.h diff --git a/analyzer/analyzer/businessObjects/generalinfo.h b/DRAMSys/analyzer/analyzer/businessObjects/generalinfo.h similarity index 100% rename from analyzer/analyzer/businessObjects/generalinfo.h rename to DRAMSys/analyzer/analyzer/businessObjects/generalinfo.h diff --git a/analyzer/analyzer/businessObjects/phases/phase.cpp b/DRAMSys/analyzer/analyzer/businessObjects/phases/phase.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/phases/phase.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/phases/phase.cpp diff --git a/analyzer/analyzer/businessObjects/phases/phase.h b/DRAMSys/analyzer/analyzer/businessObjects/phases/phase.h similarity index 100% rename from analyzer/analyzer/businessObjects/phases/phase.h rename to DRAMSys/analyzer/analyzer/businessObjects/phases/phase.h diff --git a/analyzer/analyzer/businessObjects/phases/phasefactory.cpp b/DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/phases/phasefactory.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.cpp diff --git a/analyzer/analyzer/businessObjects/phases/phasefactory.h b/DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.h similarity index 100% rename from analyzer/analyzer/businessObjects/phases/phasefactory.h rename to DRAMSys/analyzer/analyzer/businessObjects/phases/phasefactory.h diff --git a/analyzer/analyzer/businessObjects/pythoncaller.cpp b/DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/pythoncaller.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.cpp diff --git a/analyzer/analyzer/businessObjects/pythoncaller.h b/DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.h similarity index 100% rename from analyzer/analyzer/businessObjects/pythoncaller.h rename to DRAMSys/analyzer/analyzer/businessObjects/pythoncaller.h diff --git a/analyzer/analyzer/businessObjects/testresult.h b/DRAMSys/analyzer/analyzer/businessObjects/testresult.h similarity index 100% rename from analyzer/analyzer/businessObjects/testresult.h rename to DRAMSys/analyzer/analyzer/businessObjects/testresult.h diff --git a/analyzer/analyzer/businessObjects/timespan.cpp b/DRAMSys/analyzer/analyzer/businessObjects/timespan.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/timespan.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/timespan.cpp diff --git a/analyzer/analyzer/businessObjects/timespan.h b/DRAMSys/analyzer/analyzer/businessObjects/timespan.h similarity index 100% rename from analyzer/analyzer/businessObjects/timespan.h rename to DRAMSys/analyzer/analyzer/businessObjects/timespan.h diff --git a/analyzer/analyzer/businessObjects/tracecalculatedmetrics.h b/DRAMSys/analyzer/analyzer/businessObjects/tracecalculatedmetrics.h similarity index 100% rename from analyzer/analyzer/businessObjects/tracecalculatedmetrics.h rename to DRAMSys/analyzer/analyzer/businessObjects/tracecalculatedmetrics.h diff --git a/analyzer/analyzer/businessObjects/tracetestresults.cpp b/DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/tracetestresults.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.cpp diff --git a/analyzer/analyzer/businessObjects/tracetestresults.h b/DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.h similarity index 100% rename from analyzer/analyzer/businessObjects/tracetestresults.h rename to DRAMSys/analyzer/analyzer/businessObjects/tracetestresults.h diff --git a/analyzer/analyzer/businessObjects/tracetime.h b/DRAMSys/analyzer/analyzer/businessObjects/tracetime.h similarity index 100% rename from analyzer/analyzer/businessObjects/tracetime.h rename to DRAMSys/analyzer/analyzer/businessObjects/tracetime.h diff --git a/analyzer/analyzer/businessObjects/transaction.cpp b/DRAMSys/analyzer/analyzer/businessObjects/transaction.cpp similarity index 100% rename from analyzer/analyzer/businessObjects/transaction.cpp rename to DRAMSys/analyzer/analyzer/businessObjects/transaction.cpp diff --git a/analyzer/analyzer/businessObjects/transaction.h b/DRAMSys/analyzer/analyzer/businessObjects/transaction.h similarity index 100% rename from analyzer/analyzer/businessObjects/transaction.h rename to DRAMSys/analyzer/analyzer/businessObjects/transaction.h diff --git a/analyzer/analyzer/data/QueryTexts.h b/DRAMSys/analyzer/analyzer/data/QueryTexts.h similarity index 100% rename from analyzer/analyzer/data/QueryTexts.h rename to DRAMSys/analyzer/analyzer/data/QueryTexts.h diff --git a/analyzer/analyzer/data/tracedb.cpp b/DRAMSys/analyzer/analyzer/data/tracedb.cpp similarity index 100% rename from analyzer/analyzer/data/tracedb.cpp rename to DRAMSys/analyzer/analyzer/data/tracedb.cpp diff --git a/analyzer/analyzer/data/tracedb.h b/DRAMSys/analyzer/analyzer/data/tracedb.h similarity index 100% rename from analyzer/analyzer/data/tracedb.h rename to DRAMSys/analyzer/analyzer/data/tracedb.h diff --git a/analyzer/analyzer/evaluationtool.cpp b/DRAMSys/analyzer/analyzer/evaluationtool.cpp similarity index 100% rename from analyzer/analyzer/evaluationtool.cpp rename to DRAMSys/analyzer/analyzer/evaluationtool.cpp diff --git a/analyzer/analyzer/evaluationtool.h b/DRAMSys/analyzer/analyzer/evaluationtool.h similarity index 100% rename from analyzer/analyzer/evaluationtool.h rename to DRAMSys/analyzer/analyzer/evaluationtool.h diff --git a/analyzer/analyzer/evaluationtool.ui b/DRAMSys/analyzer/analyzer/evaluationtool.ui similarity index 100% rename from analyzer/analyzer/evaluationtool.ui rename to DRAMSys/analyzer/analyzer/evaluationtool.ui diff --git a/analyzer/analyzer/gototimedialog.cpp b/DRAMSys/analyzer/analyzer/gototimedialog.cpp similarity index 100% rename from analyzer/analyzer/gototimedialog.cpp rename to DRAMSys/analyzer/analyzer/gototimedialog.cpp diff --git a/analyzer/analyzer/gototimedialog.h b/DRAMSys/analyzer/analyzer/gototimedialog.h similarity index 100% rename from analyzer/analyzer/gototimedialog.h rename to DRAMSys/analyzer/analyzer/gototimedialog.h diff --git a/analyzer/analyzer/gototimedialog.ui b/DRAMSys/analyzer/analyzer/gototimedialog.ui similarity index 100% rename from analyzer/analyzer/gototimedialog.ui rename to DRAMSys/analyzer/analyzer/gototimedialog.ui diff --git a/analyzer/analyzer/main.cpp b/DRAMSys/analyzer/analyzer/main.cpp similarity index 100% rename from analyzer/analyzer/main.cpp rename to DRAMSys/analyzer/analyzer/main.cpp diff --git a/analyzer/analyzer/mainwindow.cpp b/DRAMSys/analyzer/analyzer/mainwindow.cpp similarity index 100% rename from analyzer/analyzer/mainwindow.cpp rename to DRAMSys/analyzer/analyzer/mainwindow.cpp diff --git a/analyzer/analyzer/mainwindow.h b/DRAMSys/analyzer/analyzer/mainwindow.h similarity index 100% rename from analyzer/analyzer/mainwindow.h rename to DRAMSys/analyzer/analyzer/mainwindow.h diff --git a/analyzer/analyzer/markerplotitem.cpp b/DRAMSys/analyzer/analyzer/markerplotitem.cpp similarity index 100% rename from analyzer/analyzer/markerplotitem.cpp rename to DRAMSys/analyzer/analyzer/markerplotitem.cpp diff --git a/analyzer/analyzer/markerplotitem.h b/DRAMSys/analyzer/analyzer/markerplotitem.h similarity index 100% rename from analyzer/analyzer/markerplotitem.h rename to DRAMSys/analyzer/analyzer/markerplotitem.h diff --git a/analyzer/analyzer/paths.pro b/DRAMSys/analyzer/analyzer/paths.pro similarity index 100% rename from analyzer/analyzer/paths.pro rename to DRAMSys/analyzer/analyzer/paths.pro diff --git a/analyzer/analyzer/preferences.ui b/DRAMSys/analyzer/analyzer/preferences.ui similarity index 100% rename from analyzer/analyzer/preferences.ui rename to DRAMSys/analyzer/analyzer/preferences.ui diff --git a/analyzer/analyzer/presentation/commenttreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/commenttreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/commenttreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/commenttreewidget.cpp diff --git a/analyzer/analyzer/presentation/commenttreewidget.h b/DRAMSys/analyzer/analyzer/presentation/commenttreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/commenttreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/commenttreewidget.h diff --git a/analyzer/analyzer/presentation/debugmessagetreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/debugmessagetreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.cpp diff --git a/analyzer/analyzer/presentation/debugmessagetreewidget.h b/DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/debugmessagetreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/debugmessagetreewidget.h diff --git a/analyzer/analyzer/presentation/pornotracescroller.cpp b/DRAMSys/analyzer/analyzer/presentation/pornotracescroller.cpp similarity index 100% rename from analyzer/analyzer/presentation/pornotracescroller.cpp rename to DRAMSys/analyzer/analyzer/presentation/pornotracescroller.cpp diff --git a/analyzer/analyzer/presentation/pornotracescroller.h b/DRAMSys/analyzer/analyzer/presentation/pornotracescroller.h similarity index 100% rename from analyzer/analyzer/presentation/pornotracescroller.h rename to DRAMSys/analyzer/analyzer/presentation/pornotracescroller.h diff --git a/analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.cpp diff --git a/analyzer/analyzer/presentation/selectedtransactiontreewidget.h b/DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/selectedtransactiontreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/selectedtransactiontreewidget.h diff --git a/analyzer/analyzer/presentation/tracePlotMouseLabel.cpp b/DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.cpp similarity index 100% rename from analyzer/analyzer/presentation/tracePlotMouseLabel.cpp rename to DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.cpp diff --git a/analyzer/analyzer/presentation/tracePlotMouseLabel.h b/DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.h similarity index 100% rename from analyzer/analyzer/presentation/tracePlotMouseLabel.h rename to DRAMSys/analyzer/analyzer/presentation/tracePlotMouseLabel.h diff --git a/analyzer/analyzer/presentation/tracedrawing.cpp b/DRAMSys/analyzer/analyzer/presentation/tracedrawing.cpp similarity index 100% rename from analyzer/analyzer/presentation/tracedrawing.cpp rename to DRAMSys/analyzer/analyzer/presentation/tracedrawing.cpp diff --git a/analyzer/analyzer/presentation/tracedrawing.h b/DRAMSys/analyzer/analyzer/presentation/tracedrawing.h similarity index 100% rename from analyzer/analyzer/presentation/tracedrawing.h rename to DRAMSys/analyzer/analyzer/presentation/tracedrawing.h diff --git a/analyzer/analyzer/presentation/tracedrawingproperties.h b/DRAMSys/analyzer/analyzer/presentation/tracedrawingproperties.h similarity index 100% rename from analyzer/analyzer/presentation/tracedrawingproperties.h rename to DRAMSys/analyzer/analyzer/presentation/tracedrawingproperties.h diff --git a/analyzer/analyzer/presentation/tracemetrictreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/tracemetrictreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.cpp diff --git a/analyzer/analyzer/presentation/tracemetrictreewidget.h b/DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/tracemetrictreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/tracemetrictreewidget.h diff --git a/analyzer/analyzer/presentation/tracenavigator.cpp b/DRAMSys/analyzer/analyzer/presentation/tracenavigator.cpp similarity index 100% rename from analyzer/analyzer/presentation/tracenavigator.cpp rename to DRAMSys/analyzer/analyzer/presentation/tracenavigator.cpp diff --git a/analyzer/analyzer/presentation/tracenavigator.h b/DRAMSys/analyzer/analyzer/presentation/tracenavigator.h similarity index 100% rename from analyzer/analyzer/presentation/tracenavigator.h rename to DRAMSys/analyzer/analyzer/presentation/tracenavigator.h diff --git a/analyzer/analyzer/presentation/traceplot.cpp b/DRAMSys/analyzer/analyzer/presentation/traceplot.cpp similarity index 100% rename from analyzer/analyzer/presentation/traceplot.cpp rename to DRAMSys/analyzer/analyzer/presentation/traceplot.cpp diff --git a/analyzer/analyzer/presentation/traceplot.h b/DRAMSys/analyzer/analyzer/presentation/traceplot.h similarity index 100% rename from analyzer/analyzer/presentation/traceplot.h rename to DRAMSys/analyzer/analyzer/presentation/traceplot.h diff --git a/analyzer/analyzer/presentation/traceplotitem.cpp b/DRAMSys/analyzer/analyzer/presentation/traceplotitem.cpp similarity index 100% rename from analyzer/analyzer/presentation/traceplotitem.cpp rename to DRAMSys/analyzer/analyzer/presentation/traceplotitem.cpp diff --git a/analyzer/analyzer/presentation/traceplotitem.h b/DRAMSys/analyzer/analyzer/presentation/traceplotitem.h similarity index 100% rename from analyzer/analyzer/presentation/traceplotitem.h rename to DRAMSys/analyzer/analyzer/presentation/traceplotitem.h diff --git a/analyzer/analyzer/presentation/tracetesttreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/tracetesttreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.cpp diff --git a/analyzer/analyzer/presentation/tracetesttreewidget.h b/DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/tracetesttreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/tracetesttreewidget.h diff --git a/analyzer/analyzer/presentation/transactiontreewidget.cpp b/DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.cpp similarity index 100% rename from analyzer/analyzer/presentation/transactiontreewidget.cpp rename to DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.cpp diff --git a/analyzer/analyzer/presentation/transactiontreewidget.h b/DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.h similarity index 100% rename from analyzer/analyzer/presentation/transactiontreewidget.h rename to DRAMSys/analyzer/analyzer/presentation/transactiontreewidget.h diff --git a/analyzer/analyzer/presentation/util/clkgrid.cpp b/DRAMSys/analyzer/analyzer/presentation/util/clkgrid.cpp similarity index 100% rename from analyzer/analyzer/presentation/util/clkgrid.cpp rename to DRAMSys/analyzer/analyzer/presentation/util/clkgrid.cpp diff --git a/analyzer/analyzer/presentation/util/clkgrid.h b/DRAMSys/analyzer/analyzer/presentation/util/clkgrid.h similarity index 100% rename from analyzer/analyzer/presentation/util/clkgrid.h rename to DRAMSys/analyzer/analyzer/presentation/util/clkgrid.h diff --git a/analyzer/analyzer/presentation/util/colorgenerator.cpp b/DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.cpp similarity index 100% rename from analyzer/analyzer/presentation/util/colorgenerator.cpp rename to DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.cpp diff --git a/analyzer/analyzer/presentation/util/colorgenerator.h b/DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.h similarity index 100% rename from analyzer/analyzer/presentation/util/colorgenerator.h rename to DRAMSys/analyzer/analyzer/presentation/util/colorgenerator.h diff --git a/analyzer/analyzer/presentation/util/customlabelscaledraw.h b/DRAMSys/analyzer/analyzer/presentation/util/customlabelscaledraw.h similarity index 100% rename from analyzer/analyzer/presentation/util/customlabelscaledraw.h rename to DRAMSys/analyzer/analyzer/presentation/util/customlabelscaledraw.h diff --git a/analyzer/analyzer/presentation/util/engineeringScaleDraw.h b/DRAMSys/analyzer/analyzer/presentation/util/engineeringScaleDraw.h similarity index 100% rename from analyzer/analyzer/presentation/util/engineeringScaleDraw.h rename to DRAMSys/analyzer/analyzer/presentation/util/engineeringScaleDraw.h diff --git a/analyzer/analyzer/presentation/util/testlight.cpp b/DRAMSys/analyzer/analyzer/presentation/util/testlight.cpp similarity index 100% rename from analyzer/analyzer/presentation/util/testlight.cpp rename to DRAMSys/analyzer/analyzer/presentation/util/testlight.cpp diff --git a/analyzer/analyzer/presentation/util/testlight.h b/DRAMSys/analyzer/analyzer/presentation/util/testlight.h similarity index 100% rename from analyzer/analyzer/presentation/util/testlight.h rename to DRAMSys/analyzer/analyzer/presentation/util/testlight.h diff --git a/analyzer/analyzer/queryeditor.cpp b/DRAMSys/analyzer/analyzer/queryeditor.cpp similarity index 100% rename from analyzer/analyzer/queryeditor.cpp rename to DRAMSys/analyzer/analyzer/queryeditor.cpp diff --git a/analyzer/analyzer/queryeditor.h b/DRAMSys/analyzer/analyzer/queryeditor.h similarity index 100% rename from analyzer/analyzer/queryeditor.h rename to DRAMSys/analyzer/analyzer/queryeditor.h diff --git a/analyzer/analyzer/queryeditor.ui b/DRAMSys/analyzer/analyzer/queryeditor.ui similarity index 100% rename from analyzer/analyzer/queryeditor.ui rename to DRAMSys/analyzer/analyzer/queryeditor.ui diff --git a/analyzer/analyzer/schedulerwrapper.h b/DRAMSys/analyzer/analyzer/schedulerwrapper.h similarity index 100% rename from analyzer/analyzer/schedulerwrapper.h rename to DRAMSys/analyzer/analyzer/schedulerwrapper.h diff --git a/analyzer/analyzer/scripts/metrics.py b/DRAMSys/analyzer/analyzer/scripts/metrics.py similarity index 100% rename from analyzer/analyzer/scripts/metrics.py rename to DRAMSys/analyzer/analyzer/scripts/metrics.py diff --git a/analyzer/analyzer/scripts/tests.py b/DRAMSys/analyzer/analyzer/scripts/tests.py similarity index 100% rename from analyzer/analyzer/scripts/tests.py rename to DRAMSys/analyzer/analyzer/scripts/tests.py diff --git a/analyzer/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/analyzer/traceAnalyzer.pro similarity index 100% rename from analyzer/analyzer/traceAnalyzer.pro rename to DRAMSys/analyzer/analyzer/traceAnalyzer.pro diff --git a/analyzer/analyzer/traceanalyzer.cpp b/DRAMSys/analyzer/analyzer/traceanalyzer.cpp similarity index 100% rename from analyzer/analyzer/traceanalyzer.cpp rename to DRAMSys/analyzer/analyzer/traceanalyzer.cpp diff --git a/analyzer/analyzer/traceanalyzer.h b/DRAMSys/analyzer/analyzer/traceanalyzer.h similarity index 100% rename from analyzer/analyzer/traceanalyzer.h rename to DRAMSys/analyzer/analyzer/traceanalyzer.h diff --git a/analyzer/analyzer/traceanalyzer.ui b/DRAMSys/analyzer/analyzer/traceanalyzer.ui similarity index 100% rename from analyzer/analyzer/traceanalyzer.ui rename to DRAMSys/analyzer/analyzer/traceanalyzer.ui diff --git a/analyzer/analyzer/tracefiletab.cpp b/DRAMSys/analyzer/analyzer/tracefiletab.cpp similarity index 100% rename from analyzer/analyzer/tracefiletab.cpp rename to DRAMSys/analyzer/analyzer/tracefiletab.cpp diff --git a/analyzer/analyzer/tracefiletab.h b/DRAMSys/analyzer/analyzer/tracefiletab.h similarity index 100% rename from analyzer/analyzer/tracefiletab.h rename to DRAMSys/analyzer/analyzer/tracefiletab.h diff --git a/analyzer/analyzer/tracefiletab.ui b/DRAMSys/analyzer/analyzer/tracefiletab.ui similarity index 100% rename from analyzer/analyzer/tracefiletab.ui rename to DRAMSys/analyzer/analyzer/tracefiletab.ui diff --git a/docs/Timings.ods b/DRAMSys/docs/Timings.ods similarity index 100% rename from docs/Timings.ods rename to DRAMSys/docs/Timings.ods diff --git a/docs/images/am_sample1.svg b/DRAMSys/docs/images/am_sample1.svg similarity index 100% rename from docs/images/am_sample1.svg rename to DRAMSys/docs/images/am_sample1.svg diff --git a/docs/images/am_sample2.svg b/DRAMSys/docs/images/am_sample2.svg similarity index 100% rename from docs/images/am_sample2.svg rename to DRAMSys/docs/images/am_sample2.svg diff --git a/DRAMSys/dram.vp.system.pro b/DRAMSys/dram.vp.system.pro new file mode 100644 index 00000000..8a415440 --- /dev/null +++ b/DRAMSys/dram.vp.system.pro @@ -0,0 +1,5 @@ +TEMPLATE = subdirs + +SUBDIRS = dram/dramSys/dramSys.pro +SUBDIRS += analyzer/analyzer/traceAnalyzer.pro + diff --git a/dram/dramSys/.gitignore b/DRAMSys/dram/dramSys/.gitignore similarity index 100% rename from dram/dramSys/.gitignore rename to DRAMSys/dram/dramSys/.gitignore diff --git a/dram/dramSys/dramSys.pro b/DRAMSys/dram/dramSys/dramSys.pro similarity index 97% rename from dram/dramSys/dramSys.pro rename to DRAMSys/dram/dramSys/dramSys.pro index 3d4c737f..7c408025 100644 --- a/dram/dramSys/dramSys.pro +++ b/DRAMSys/dram/dramSys/dramSys.pro @@ -3,13 +3,13 @@ CONFIG += console CONFIG -= app_bundle CONFIG -= qt -system(cd ../src/common/third_party/DRAMPower; make lib;) +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../src/common/third_party/DRAMPower/src/ -ldrampower +LIBS += -L../../../DRAMSys/dram/src/common/third_party/DRAMPower/src/ -ldrampower INCLUDEPATH += /opt/systemc/include INCLUDEPATH += /opt/boost/include diff --git a/dram/resources/.gitignore b/DRAMSys/dram/resources/.gitignore similarity index 100% rename from dram/resources/.gitignore rename to DRAMSys/dram/resources/.gitignore diff --git a/dram/resources/configs/amconfigs/am_ddr4.xml b/DRAMSys/dram/resources/configs/amconfigs/am_ddr4.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_ddr4.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_ddr4.xml diff --git a/dram/resources/configs/amconfigs/am_highHits.xml b/DRAMSys/dram/resources/configs/amconfigs/am_highHits.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_highHits.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_highHits.xml diff --git a/dram/resources/configs/amconfigs/am_highPara.xml b/DRAMSys/dram/resources/configs/amconfigs/am_highPara.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_highPara.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_highPara.xml diff --git a/dram/resources/configs/amconfigs/am_lowHits.xml b/DRAMSys/dram/resources/configs/amconfigs/am_lowHits.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_lowHits.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_lowHits.xml diff --git a/dram/resources/configs/amconfigs/am_lowPara.xml b/DRAMSys/dram/resources/configs/amconfigs/am_lowPara.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_lowPara.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_lowPara.xml diff --git a/dram/resources/configs/amconfigs/am_wideio.xml b/DRAMSys/dram/resources/configs/amconfigs/am_wideio.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_wideio.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_wideio.xml diff --git a/dram/resources/configs/amconfigs/am_wideioFourBanks.xml b/DRAMSys/dram/resources/configs/amconfigs/am_wideioFourBanks.xml similarity index 100% rename from dram/resources/configs/amconfigs/am_wideioFourBanks.xml rename to DRAMSys/dram/resources/configs/amconfigs/am_wideioFourBanks.xml diff --git a/dram/resources/configs/memconfigs/.gitignore b/DRAMSys/dram/resources/configs/memconfigs/.gitignore similarity index 100% rename from dram/resources/configs/memconfigs/.gitignore rename to DRAMSys/dram/resources/configs/memconfigs/.gitignore diff --git a/dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml b/DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml similarity index 100% rename from dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml rename to DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml diff --git a/dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml b/DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml similarity index 100% rename from dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml rename to DRAMSys/dram/resources/configs/memconfigs/_old/fr_fcfs_unaware.xml diff --git a/dram/resources/configs/memconfigs/_old/grouper.xml b/DRAMSys/dram/resources/configs/memconfigs/_old/grouper.xml similarity index 100% rename from dram/resources/configs/memconfigs/_old/grouper.xml rename to DRAMSys/dram/resources/configs/memconfigs/_old/grouper.xml diff --git a/dram/resources/configs/memconfigs/_old/par_bs.xml b/DRAMSys/dram/resources/configs/memconfigs/_old/par_bs.xml similarity index 100% rename from dram/resources/configs/memconfigs/_old/par_bs.xml rename to DRAMSys/dram/resources/configs/memconfigs/_old/par_bs.xml diff --git a/dram/resources/configs/memconfigs/_old/par_bs_unaware.xml b/DRAMSys/dram/resources/configs/memconfigs/_old/par_bs_unaware.xml similarity index 100% rename from dram/resources/configs/memconfigs/_old/par_bs_unaware.xml rename to DRAMSys/dram/resources/configs/memconfigs/_old/par_bs_unaware.xml diff --git a/dram/resources/configs/memconfigs/fifo.xml b/DRAMSys/dram/resources/configs/memconfigs/fifo.xml similarity index 100% rename from dram/resources/configs/memconfigs/fifo.xml rename to DRAMSys/dram/resources/configs/memconfigs/fifo.xml diff --git a/dram/resources/configs/memconfigs/fifoStrict.xml b/DRAMSys/dram/resources/configs/memconfigs/fifoStrict.xml similarity index 100% rename from dram/resources/configs/memconfigs/fifoStrict.xml rename to DRAMSys/dram/resources/configs/memconfigs/fifoStrict.xml diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/DRAMSys/dram/resources/configs/memconfigs/fr_fcfs.xml similarity index 100% rename from dram/resources/configs/memconfigs/fr_fcfs.xml rename to DRAMSys/dram/resources/configs/memconfigs/fr_fcfs.xml diff --git a/dram/resources/configs/memspecs/DDR4.xml b/DRAMSys/dram/resources/configs/memspecs/DDR4.xml similarity index 100% rename from dram/resources/configs/memspecs/DDR4.xml rename to DRAMSys/dram/resources/configs/memspecs/DDR4.xml diff --git a/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml b/DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml similarity index 100% rename from dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml rename to DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml diff --git a/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml b/DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml similarity index 100% rename from dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml rename to DRAMSys/dram/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml diff --git a/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml b/DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml similarity index 100% rename from dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml rename to DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml diff --git a/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml b/DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml similarity index 100% rename from dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml rename to DRAMSys/dram/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml diff --git a/dram/resources/configs/memspecs/MatzesWideIO-short.xml b/DRAMSys/dram/resources/configs/memspecs/MatzesWideIO-short.xml similarity index 100% rename from dram/resources/configs/memspecs/MatzesWideIO-short.xml rename to DRAMSys/dram/resources/configs/memspecs/MatzesWideIO-short.xml diff --git a/dram/resources/configs/memspecs/MatzesWideIO.xml b/DRAMSys/dram/resources/configs/memspecs/MatzesWideIO.xml similarity index 100% rename from dram/resources/configs/memspecs/MatzesWideIO.xml rename to DRAMSys/dram/resources/configs/memspecs/MatzesWideIO.xml diff --git a/dram/resources/configs/memspecs/WideIO.xml b/DRAMSys/dram/resources/configs/memspecs/WideIO.xml similarity index 100% rename from dram/resources/configs/memspecs/WideIO.xml rename to DRAMSys/dram/resources/configs/memspecs/WideIO.xml diff --git a/dram/resources/configs/memspecs/memspec.dtd b/DRAMSys/dram/resources/configs/memspecs/memspec.dtd similarity index 100% rename from dram/resources/configs/memspecs/memspec.dtd rename to DRAMSys/dram/resources/configs/memspecs/memspec.dtd diff --git a/dram/resources/scripts/address_scrambler.pl b/DRAMSys/dram/resources/scripts/address_scrambler.pl similarity index 100% rename from dram/resources/scripts/address_scrambler.pl rename to DRAMSys/dram/resources/scripts/address_scrambler.pl diff --git a/dram/resources/scripts/analyse_trace.pl b/DRAMSys/dram/resources/scripts/analyse_trace.pl similarity index 100% rename from dram/resources/scripts/analyse_trace.pl rename to DRAMSys/dram/resources/scripts/analyse_trace.pl diff --git a/dram/resources/scripts/createTraceDB.sql b/DRAMSys/dram/resources/scripts/createTraceDB.sql similarity index 100% rename from dram/resources/scripts/createTraceDB.sql rename to DRAMSys/dram/resources/scripts/createTraceDB.sql diff --git a/dram/resources/scripts/stride_detection.pl b/DRAMSys/dram/resources/scripts/stride_detection.pl similarity index 100% rename from dram/resources/scripts/stride_detection.pl rename to DRAMSys/dram/resources/scripts/stride_detection.pl diff --git a/DRAMSys/dram/resources/simulations/sim-batch.xml b/DRAMSys/dram/resources/simulations/sim-batch.xml new file mode 100644 index 00000000..0da6195c --- /dev/null +++ b/DRAMSys/dram/resources/simulations/sim-batch.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + chstone-adpcm_32.stl + + + + diff --git a/dram/resources/traces/prettyTest b/DRAMSys/dram/resources/traces/prettyTest similarity index 100% rename from dram/resources/traces/prettyTest rename to DRAMSys/dram/resources/traces/prettyTest diff --git a/dram/src/common/DebugManager.cpp b/DRAMSys/dram/src/common/DebugManager.cpp similarity index 100% rename from dram/src/common/DebugManager.cpp rename to DRAMSys/dram/src/common/DebugManager.cpp diff --git a/dram/src/common/DebugManager.h b/DRAMSys/dram/src/common/DebugManager.h similarity index 100% rename from dram/src/common/DebugManager.h rename to DRAMSys/dram/src/common/DebugManager.h diff --git a/dram/src/common/TlmRecorder.cpp b/DRAMSys/dram/src/common/TlmRecorder.cpp similarity index 100% rename from dram/src/common/TlmRecorder.cpp rename to DRAMSys/dram/src/common/TlmRecorder.cpp diff --git a/dram/src/common/TlmRecorder.h b/DRAMSys/dram/src/common/TlmRecorder.h similarity index 100% rename from dram/src/common/TlmRecorder.h rename to DRAMSys/dram/src/common/TlmRecorder.h diff --git a/dram/src/common/Utils.cpp b/DRAMSys/dram/src/common/Utils.cpp similarity index 100% rename from dram/src/common/Utils.cpp rename to DRAMSys/dram/src/common/Utils.cpp diff --git a/dram/src/common/Utils.h b/DRAMSys/dram/src/common/Utils.h similarity index 100% rename from dram/src/common/Utils.h rename to DRAMSys/dram/src/common/Utils.h diff --git a/dram/src/common/dramExtension.cpp b/DRAMSys/dram/src/common/dramExtension.cpp similarity index 100% rename from dram/src/common/dramExtension.cpp rename to DRAMSys/dram/src/common/dramExtension.cpp diff --git a/dram/src/common/dramExtension.h b/DRAMSys/dram/src/common/dramExtension.h similarity index 100% rename from dram/src/common/dramExtension.h rename to DRAMSys/dram/src/common/dramExtension.h diff --git a/dram/src/common/protocol.h b/DRAMSys/dram/src/common/protocol.h similarity index 100% rename from dram/src/common/protocol.h rename to DRAMSys/dram/src/common/protocol.h diff --git a/dram/src/common/third_party/DRAMPower b/DRAMSys/dram/src/common/third_party/DRAMPower similarity index 100% rename from dram/src/common/third_party/DRAMPower rename to DRAMSys/dram/src/common/third_party/DRAMPower diff --git a/DRAMSys/dram/src/common/third_party/tinyxml2 b/DRAMSys/dram/src/common/third_party/tinyxml2 new file mode 160000 index 00000000..aebaeea6 --- /dev/null +++ b/DRAMSys/dram/src/common/third_party/tinyxml2 @@ -0,0 +1 @@ +Subproject commit aebaeea687f69b41e55f1acbf0a11321c6af5bfd diff --git a/dram/src/common/tlm2_base_protocol_checker.h b/DRAMSys/dram/src/common/tlm2_base_protocol_checker.h similarity index 100% rename from dram/src/common/tlm2_base_protocol_checker.h rename to DRAMSys/dram/src/common/tlm2_base_protocol_checker.h diff --git a/dram/src/common/xmlAddressdecoder.cpp b/DRAMSys/dram/src/common/xmlAddressdecoder.cpp similarity index 100% rename from dram/src/common/xmlAddressdecoder.cpp rename to DRAMSys/dram/src/common/xmlAddressdecoder.cpp diff --git a/dram/src/common/xmlAddressdecoder.h b/DRAMSys/dram/src/common/xmlAddressdecoder.h similarity index 100% rename from dram/src/common/xmlAddressdecoder.h rename to DRAMSys/dram/src/common/xmlAddressdecoder.h diff --git a/dram/src/controller/Command.cpp b/DRAMSys/dram/src/controller/Command.cpp similarity index 100% rename from dram/src/controller/Command.cpp rename to DRAMSys/dram/src/controller/Command.cpp diff --git a/dram/src/controller/Command.h b/DRAMSys/dram/src/controller/Command.h similarity index 100% rename from dram/src/controller/Command.h rename to DRAMSys/dram/src/controller/Command.h diff --git a/dram/src/controller/Controller.cpp b/DRAMSys/dram/src/controller/Controller.cpp similarity index 100% rename from dram/src/controller/Controller.cpp rename to DRAMSys/dram/src/controller/Controller.cpp diff --git a/dram/src/controller/Controller.h b/DRAMSys/dram/src/controller/Controller.h similarity index 100% rename from dram/src/controller/Controller.h rename to DRAMSys/dram/src/controller/Controller.h diff --git a/dram/src/controller/ControllerState.cpp b/DRAMSys/dram/src/controller/ControllerState.cpp similarity index 100% rename from dram/src/controller/ControllerState.cpp rename to DRAMSys/dram/src/controller/ControllerState.cpp diff --git a/dram/src/controller/ControllerState.h b/DRAMSys/dram/src/controller/ControllerState.h similarity index 100% rename from dram/src/controller/ControllerState.h rename to DRAMSys/dram/src/controller/ControllerState.h diff --git a/dram/src/controller/IController.h b/DRAMSys/dram/src/controller/IController.h similarity index 100% rename from dram/src/controller/IController.h rename to DRAMSys/dram/src/controller/IController.h diff --git a/dram/src/controller/RowBufferStates.cpp b/DRAMSys/dram/src/controller/RowBufferStates.cpp similarity index 100% rename from dram/src/controller/RowBufferStates.cpp rename to DRAMSys/dram/src/controller/RowBufferStates.cpp diff --git a/dram/src/controller/RowBufferStates.h b/DRAMSys/dram/src/controller/RowBufferStates.h similarity index 100% rename from dram/src/controller/RowBufferStates.h rename to DRAMSys/dram/src/controller/RowBufferStates.h diff --git a/dram/src/controller/core/ControllerCore.cpp b/DRAMSys/dram/src/controller/core/ControllerCore.cpp similarity index 100% rename from dram/src/controller/core/ControllerCore.cpp rename to DRAMSys/dram/src/controller/core/ControllerCore.cpp diff --git a/dram/src/controller/core/ControllerCore.h b/DRAMSys/dram/src/controller/core/ControllerCore.h similarity index 100% rename from dram/src/controller/core/ControllerCore.h rename to DRAMSys/dram/src/controller/core/ControllerCore.h diff --git a/dram/src/controller/core/Slots.cpp b/DRAMSys/dram/src/controller/core/Slots.cpp similarity index 100% rename from dram/src/controller/core/Slots.cpp rename to DRAMSys/dram/src/controller/core/Slots.cpp diff --git a/dram/src/controller/core/Slots.h b/DRAMSys/dram/src/controller/core/Slots.h similarity index 100% rename from dram/src/controller/core/Slots.h rename to DRAMSys/dram/src/controller/core/Slots.h diff --git a/dram/src/controller/core/TimingCalculation.cpp b/DRAMSys/dram/src/controller/core/TimingCalculation.cpp similarity index 100% rename from dram/src/controller/core/TimingCalculation.cpp rename to DRAMSys/dram/src/controller/core/TimingCalculation.cpp diff --git a/dram/src/controller/core/TimingCalculation.h b/DRAMSys/dram/src/controller/core/TimingCalculation.h similarity index 100% rename from dram/src/controller/core/TimingCalculation.h rename to DRAMSys/dram/src/controller/core/TimingCalculation.h diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/DRAMSys/dram/src/controller/core/configuration/Configuration.cpp similarity index 100% rename from dram/src/controller/core/configuration/Configuration.cpp rename to DRAMSys/dram/src/controller/core/configuration/Configuration.cpp diff --git a/dram/src/controller/core/configuration/Configuration.h b/DRAMSys/dram/src/controller/core/configuration/Configuration.h similarity index 100% rename from dram/src/controller/core/configuration/Configuration.h rename to DRAMSys/dram/src/controller/core/configuration/Configuration.h diff --git a/dram/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.cpp similarity index 100% rename from dram/src/controller/core/configuration/ConfigurationLoader.cpp rename to DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.cpp diff --git a/dram/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.h similarity index 100% rename from dram/src/controller/core/configuration/ConfigurationLoader.h rename to DRAMSys/dram/src/controller/core/configuration/ConfigurationLoader.h diff --git a/dram/src/controller/core/configuration/MemSpec.h b/DRAMSys/dram/src/controller/core/configuration/MemSpec.h similarity index 100% rename from dram/src/controller/core/configuration/MemSpec.h rename to DRAMSys/dram/src/controller/core/configuration/MemSpec.h diff --git a/dram/src/controller/core/configuration/MemSpecLoader.h.autosave b/DRAMSys/dram/src/controller/core/configuration/MemSpecLoader.h.autosave similarity index 100% rename from dram/src/controller/core/configuration/MemSpecLoader.h.autosave rename to DRAMSys/dram/src/controller/core/configuration/MemSpecLoader.h.autosave diff --git a/dram/src/controller/core/powerdown/IPowerDownManager.h b/DRAMSys/dram/src/controller/core/powerdown/IPowerDownManager.h similarity index 100% rename from dram/src/controller/core/powerdown/IPowerDownManager.h rename to DRAMSys/dram/src/controller/core/powerdown/IPowerDownManager.h diff --git a/dram/src/controller/core/powerdown/NoPowerDown.cpp b/DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.cpp similarity index 100% rename from dram/src/controller/core/powerdown/NoPowerDown.cpp rename to DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.cpp diff --git a/dram/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.h similarity index 100% rename from dram/src/controller/core/powerdown/NoPowerDown.h rename to DRAMSys/dram/src/controller/core/powerdown/NoPowerDown.h diff --git a/dram/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.cpp similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManager.cpp rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.cpp diff --git a/dram/src/controller/core/powerdown/PowerDownManager.h b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.h similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManager.h rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManager.h diff --git a/dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.cpp diff --git a/dram/src/controller/core/powerdown/PowerDownManagerBankwise.h b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.h similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManagerBankwise.h rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerBankwise.h diff --git a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.cpp diff --git a/dram/src/controller/core/powerdown/PowerDownManagerTimeout.h b/DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.h similarity index 100% rename from dram/src/controller/core/powerdown/PowerDownManagerTimeout.h rename to DRAMSys/dram/src/controller/core/powerdown/PowerDownManagerTimeout.h diff --git a/dram/src/controller/core/refresh/IRefreshManager.h b/DRAMSys/dram/src/controller/core/refresh/IRefreshManager.h similarity index 100% rename from dram/src/controller/core/refresh/IRefreshManager.h rename to DRAMSys/dram/src/controller/core/refresh/IRefreshManager.h diff --git a/dram/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/dram/src/controller/core/refresh/RefreshManager.cpp similarity index 100% rename from dram/src/controller/core/refresh/RefreshManager.cpp rename to DRAMSys/dram/src/controller/core/refresh/RefreshManager.cpp diff --git a/dram/src/controller/core/refresh/RefreshManager.h b/DRAMSys/dram/src/controller/core/refresh/RefreshManager.h similarity index 100% rename from dram/src/controller/core/refresh/RefreshManager.h rename to DRAMSys/dram/src/controller/core/refresh/RefreshManager.h diff --git a/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp similarity index 100% rename from dram/src/controller/core/refresh/RefreshManagerBankwise.cpp rename to DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.cpp diff --git a/dram/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.h similarity index 100% rename from dram/src/controller/core/refresh/RefreshManagerBankwise.h rename to DRAMSys/dram/src/controller/core/refresh/RefreshManagerBankwise.h diff --git a/dram/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.cpp similarity index 100% rename from dram/src/controller/core/scheduling/ScheduledCommand.cpp rename to DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.cpp diff --git a/dram/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.h similarity index 100% rename from dram/src/controller/core/scheduling/ScheduledCommand.h rename to DRAMSys/dram/src/controller/core/scheduling/ScheduledCommand.h diff --git a/dram/src/controller/core/scheduling/Trigger.h b/DRAMSys/dram/src/controller/core/scheduling/Trigger.h similarity index 100% rename from dram/src/controller/core/scheduling/Trigger.h rename to DRAMSys/dram/src/controller/core/scheduling/Trigger.h diff --git a/dram/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/ActivateChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/ActivateChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/ActivateChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/ActivateChecker.h diff --git a/dram/src/controller/core/scheduling/checker/ICommandChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/ICommandChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/ICommandChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/ICommandChecker.h diff --git a/dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/PowerDownChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/PowerDownChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/PowerDownChecker.h diff --git a/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeAllChecker.h diff --git a/dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/PrechargeChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/PrechargeChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/PrechargeChecker.h diff --git a/dram/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/ReadChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/ReadChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/ReadChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/ReadChecker.h diff --git a/dram/src/controller/core/scheduling/checker/RefreshChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/RefreshChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/RefreshChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/RefreshChecker.h diff --git a/dram/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.cpp similarity index 100% rename from dram/src/controller/core/scheduling/checker/WriteChecker.cpp rename to DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.cpp diff --git a/dram/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.h similarity index 100% rename from dram/src/controller/core/scheduling/checker/WriteChecker.h rename to DRAMSys/dram/src/controller/core/scheduling/checker/WriteChecker.h diff --git a/dram/src/controller/scheduler/Fifo.cpp b/DRAMSys/dram/src/controller/scheduler/Fifo.cpp similarity index 100% rename from dram/src/controller/scheduler/Fifo.cpp rename to DRAMSys/dram/src/controller/scheduler/Fifo.cpp diff --git a/dram/src/controller/scheduler/Fifo.h b/DRAMSys/dram/src/controller/scheduler/Fifo.h similarity index 100% rename from dram/src/controller/scheduler/Fifo.h rename to DRAMSys/dram/src/controller/scheduler/Fifo.h diff --git a/dram/src/controller/scheduler/FifoStrict.cpp b/DRAMSys/dram/src/controller/scheduler/FifoStrict.cpp similarity index 100% rename from dram/src/controller/scheduler/FifoStrict.cpp rename to DRAMSys/dram/src/controller/scheduler/FifoStrict.cpp diff --git a/dram/src/controller/scheduler/FifoStrict.h b/DRAMSys/dram/src/controller/scheduler/FifoStrict.h similarity index 100% rename from dram/src/controller/scheduler/FifoStrict.h rename to DRAMSys/dram/src/controller/scheduler/FifoStrict.h diff --git a/dram/src/controller/scheduler/Fr_Fcfs.cpp b/DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.cpp similarity index 100% rename from dram/src/controller/scheduler/Fr_Fcfs.cpp rename to DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.cpp diff --git a/dram/src/controller/scheduler/Fr_Fcfs.h b/DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.h similarity index 100% rename from dram/src/controller/scheduler/Fr_Fcfs.h rename to DRAMSys/dram/src/controller/scheduler/Fr_Fcfs.h diff --git a/dram/src/controller/scheduler/IScheduler.cpp b/DRAMSys/dram/src/controller/scheduler/IScheduler.cpp similarity index 100% rename from dram/src/controller/scheduler/IScheduler.cpp rename to DRAMSys/dram/src/controller/scheduler/IScheduler.cpp diff --git a/dram/src/controller/scheduler/IScheduler.h b/DRAMSys/dram/src/controller/scheduler/IScheduler.h similarity index 100% rename from dram/src/controller/scheduler/IScheduler.h rename to DRAMSys/dram/src/controller/scheduler/IScheduler.h diff --git a/dram/src/controller/scheduler/PARBS.cpp b/DRAMSys/dram/src/controller/scheduler/PARBS.cpp similarity index 100% rename from dram/src/controller/scheduler/PARBS.cpp rename to DRAMSys/dram/src/controller/scheduler/PARBS.cpp diff --git a/dram/src/controller/scheduler/PARBS.h b/DRAMSys/dram/src/controller/scheduler/PARBS.h similarity index 100% rename from dram/src/controller/scheduler/PARBS.h rename to DRAMSys/dram/src/controller/scheduler/PARBS.h diff --git a/dram/src/controller/scheduler/ThreadLoad.cpp b/DRAMSys/dram/src/controller/scheduler/ThreadLoad.cpp similarity index 100% rename from dram/src/controller/scheduler/ThreadLoad.cpp rename to DRAMSys/dram/src/controller/scheduler/ThreadLoad.cpp diff --git a/dram/src/controller/scheduler/ThreadLoad.h b/DRAMSys/dram/src/controller/scheduler/ThreadLoad.h similarity index 100% rename from dram/src/controller/scheduler/ThreadLoad.h rename to DRAMSys/dram/src/controller/scheduler/ThreadLoad.h diff --git a/dram/src/controller/scheduler/readwritegrouper.cpp b/DRAMSys/dram/src/controller/scheduler/readwritegrouper.cpp similarity index 100% rename from dram/src/controller/scheduler/readwritegrouper.cpp rename to DRAMSys/dram/src/controller/scheduler/readwritegrouper.cpp diff --git a/dram/src/controller/scheduler/readwritegrouper.h b/DRAMSys/dram/src/controller/scheduler/readwritegrouper.h similarity index 100% rename from dram/src/controller/scheduler/readwritegrouper.h rename to DRAMSys/dram/src/controller/scheduler/readwritegrouper.h diff --git a/dram/src/error/error_new.csv b/DRAMSys/dram/src/error/error_new.csv similarity index 100% rename from dram/src/error/error_new.csv rename to DRAMSys/dram/src/error/error_new.csv diff --git a/dram/src/error/flip_memory.cpp b/DRAMSys/dram/src/error/flip_memory.cpp similarity index 100% rename from dram/src/error/flip_memory.cpp rename to DRAMSys/dram/src/error/flip_memory.cpp diff --git a/dram/src/error/flip_memory.h b/DRAMSys/dram/src/error/flip_memory.h similarity index 100% rename from dram/src/error/flip_memory.h rename to DRAMSys/dram/src/error/flip_memory.h diff --git a/dram/src/error/nest_map.cpp b/DRAMSys/dram/src/error/nest_map.cpp similarity index 100% rename from dram/src/error/nest_map.cpp rename to DRAMSys/dram/src/error/nest_map.cpp diff --git a/dram/src/error/nest_map.h b/DRAMSys/dram/src/error/nest_map.h similarity index 100% rename from dram/src/error/nest_map.h rename to DRAMSys/dram/src/error/nest_map.h diff --git a/dram/src/simulation/Arbiter.h b/DRAMSys/dram/src/simulation/Arbiter.h similarity index 100% rename from dram/src/simulation/Arbiter.h rename to DRAMSys/dram/src/simulation/Arbiter.h diff --git a/dram/src/simulation/Dram.h b/DRAMSys/dram/src/simulation/Dram.h similarity index 100% rename from dram/src/simulation/Dram.h rename to DRAMSys/dram/src/simulation/Dram.h diff --git a/dram/src/simulation/MemoryManager.cpp b/DRAMSys/dram/src/simulation/MemoryManager.cpp similarity index 100% rename from dram/src/simulation/MemoryManager.cpp rename to DRAMSys/dram/src/simulation/MemoryManager.cpp diff --git a/dram/src/simulation/MemoryManager.h b/DRAMSys/dram/src/simulation/MemoryManager.h similarity index 100% rename from dram/src/simulation/MemoryManager.h rename to DRAMSys/dram/src/simulation/MemoryManager.h diff --git a/dram/src/simulation/ReorderBuffer.h b/DRAMSys/dram/src/simulation/ReorderBuffer.h similarity index 100% rename from dram/src/simulation/ReorderBuffer.h rename to DRAMSys/dram/src/simulation/ReorderBuffer.h diff --git a/dram/src/simulation/Simulation.cpp b/DRAMSys/dram/src/simulation/Simulation.cpp similarity index 100% rename from dram/src/simulation/Simulation.cpp rename to DRAMSys/dram/src/simulation/Simulation.cpp diff --git a/dram/src/simulation/Simulation.h b/DRAMSys/dram/src/simulation/Simulation.h similarity index 100% rename from dram/src/simulation/Simulation.h rename to DRAMSys/dram/src/simulation/Simulation.h diff --git a/dram/src/simulation/SimulationManager.cpp b/DRAMSys/dram/src/simulation/SimulationManager.cpp similarity index 100% rename from dram/src/simulation/SimulationManager.cpp rename to DRAMSys/dram/src/simulation/SimulationManager.cpp diff --git a/dram/src/simulation/SimulationManager.h b/DRAMSys/dram/src/simulation/SimulationManager.h similarity index 100% rename from dram/src/simulation/SimulationManager.h rename to DRAMSys/dram/src/simulation/SimulationManager.h diff --git a/dram/src/simulation/StlPlayer.h b/DRAMSys/dram/src/simulation/StlPlayer.h similarity index 100% rename from dram/src/simulation/StlPlayer.h rename to DRAMSys/dram/src/simulation/StlPlayer.h diff --git a/dram/src/simulation/TraceGenerator.h b/DRAMSys/dram/src/simulation/TraceGenerator.h similarity index 100% rename from dram/src/simulation/TraceGenerator.h rename to DRAMSys/dram/src/simulation/TraceGenerator.h diff --git a/dram/src/simulation/TracePlayer.h b/DRAMSys/dram/src/simulation/TracePlayer.h similarity index 100% rename from dram/src/simulation/TracePlayer.h rename to DRAMSys/dram/src/simulation/TracePlayer.h diff --git a/dram/src/simulation/TracePlayerListener.h b/DRAMSys/dram/src/simulation/TracePlayerListener.h similarity index 100% rename from dram/src/simulation/TracePlayerListener.h rename to DRAMSys/dram/src/simulation/TracePlayerListener.h diff --git a/dram/src/simulation/main.cpp b/DRAMSys/dram/src/simulation/main.cpp similarity index 93% rename from dram/src/simulation/main.cpp rename to DRAMSys/dram/src/simulation/main.cpp index 0c160654..7acd8a98 100644 --- a/dram/src/simulation/main.cpp +++ b/DRAMSys/dram/src/simulation/main.cpp @@ -59,14 +59,14 @@ 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("/../resources/"); + resources = pathOfFile(argv[0]) + string("/../../../DRAMSys/dram/resources/"); cout< 1) simulationToRun = argv[1]; else - simulationToRun = resources + "/simulations/sim-batch.xml"; + simulationToRun = resources + "simulations/sim-batch.xml"; SimulationManager manager(resources); manager.loadSimulationsFromXML(simulationToRun); diff --git a/dram/resources/simulations/sim-batch.xml b/dram/resources/simulations/sim-batch.xml deleted file mode 100644 index cbca3e74..00000000 --- a/dram/resources/simulations/sim-batch.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - chstone-adpcm_32.stl - - - - diff --git a/dram/src/common/third_party/tinyxml2 b/dram/src/common/third_party/tinyxml2 deleted file mode 160000 index e5e5541a..00000000 --- a/dram/src/common/third_party/tinyxml2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5e5541af6c22abb6122e82d636c1f92d33d98c5