diff --git a/.gitmodules b/.gitmodules index f33d477f..82647b71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ -[submodule "DRAMSys/simulator/src/common/third_party/tinyxml2"] - path = DRAMSys/simulator/src/common/third_party/tinyxml2 +[submodule "DRAMSys/library/src/common/third_party/tinyxml2"] + path = DRAMSys/library/src/common/third_party/tinyxml2 url = https://github.com/leethomason/tinyxml2.git -[submodule "DRAMSys/simulator/src/common/third_party/DRAMPower"] - path = DRAMSys/simulator/src/common/third_party/DRAMPower +[submodule "DRAMSys/library/src/common/third_party/DRAMPower"] + path = DRAMSys/library/src/common/third_party/DRAMPower url = https://github.com/tukl-msd/DRAMPower.git branch = master diff --git a/DRAMSys/DRAMSys.pro b/DRAMSys/DRAMSys.pro index 0852d9e4..8b03c967 100644 --- a/DRAMSys/DRAMSys.pro +++ b/DRAMSys/DRAMSys.pro @@ -11,10 +11,13 @@ $$eval(thermalsim) { message(Thermal Simulation Feature Disabled) } -SUBDIRS += simulator/library.pro -SUBDIRS += simulator/simulator.pro -SUBDIRS += analyzer/traceAnalyzer.pro +SUBDIRS += library +SUBDIRS += simulator +SUBDIRS += traceAnalyzer +library.subdir = library +simulator.subdir = simulator +traceAnalyzer.subdir = traceAnalyzer # Check if gem5 is installed: gem5 = $$(GEM5) @@ -25,11 +28,13 @@ isEmpty(gem5) { message(Gem5 Simulation Feature Enabled) message(Gem5 home is $${gem5}) DEFINES += DRAMSYS_GEM5 - SUBDIRS += gem5/gem5.pro + SUBDIRS += gem5 + gem5.subdir = gem5 + gem5.depends = library simulator } -# Build Sub Projects in the order given above -CONFIG += ordered +# Define Build Order +simulator.depends = library # Additional Files: # tests folder (DRAMSys/tests) diff --git a/DRAMSys/gem5/gem5.pro b/DRAMSys/gem5/gem5.pro index fe171ebd..32e43c2f 100644 --- a/DRAMSys/gem5/gem5.pro +++ b/DRAMSys/gem5/gem5.pro @@ -41,10 +41,10 @@ macx: { QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -O0 -g } -INCLUDEPATH += ../simulator/src/simulation/ +INCLUDEPATH += ../library/src/simulation/ INCLUDEPATH += $${systemc_home}/include -INCLUDEPATH += ../simulator/src/common/third_party/DRAMPower/src -INCLUDEPATH += ../simulator/src/common/third_party/DRAMPower/src/libdrampower +INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src +INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src/libdrampower INCLUDEPATH += $${gem5_root}/build/$${gem5_arch}/ INCLUDEPATH += $${gem5_root}/util/tlm/examples/slave_port INCLUDEPATH += $${gem5_root}/util/tlm/examples/common @@ -52,8 +52,8 @@ INCLUDEPATH += $${gem5_root}/util/tlm/src/ INCLUDEPATH += $${gem5_root}/util/systemc LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc -LIBS += ../simulator/libDRAMSys.a -LIBS += ../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/libdrampower.a +LIBS += ../library/libDRAMSys.a +LIBS += ../../DRAMSys/library/src/common/third_party/DRAMPower/src/libdrampower.a LIBS += -lsqlite3 LIBS += -L$${gem5_root}/build/$${gem5_arch} -lgem5_$${gem5_variant} diff --git a/DRAMSys/gem5/main.cpp b/DRAMSys/gem5/main.cpp index d75ef171..8a3b1222 100644 --- a/DRAMSys/gem5/main.cpp +++ b/DRAMSys/gem5/main.cpp @@ -136,7 +136,7 @@ int sc_main(int argc, char **argv) { // Get path of resources: resources = pathOfFile(argv[0]) - + string("/../../DRAMSys/simulator/resources/"); + + string("/../../DRAMSys/library/resources/"); SimulationXML = argv[1]; gem5ConfigFile = argv[2]; diff --git a/DRAMSys/simulator/library.pro b/DRAMSys/library/library.pro similarity index 98% rename from DRAMSys/simulator/library.pro rename to DRAMSys/library/library.pro index a81a8976..ad74744a 100644 --- a/DRAMSys/simulator/library.pro +++ b/DRAMSys/library/library.pro @@ -6,7 +6,7 @@ CONFIG += console CONFIG -= app_bundle CONFIG -= qt -system(cd ../../DRAMSys/simulator/src/common/third_party/DRAMPower; make src/libdrampower.a;) +system(cd ../../DRAMSys/library/src/common/third_party/DRAMPower; make src/libdrampower.a;) systemc_home = $$(SYSTEMC_HOME) isEmpty(systemc_home) { @@ -230,6 +230,5 @@ $$eval(thermalsim) { } # Additional Files: -# resources folder (DRAMSys/simulator/resources) include(resources/resources.pri) diff --git a/DRAMSys/simulator/resources/.gitignore b/DRAMSys/library/resources/.gitignore similarity index 100% rename from DRAMSys/simulator/resources/.gitignore rename to DRAMSys/library/resources/.gitignore diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_1Gbx8_p1KB_brc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_1Gbx8_p1KB_brc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_1Gbx8_p1KB_brc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_1Gbx8_p1KB_brc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_x16_brc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_brc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_x16_brc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_brc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_x16_rbc.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_rbc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_x16_rbc.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_rbc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr4.xml b/DRAMSys/library/resources/configs/amconfigs/am_ddr4.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_ddr4.xml rename to DRAMSys/library/resources/configs/amconfigs/am_ddr4.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_highHits.xml b/DRAMSys/library/resources/configs/amconfigs/am_highHits.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_highHits.xml rename to DRAMSys/library/resources/configs/amconfigs/am_highHits.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_highPara.xml b/DRAMSys/library/resources/configs/amconfigs/am_highPara.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_highPara.xml rename to DRAMSys/library/resources/configs/amconfigs/am_highPara.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_lowHits.xml b/DRAMSys/library/resources/configs/amconfigs/am_lowHits.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_lowHits.xml rename to DRAMSys/library/resources/configs/amconfigs/am_lowHits.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_lowPara.xml b/DRAMSys/library/resources/configs/amconfigs/am_lowPara.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_lowPara.xml rename to DRAMSys/library/resources/configs/amconfigs/am_lowPara.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml b/DRAMSys/library/resources/configs/amconfigs/am_wideio.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml rename to DRAMSys/library/resources/configs/amconfigs/am_wideio.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_wideioFourBanks.xml b/DRAMSys/library/resources/configs/amconfigs/am_wideioFourBanks.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/amconfigs/am_wideioFourBanks.xml rename to DRAMSys/library/resources/configs/amconfigs/am_wideioFourBanks.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/.gitignore b/DRAMSys/library/resources/configs/mcconfigs/.gitignore similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/.gitignore rename to DRAMSys/library/resources/configs/mcconfigs/.gitignore diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fifo.xml b/DRAMSys/library/resources/configs/mcconfigs/fifo.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fifo.xml rename to DRAMSys/library/resources/configs/mcconfigs/fifo.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fifoStrict.xml b/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fifoStrict.xml rename to DRAMSys/library/resources/configs/mcconfigs/fifoStrict.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fifo_ecc.xml b/DRAMSys/library/resources/configs/mcconfigs/fifo_ecc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fifo_ecc.xml rename to DRAMSys/library/resources/configs/mcconfigs/fifo_ecc.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs.xml b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs.xml rename to DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs_grp.xml b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs_grp.xml rename to DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs_rp.xml b/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_rp.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/fr_fcfs_rp.xml rename to DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_rp.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/par_bs.xml b/DRAMSys/library/resources/configs/mcconfigs/par_bs.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/mcconfigs/par_bs.xml rename to DRAMSys/library/resources/configs/mcconfigs/par_bs.xml diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml b/DRAMSys/library/resources/configs/mcconfigs/sms.xml similarity index 91% rename from DRAMSys/simulator/resources/configs/mcconfigs/sms.xml rename to DRAMSys/library/resources/configs/mcconfigs/sms.xml index e00ab19a..943023fd 100644 --- a/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml +++ b/DRAMSys/library/resources/configs/mcconfigs/sms.xml @@ -9,7 +9,7 @@ - + diff --git a/DRAMSys/simulator/resources/configs/memspecs/DDR4.xml b/DRAMSys/library/resources/configs/memspecs/DDR4.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/DDR4.xml rename to DRAMSys/library/resources/configs/memspecs/DDR4.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml b/DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml rename to DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml b/DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml rename to DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml b/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml rename to DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO-short.xml b/DRAMSys/library/resources/configs/memspecs/MatzesWideIO-short.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO-short.xml rename to DRAMSys/library/resources/configs/memspecs/MatzesWideIO-short.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO.xml b/DRAMSys/library/resources/configs/memspecs/MatzesWideIO.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/MatzesWideIO.xml rename to DRAMSys/library/resources/configs/memspecs/MatzesWideIO.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.xml b/DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.xml rename to DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.xml b/DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.xml rename to DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/memspec.dtd b/DRAMSys/library/resources/configs/memspecs/memspec.dtd similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/memspec.dtd rename to DRAMSys/library/resources/configs/memspecs/memspec.dtd diff --git a/DRAMSys/simulator/resources/configs/memspecs/wideio.xml b/DRAMSys/library/resources/configs/memspecs/wideio.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/wideio.xml rename to DRAMSys/library/resources/configs/memspecs/wideio.xml diff --git a/DRAMSys/simulator/resources/configs/memspecs/wideio_less_refresh.xml b/DRAMSys/library/resources/configs/memspecs/wideio_less_refresh.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/memspecs/wideio_less_refresh.xml rename to DRAMSys/library/resources/configs/memspecs/wideio_less_refresh.xml diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml b/DRAMSys/library/resources/configs/simulator/ddr3-single-device.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml rename to DRAMSys/library/resources/configs/simulator/ddr3-single-device.xml diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml b/DRAMSys/library/resources/configs/simulator/ddr3.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/simulator/ddr3.xml rename to DRAMSys/library/resources/configs/simulator/ddr3.xml diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml b/DRAMSys/library/resources/configs/simulator/ddr3_ecc.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml rename to DRAMSys/library/resources/configs/simulator/ddr3_ecc.xml diff --git a/DRAMSys/simulator/resources/configs/simulator/sms.xml b/DRAMSys/library/resources/configs/simulator/sms.xml similarity index 100% rename from DRAMSys/simulator/resources/configs/simulator/sms.xml rename to DRAMSys/library/resources/configs/simulator/sms.xml diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio.xml b/DRAMSys/library/resources/configs/simulator/wideio.xml similarity index 89% rename from DRAMSys/simulator/resources/configs/simulator/wideio.xml rename to DRAMSys/library/resources/configs/simulator/wideio.xml index 34c328c3..e3dc24df 100644 --- a/DRAMSys/simulator/resources/configs/simulator/wideio.xml +++ b/DRAMSys/library/resources/configs/simulator/wideio.xml @@ -12,7 +12,7 @@ - + - + - ddr3_example.stl + ip1.stl + ip2.stl + ip3.stl + ip4.stl + ip5.stl + ip6.stl + ip7.stl + ip8.stl + ip9.stl + ip10.stl diff --git a/DRAMSys/simulator/resources/simulations/ddr3-single-device.xml b/DRAMSys/library/resources/simulations/ddr3-single-device.xml similarity index 100% rename from DRAMSys/simulator/resources/simulations/ddr3-single-device.xml rename to DRAMSys/library/resources/simulations/ddr3-single-device.xml diff --git a/DRAMSys/simulator/resources/simulations/ddr3_postpone_ref_test.xml b/DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.xml similarity index 100% rename from DRAMSys/simulator/resources/simulations/ddr3_postpone_ref_test.xml rename to DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.xml diff --git a/DRAMSys/simulator/resources/simulations/sms-example.xml b/DRAMSys/library/resources/simulations/sms-example.xml similarity index 100% rename from DRAMSys/simulator/resources/simulations/sms-example.xml rename to DRAMSys/library/resources/simulations/sms-example.xml diff --git a/DRAMSys/simulator/resources/simulations/wideio-ecc.xml b/DRAMSys/library/resources/simulations/wideio-ecc.xml similarity index 100% rename from DRAMSys/simulator/resources/simulations/wideio-ecc.xml rename to DRAMSys/library/resources/simulations/wideio-ecc.xml diff --git a/DRAMSys/simulator/resources/simulations/wideio-example.xml b/DRAMSys/library/resources/simulations/wideio-example.xml similarity index 100% rename from DRAMSys/simulator/resources/simulations/wideio-example.xml rename to DRAMSys/library/resources/simulations/wideio-example.xml diff --git a/DRAMSys/simulator/resources/traces/prettyTest b/DRAMSys/library/resources/traces/prettyTest similarity index 100% rename from DRAMSys/simulator/resources/traces/prettyTest rename to DRAMSys/library/resources/traces/prettyTest diff --git a/DRAMSys/simulator/src/common/DebugManager.cpp b/DRAMSys/library/src/common/DebugManager.cpp similarity index 100% rename from DRAMSys/simulator/src/common/DebugManager.cpp rename to DRAMSys/library/src/common/DebugManager.cpp diff --git a/DRAMSys/simulator/src/common/DebugManager.h b/DRAMSys/library/src/common/DebugManager.h similarity index 100% rename from DRAMSys/simulator/src/common/DebugManager.h rename to DRAMSys/library/src/common/DebugManager.h diff --git a/DRAMSys/simulator/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp similarity index 100% rename from DRAMSys/simulator/src/common/TlmRecorder.cpp rename to DRAMSys/library/src/common/TlmRecorder.cpp diff --git a/DRAMSys/simulator/src/common/TlmRecorder.h b/DRAMSys/library/src/common/TlmRecorder.h similarity index 100% rename from DRAMSys/simulator/src/common/TlmRecorder.h rename to DRAMSys/library/src/common/TlmRecorder.h diff --git a/DRAMSys/simulator/src/common/Utils.cpp b/DRAMSys/library/src/common/Utils.cpp similarity index 100% rename from DRAMSys/simulator/src/common/Utils.cpp rename to DRAMSys/library/src/common/Utils.cpp diff --git a/DRAMSys/simulator/src/common/Utils.h b/DRAMSys/library/src/common/Utils.h similarity index 100% rename from DRAMSys/simulator/src/common/Utils.h rename to DRAMSys/library/src/common/Utils.h diff --git a/DRAMSys/simulator/src/common/dramExtension.cpp b/DRAMSys/library/src/common/dramExtension.cpp similarity index 100% rename from DRAMSys/simulator/src/common/dramExtension.cpp rename to DRAMSys/library/src/common/dramExtension.cpp diff --git a/DRAMSys/simulator/src/common/dramExtension.h b/DRAMSys/library/src/common/dramExtension.h similarity index 100% rename from DRAMSys/simulator/src/common/dramExtension.h rename to DRAMSys/library/src/common/dramExtension.h diff --git a/DRAMSys/simulator/src/common/protocol.h b/DRAMSys/library/src/common/protocol.h similarity index 100% rename from DRAMSys/simulator/src/common/protocol.h rename to DRAMSys/library/src/common/protocol.h diff --git a/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h b/DRAMSys/library/src/common/tlm2_base_protocol_checker.h similarity index 100% rename from DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h rename to DRAMSys/library/src/common/tlm2_base_protocol_checker.h diff --git a/DRAMSys/simulator/src/common/xmlAddressdecoder.cpp b/DRAMSys/library/src/common/xmlAddressdecoder.cpp similarity index 100% rename from DRAMSys/simulator/src/common/xmlAddressdecoder.cpp rename to DRAMSys/library/src/common/xmlAddressdecoder.cpp diff --git a/DRAMSys/simulator/src/common/xmlAddressdecoder.h b/DRAMSys/library/src/common/xmlAddressdecoder.h similarity index 100% rename from DRAMSys/simulator/src/common/xmlAddressdecoder.h rename to DRAMSys/library/src/common/xmlAddressdecoder.h diff --git a/DRAMSys/simulator/src/controller/Command.cpp b/DRAMSys/library/src/controller/Command.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/Command.cpp rename to DRAMSys/library/src/controller/Command.cpp diff --git a/DRAMSys/simulator/src/controller/Command.h b/DRAMSys/library/src/controller/Command.h similarity index 100% rename from DRAMSys/simulator/src/controller/Command.h rename to DRAMSys/library/src/controller/Command.h diff --git a/DRAMSys/simulator/src/controller/Controller.cpp b/DRAMSys/library/src/controller/Controller.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/Controller.cpp rename to DRAMSys/library/src/controller/Controller.cpp diff --git a/DRAMSys/simulator/src/controller/Controller.h b/DRAMSys/library/src/controller/Controller.h similarity index 100% rename from DRAMSys/simulator/src/controller/Controller.h rename to DRAMSys/library/src/controller/Controller.h diff --git a/DRAMSys/simulator/src/controller/ControllerState.cpp b/DRAMSys/library/src/controller/ControllerState.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/ControllerState.cpp rename to DRAMSys/library/src/controller/ControllerState.cpp diff --git a/DRAMSys/simulator/src/controller/ControllerState.h b/DRAMSys/library/src/controller/ControllerState.h similarity index 100% rename from DRAMSys/simulator/src/controller/ControllerState.h rename to DRAMSys/library/src/controller/ControllerState.h diff --git a/DRAMSys/simulator/src/controller/IController.h b/DRAMSys/library/src/controller/IController.h similarity index 100% rename from DRAMSys/simulator/src/controller/IController.h rename to DRAMSys/library/src/controller/IController.h diff --git a/DRAMSys/simulator/src/controller/RowBufferStates.cpp b/DRAMSys/library/src/controller/RowBufferStates.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/RowBufferStates.cpp rename to DRAMSys/library/src/controller/RowBufferStates.cpp diff --git a/DRAMSys/simulator/src/controller/RowBufferStates.h b/DRAMSys/library/src/controller/RowBufferStates.h similarity index 100% rename from DRAMSys/simulator/src/controller/RowBufferStates.h rename to DRAMSys/library/src/controller/RowBufferStates.h diff --git a/DRAMSys/simulator/src/controller/core/ControllerCore.cpp b/DRAMSys/library/src/controller/core/ControllerCore.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/ControllerCore.cpp rename to DRAMSys/library/src/controller/core/ControllerCore.cpp diff --git a/DRAMSys/simulator/src/controller/core/ControllerCore.h b/DRAMSys/library/src/controller/core/ControllerCore.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/ControllerCore.h rename to DRAMSys/library/src/controller/core/ControllerCore.h diff --git a/DRAMSys/simulator/src/controller/core/Slots.cpp b/DRAMSys/library/src/controller/core/Slots.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/Slots.cpp rename to DRAMSys/library/src/controller/core/Slots.cpp diff --git a/DRAMSys/simulator/src/controller/core/Slots.h b/DRAMSys/library/src/controller/core/Slots.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/Slots.h rename to DRAMSys/library/src/controller/core/Slots.h diff --git a/DRAMSys/simulator/src/controller/core/TimingCalculation.cpp b/DRAMSys/library/src/controller/core/TimingCalculation.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/TimingCalculation.cpp rename to DRAMSys/library/src/controller/core/TimingCalculation.cpp diff --git a/DRAMSys/simulator/src/controller/core/TimingCalculation.h b/DRAMSys/library/src/controller/core/TimingCalculation.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/TimingCalculation.h rename to DRAMSys/library/src/controller/core/TimingCalculation.h diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/library/src/controller/core/configuration/Configuration.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp rename to DRAMSys/library/src/controller/core/configuration/Configuration.cpp diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h b/DRAMSys/library/src/controller/core/configuration/Configuration.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/configuration/Configuration.h rename to DRAMSys/library/src/controller/core/configuration/Configuration.h diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp similarity index 79% rename from DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp rename to DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp index beee8c9d..7388d2e0 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp +++ b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp @@ -111,6 +111,8 @@ void ConfigurationLoader::loadMemSpec(Configuration& config, XMLElement* memspec config.memSpec.MemoryId = queryStringParameter(memspec, "memoryId"); config.memSpec.MemoryType = queryStringParameter(memspec, "memoryType"); + std::cout << "Memtype: " << config.memSpec.MemoryType << std::endl; + if (config.memSpec.MemoryType == "DDR4") { loadDDR4(config, memspec); @@ -119,6 +121,10 @@ void ConfigurationLoader::loadMemSpec(Configuration& config, XMLElement* memspec { loadDDR3(config, memspec); } + else if (config.memSpec.MemoryType == "LPDDR4") + { + loadLPDDR4(config, memspec); + } else if (config.memSpec.MemoryType == "WIDEIO_SDR") { loadWideIO(config, memspec); @@ -303,6 +309,83 @@ void ConfigurationLoader::loadDDR4(Configuration& config, XMLElement* memspec) config.memSpec.vDD2 = queryDoubleParameter(powers, "vdd2"); } +// TODO: fix this for LPDDR4 +void ConfigurationLoader::loadLPDDR4(Configuration& config, XMLElement* memspec) +{ + //MemArchitecture: + XMLElement* architecture = memspec->FirstChildElement("memarchitecturespec"); + + config.memSpec.NumberOfBanks = queryUIntParameter(architecture, "nbrOfBanks"); + config.memSpec.NumberOfBankGroups = 1; + config.memSpec.NumberOfRanks = queryUIntParameter(architecture, "nbrOfRanks"); + config.memSpec.BurstLength = queryUIntParameter(architecture, "burstLength"); + config.memSpec.nActivate = 4; + config.memSpec.DataRate = queryUIntParameter(architecture, "dataRate"); + config.memSpec.NumberOfRows = queryUIntParameter(architecture, "nbrOfRows"); + config.memSpec.NumberOfColumns = queryUIntParameter(architecture, "nbrOfColumns"); + config.memSpec.bitWidth = queryUIntParameter(architecture, "width"); + config.memSpec.DLL = false; // TODO: Correct? + config.memSpec.termination = true; // TODO: Correct? + + //MemTimings + XMLElement* timings = memspec->FirstChildElement("memtimingspec"); + double clkMhz = queryDoubleParameter(timings, "clkMhz"); + config.memSpec.clk = FrequencyToClk(clkMhz); + sc_time clk = config.memSpec.clk; + config.memSpec.tRP = clk * queryUIntParameter(timings, "RPPB"); + config.memSpec.tRPAB = clk * queryUIntParameter(timings, "RPAB"); + config.memSpec.tRAS = clk * queryUIntParameter(timings, "RAS"); + config.memSpec.tRC = clk * queryUIntParameter(timings, "RC"); + config.memSpec.tRTP = clk * queryUIntParameter(timings, "RTP"); + config.memSpec.tRRD_S = clk * queryUIntParameter(timings, "RRD"); + config.memSpec.tRRD_L = clk * queryUIntParameter(timings, "RRD"); + config.memSpec.tCCD_S = clk * queryUIntParameter(timings, "CCD"); + config.memSpec.tCCD_L = clk * queryUIntParameter(timings, "CCD"); + config.memSpec.tRCD = clk * queryUIntParameter(timings, "RCD"); + config.memSpec.tNAW = clk * queryUIntParameter(timings, "FAW"); + config.memSpec.tRL = clk * queryUIntParameter(timings, "RL"); + config.memSpec.tWL = clk * queryUIntParameter(timings, "WL"); + config.memSpec.tWR = clk * queryUIntParameter(timings, "WR"); + config.memSpec.tWTR_S = clk * queryUIntParameter(timings, "WTR"); + config.memSpec.tWTR_L = clk * queryUIntParameter(timings, "WTR"); + config.memSpec.tCKESR = clk * queryUIntParameter(timings, "CKESR"); + config.memSpec.tCKE = clk * queryUIntParameter(timings, "CKE"); + config.memSpec.tXP = clk * queryUIntParameter(timings, "XP"); + config.memSpec.tXPDLL = clk * queryUIntParameter(timings, "XP"); + config.memSpec.tXSR = clk * queryUIntParameter(timings, "XS"); + config.memSpec.tXSRDLL = clk * queryUIntParameter(timings, "XS"); + config.memSpec.tAL = clk * queryUIntParameter(timings, "AL"); + config.memSpec.tRFC = clk * queryUIntParameter(timings, "RFCAB"); + // TODO: config.memSpec.tRFCPB = clk * queryUIntParameter(timings, "RFCPB"); + config.memSpec.tREFI = clk * queryUIntParameter(timings, "REFIAB"); + // TODO: config.memSpec.tREFIPB = clk * queryUIntParameter(timings, "RFCPB"); + config.memSpec.tDQSCK = clk * queryUIntParameter(timings, "DQSCK"); + + config.memSpec.refreshTimings.clear(); + for (unsigned int i = 0; i < config.memSpec.NumberOfBanks; ++i) + { + config.memSpec.refreshTimings[Bank(i)] = RefreshTiming(config.memSpec.tRFC, config.memSpec.tREFI); + } + + // Currents and Volatages: + XMLElement* powers = memspec->FirstChildElement("mempowerspec"); + config.memSpec.iDD0 = queryDoubleParameter(powers, "idd0"); + config.memSpec.iDD02 = queryDoubleParameter(powers, "idd02"); + config.memSpec.iDD2P0 = queryDoubleParameter(powers, "idd2p"); + config.memSpec.iDD2P1 = queryDoubleParameter(powers, "idd2p2"); + config.memSpec.iDD2N = queryDoubleParameter(powers, "idd2n"); + config.memSpec.iDD3P0 = queryDoubleParameter(powers, "idd3p"); + config.memSpec.iDD3P1 = queryDoubleParameter(powers, "idd3p2"); + config.memSpec.iDD3N = queryDoubleParameter(powers, "idd3n"); + config.memSpec.iDD4R = queryDoubleParameter(powers, "idd4r"); + config.memSpec.iDD4W = queryDoubleParameter(powers, "idd4w"); + config.memSpec.iDD5 = queryDoubleParameter(powers, "idd5"); + config.memSpec.iDD6 = queryDoubleParameter(powers, "idd6"); + config.memSpec.iDD62 = queryDoubleParameter(powers, "idd62"); + config.memSpec.vDD = queryDoubleParameter(powers, "vdd"); + config.memSpec.vDD2 = queryDoubleParameter(powers, "vdd2"); +} + void ConfigurationLoader::loadWideIO(Configuration& config, XMLElement* memspec) { //MemSpecification diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h similarity index 97% rename from DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h rename to DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h index d9cf1bc8..309b25f8 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.h +++ b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h @@ -65,6 +65,7 @@ private: //specific loader static void loadDDR3(Configuration& config, tinyxml2::XMLElement* memspec); static void loadDDR4(Configuration& config, tinyxml2::XMLElement* memspec); + static void loadLPDDR4(Configuration& config, tinyxml2::XMLElement* memspec); static void loadWideIO(Configuration& config, tinyxml2::XMLElement* memspec); }; diff --git a/DRAMSys/simulator/src/controller/core/configuration/MemSpec.h b/DRAMSys/library/src/controller/core/configuration/MemSpec.h similarity index 97% rename from DRAMSys/simulator/src/controller/core/configuration/MemSpec.h rename to DRAMSys/library/src/controller/core/configuration/MemSpec.h index dc93bec2..a14f2b57 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/MemSpec.h +++ b/DRAMSys/library/src/controller/core/configuration/MemSpec.h @@ -89,7 +89,8 @@ struct MemSpec // Memspec Variables: sc_time clk; sc_time tRP; //precharge-time (pre -> act same bank) - sc_time tRAS; //active-time (act -> pre same bank) + sc_time tRPAB; //precharge-all time only for LPDDR4 + sc_time tRAS; //active-time (act -> pre same bank) sc_time tRC; //RAS-cycle-time (min time bw 2 succesive ACT to same bank) sc_time tCCD_S; //max(bl, tCCD) is relevant for rd->rd sc_time tCCD_L; diff --git a/DRAMSys/simulator/src/controller/core/configuration/thermalSimConfig.h b/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/configuration/thermalSimConfig.h rename to DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/IPowerDownManager.h b/DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/IPowerDownManager.h rename to DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.cpp b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.cpp rename to DRAMSys/library/src/controller/core/powerdown/NoPowerDown.cpp diff --git a/DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/NoPowerDown.h rename to DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.cpp rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManager.h rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.cpp rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerBankwise.h rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.cpp rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp diff --git a/DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h rename to DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h diff --git a/DRAMSys/simulator/src/controller/core/refresh/IRefreshManager.h b/DRAMSys/library/src/controller/core/refresh/IRefreshManager.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/refresh/IRefreshManager.h rename to DRAMSys/library/src/controller/core/refresh/IRefreshManager.h diff --git a/DRAMSys/simulator/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/refresh/RefreshManager.cpp rename to DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp diff --git a/DRAMSys/simulator/src/controller/core/refresh/RefreshManager.h b/DRAMSys/library/src/controller/core/refresh/RefreshManager.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/refresh/RefreshManager.h rename to DRAMSys/library/src/controller/core/refresh/RefreshManager.h diff --git a/DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.cpp rename to DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp diff --git a/DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/refresh/RefreshManagerBankwise.h rename to DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.cpp rename to DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/ScheduledCommand.h rename to DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/Trigger.h b/DRAMSys/library/src/controller/core/scheduling/Trigger.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/Trigger.h rename to DRAMSys/library/src/controller/core/scheduling/Trigger.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/ActivateChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/ICommandChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/ICommandChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PowerDownChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeAllChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/PrechargeChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/ReadChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/RefreshChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.cpp rename to DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp diff --git a/DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h similarity index 100% rename from DRAMSys/simulator/src/controller/core/scheduling/checker/WriteChecker.h rename to DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h diff --git a/DRAMSys/simulator/src/controller/scheduler/Fifo.cpp b/DRAMSys/library/src/controller/scheduler/Fifo.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fifo.cpp rename to DRAMSys/library/src/controller/scheduler/Fifo.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/Fifo.h b/DRAMSys/library/src/controller/scheduler/Fifo.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fifo.h rename to DRAMSys/library/src/controller/scheduler/Fifo.h diff --git a/DRAMSys/simulator/src/controller/scheduler/FifoStrict.cpp b/DRAMSys/library/src/controller/scheduler/FifoStrict.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/FifoStrict.cpp rename to DRAMSys/library/src/controller/scheduler/FifoStrict.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/FifoStrict.h b/DRAMSys/library/src/controller/scheduler/FifoStrict.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/FifoStrict.h rename to DRAMSys/library/src/controller/scheduler/FifoStrict.h diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.cpp b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.cpp rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.h b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs.h rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs.h diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_grouper.cpp b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_grouper.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_grouper.cpp rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs_grouper.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_grouper.h b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_grouper.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_grouper.h rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs_grouper.h diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_read_priority.cpp b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_read_priority.cpp rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_read_priority.h b/DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/Fr_Fcfs_read_priority.h rename to DRAMSys/library/src/controller/scheduler/Fr_Fcfs_read_priority.h diff --git a/DRAMSys/simulator/src/controller/scheduler/IScheduler.cpp b/DRAMSys/library/src/controller/scheduler/IScheduler.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/IScheduler.cpp rename to DRAMSys/library/src/controller/scheduler/IScheduler.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/IScheduler.h b/DRAMSys/library/src/controller/scheduler/IScheduler.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/IScheduler.h rename to DRAMSys/library/src/controller/scheduler/IScheduler.h diff --git a/DRAMSys/simulator/src/controller/scheduler/PARBS.cpp b/DRAMSys/library/src/controller/scheduler/PARBS.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/PARBS.cpp rename to DRAMSys/library/src/controller/scheduler/PARBS.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/PARBS.h b/DRAMSys/library/src/controller/scheduler/PARBS.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/PARBS.h rename to DRAMSys/library/src/controller/scheduler/PARBS.h diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp b/DRAMSys/library/src/controller/scheduler/SMS.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/SMS.cpp rename to DRAMSys/library/src/controller/scheduler/SMS.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.h b/DRAMSys/library/src/controller/scheduler/SMS.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/SMS.h rename to DRAMSys/library/src/controller/scheduler/SMS.h diff --git a/DRAMSys/simulator/src/controller/scheduler/ThreadLoad.cpp b/DRAMSys/library/src/controller/scheduler/ThreadLoad.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/ThreadLoad.cpp rename to DRAMSys/library/src/controller/scheduler/ThreadLoad.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/ThreadLoad.h b/DRAMSys/library/src/controller/scheduler/ThreadLoad.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/ThreadLoad.h rename to DRAMSys/library/src/controller/scheduler/ThreadLoad.h diff --git a/DRAMSys/simulator/src/controller/scheduler/readwritegrouper.cpp b/DRAMSys/library/src/controller/scheduler/readwritegrouper.cpp similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/readwritegrouper.cpp rename to DRAMSys/library/src/controller/scheduler/readwritegrouper.cpp diff --git a/DRAMSys/simulator/src/controller/scheduler/readwritegrouper.h b/DRAMSys/library/src/controller/scheduler/readwritegrouper.h similarity index 100% rename from DRAMSys/simulator/src/controller/scheduler/readwritegrouper.h rename to DRAMSys/library/src/controller/scheduler/readwritegrouper.h diff --git a/DRAMSys/simulator/src/error/ECC/Bit.cpp b/DRAMSys/library/src/error/ECC/Bit.cpp similarity index 100% rename from DRAMSys/simulator/src/error/ECC/Bit.cpp rename to DRAMSys/library/src/error/ECC/Bit.cpp diff --git a/DRAMSys/simulator/src/error/ECC/Bit.h b/DRAMSys/library/src/error/ECC/Bit.h similarity index 100% rename from DRAMSys/simulator/src/error/ECC/Bit.h rename to DRAMSys/library/src/error/ECC/Bit.h diff --git a/DRAMSys/simulator/src/error/ECC/ECC.cpp b/DRAMSys/library/src/error/ECC/ECC.cpp similarity index 100% rename from DRAMSys/simulator/src/error/ECC/ECC.cpp rename to DRAMSys/library/src/error/ECC/ECC.cpp diff --git a/DRAMSys/simulator/src/error/ECC/ECC.h b/DRAMSys/library/src/error/ECC/ECC.h similarity index 100% rename from DRAMSys/simulator/src/error/ECC/ECC.h rename to DRAMSys/library/src/error/ECC/ECC.h diff --git a/DRAMSys/simulator/src/error/ECC/ECC_Test.cpp b/DRAMSys/library/src/error/ECC/ECC_Test.cpp similarity index 100% rename from DRAMSys/simulator/src/error/ECC/ECC_Test.cpp rename to DRAMSys/library/src/error/ECC/ECC_Test.cpp diff --git a/DRAMSys/simulator/src/error/ECC/Word.cpp b/DRAMSys/library/src/error/ECC/Word.cpp similarity index 100% rename from DRAMSys/simulator/src/error/ECC/Word.cpp rename to DRAMSys/library/src/error/ECC/Word.cpp diff --git a/DRAMSys/simulator/src/error/ECC/Word.h b/DRAMSys/library/src/error/ECC/Word.h similarity index 100% rename from DRAMSys/simulator/src/error/ECC/Word.h rename to DRAMSys/library/src/error/ECC/Word.h diff --git a/DRAMSys/simulator/src/error/eccbaseclass.cpp b/DRAMSys/library/src/error/eccbaseclass.cpp similarity index 100% rename from DRAMSys/simulator/src/error/eccbaseclass.cpp rename to DRAMSys/library/src/error/eccbaseclass.cpp diff --git a/DRAMSys/simulator/src/error/eccbaseclass.h b/DRAMSys/library/src/error/eccbaseclass.h similarity index 100% rename from DRAMSys/simulator/src/error/eccbaseclass.h rename to DRAMSys/library/src/error/eccbaseclass.h diff --git a/DRAMSys/simulator/src/error/ecchamming.cpp b/DRAMSys/library/src/error/ecchamming.cpp similarity index 100% rename from DRAMSys/simulator/src/error/ecchamming.cpp rename to DRAMSys/library/src/error/ecchamming.cpp diff --git a/DRAMSys/simulator/src/error/ecchamming.h b/DRAMSys/library/src/error/ecchamming.h similarity index 100% rename from DRAMSys/simulator/src/error/ecchamming.h rename to DRAMSys/library/src/error/ecchamming.h diff --git a/DRAMSys/simulator/src/error/errormodel.cpp b/DRAMSys/library/src/error/errormodel.cpp similarity index 100% rename from DRAMSys/simulator/src/error/errormodel.cpp rename to DRAMSys/library/src/error/errormodel.cpp diff --git a/DRAMSys/simulator/src/error/errormodel.h b/DRAMSys/library/src/error/errormodel.h similarity index 100% rename from DRAMSys/simulator/src/error/errormodel.h rename to DRAMSys/library/src/error/errormodel.h diff --git a/DRAMSys/simulator/src/simulation/Arbiter.h b/DRAMSys/library/src/simulation/Arbiter.h similarity index 100% rename from DRAMSys/simulator/src/simulation/Arbiter.h rename to DRAMSys/library/src/simulation/Arbiter.h diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/DRAMSys.cpp rename to DRAMSys/library/src/simulation/DRAMSys.cpp diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.h b/DRAMSys/library/src/simulation/DRAMSys.h similarity index 100% rename from DRAMSys/simulator/src/simulation/DRAMSys.h rename to DRAMSys/library/src/simulation/DRAMSys.h diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/library/src/simulation/Dram.h similarity index 100% rename from DRAMSys/simulator/src/simulation/Dram.h rename to DRAMSys/library/src/simulation/Dram.h diff --git a/DRAMSys/simulator/src/simulation/ExampleInitiator.h b/DRAMSys/library/src/simulation/ExampleInitiator.h similarity index 100% rename from DRAMSys/simulator/src/simulation/ExampleInitiator.h rename to DRAMSys/library/src/simulation/ExampleInitiator.h diff --git a/DRAMSys/simulator/src/simulation/MemoryManager.cpp b/DRAMSys/library/src/simulation/MemoryManager.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/MemoryManager.cpp rename to DRAMSys/library/src/simulation/MemoryManager.cpp diff --git a/DRAMSys/simulator/src/simulation/MemoryManager.h b/DRAMSys/library/src/simulation/MemoryManager.h similarity index 100% rename from DRAMSys/simulator/src/simulation/MemoryManager.h rename to DRAMSys/library/src/simulation/MemoryManager.h diff --git a/DRAMSys/simulator/src/simulation/ReorderBuffer.h b/DRAMSys/library/src/simulation/ReorderBuffer.h similarity index 100% rename from DRAMSys/simulator/src/simulation/ReorderBuffer.h rename to DRAMSys/library/src/simulation/ReorderBuffer.h diff --git a/DRAMSys/simulator/src/simulation/Setup.cpp b/DRAMSys/library/src/simulation/Setup.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/Setup.cpp rename to DRAMSys/library/src/simulation/Setup.cpp diff --git a/DRAMSys/simulator/src/simulation/Setup.h b/DRAMSys/library/src/simulation/Setup.h similarity index 100% rename from DRAMSys/simulator/src/simulation/Setup.h rename to DRAMSys/library/src/simulation/Setup.h diff --git a/DRAMSys/simulator/src/simulation/StlPlayer.cpp b/DRAMSys/library/src/simulation/StlPlayer.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/StlPlayer.cpp rename to DRAMSys/library/src/simulation/StlPlayer.cpp diff --git a/DRAMSys/simulator/src/simulation/StlPlayer.h b/DRAMSys/library/src/simulation/StlPlayer.h similarity index 100% rename from DRAMSys/simulator/src/simulation/StlPlayer.h rename to DRAMSys/library/src/simulation/StlPlayer.h diff --git a/DRAMSys/simulator/src/simulation/TemperatureController.cpp b/DRAMSys/library/src/simulation/TemperatureController.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/TemperatureController.cpp rename to DRAMSys/library/src/simulation/TemperatureController.cpp diff --git a/DRAMSys/simulator/src/simulation/TemperatureController.h b/DRAMSys/library/src/simulation/TemperatureController.h similarity index 100% rename from DRAMSys/simulator/src/simulation/TemperatureController.h rename to DRAMSys/library/src/simulation/TemperatureController.h diff --git a/DRAMSys/simulator/src/simulation/TraceGenerator.h b/DRAMSys/library/src/simulation/TraceGenerator.h similarity index 100% rename from DRAMSys/simulator/src/simulation/TraceGenerator.h rename to DRAMSys/library/src/simulation/TraceGenerator.h diff --git a/DRAMSys/simulator/src/simulation/TracePlayer.cpp b/DRAMSys/library/src/simulation/TracePlayer.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/TracePlayer.cpp rename to DRAMSys/library/src/simulation/TracePlayer.cpp diff --git a/DRAMSys/simulator/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h similarity index 100% rename from DRAMSys/simulator/src/simulation/TracePlayer.h rename to DRAMSys/library/src/simulation/TracePlayer.h diff --git a/DRAMSys/simulator/src/simulation/TracePlayerListener.h b/DRAMSys/library/src/simulation/TracePlayerListener.h similarity index 100% rename from DRAMSys/simulator/src/simulation/TracePlayerListener.h rename to DRAMSys/library/src/simulation/TracePlayerListener.h diff --git a/DRAMSys/simulator/src/simulation/TraceSetup.cpp b/DRAMSys/library/src/simulation/TraceSetup.cpp similarity index 100% rename from DRAMSys/simulator/src/simulation/TraceSetup.cpp rename to DRAMSys/library/src/simulation/TraceSetup.cpp diff --git a/DRAMSys/simulator/src/simulation/TraceSetup.h b/DRAMSys/library/src/simulation/TraceSetup.h similarity index 100% rename from DRAMSys/simulator/src/simulation/TraceSetup.h rename to DRAMSys/library/src/simulation/TraceSetup.h diff --git a/DRAMSys/simulator/src/simulation/main.cpp b/DRAMSys/simulator/main.cpp similarity index 98% rename from DRAMSys/simulator/src/simulation/main.cpp rename to DRAMSys/simulator/main.cpp index 60246caf..43fea800 100644 --- a/DRAMSys/simulator/src/simulation/main.cpp +++ b/DRAMSys/simulator/main.cpp @@ -63,7 +63,7 @@ int sc_main(int argc, char **argv) // Get path of resources: resources = pathOfFile(argv[0]) - + string("/../../DRAMSys/simulator/resources/"); + + string("/../../DRAMSys/library/resources/"); string SimulationXML; if(argc > 1) diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example2.xml b/DRAMSys/simulator/resources/simulations/ddr3-example2.xml deleted file mode 100644 index 6a585d1a..00000000 --- a/DRAMSys/simulator/resources/simulations/ddr3-example2.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - ddr3_example.stl - ddr3_example.stl - - diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro index b95f4256..a3c21141 100644 --- a/DRAMSys/simulator/simulator.pro +++ b/DRAMSys/simulator/simulator.pro @@ -36,14 +36,16 @@ macx: { QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -O0 -g } -INCLUDEPATH += src/simulation/ +INCLUDEPATH += ../library/src/simulation/ INCLUDEPATH += $${systemc_home}/include -INCLUDEPATH += src/common/third_party/DRAMPower/src -INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower +INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src +INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src/libdrampower LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc -LIBS += libDRAMSys.a -LIBS += ../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/libdrampower.a +LIBS += ../library/libDRAMSys.a +LIBS += ../../DRAMSys/library/src/common/third_party/DRAMPower/src/libdrampower.a LIBS += -lsqlite3 -SOURCES += src/simulation/main.cpp +PRE_TARGETDEPS += ../library/libDRAMSys.a + +SOURCES += main.cpp diff --git a/DRAMSys/simulator/src/common/third_party/DRAMPower b/DRAMSys/simulator/src/common/third_party/DRAMPower deleted file mode 160000 index abcdd018..00000000 --- a/DRAMSys/simulator/src/common/third_party/DRAMPower +++ /dev/null @@ -1 +0,0 @@ -Subproject commit abcdd0184e846fcf033ca82af9b559341d840d97 diff --git a/DRAMSys/simulator/src/common/third_party/tinyxml2 b/DRAMSys/simulator/src/common/third_party/tinyxml2 deleted file mode 160000 index 78fca3db..00000000 --- a/DRAMSys/simulator/src/common/third_party/tinyxml2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 78fca3db835a5e2de1f3e90f5c6362dda750e3ac diff --git a/DRAMSys/simulator/src/controller/core/configuration/MemSpecLoader.h.autosave b/DRAMSys/simulator/src/controller/core/configuration/MemSpecLoader.h.autosave deleted file mode 100644 index d4027880..00000000 --- a/DRAMSys/simulator/src/controller/core/configuration/MemSpecLoader.h.autosave +++ /dev/null @@ -1,33 +0,0 @@ -/* - * MemSpecLoader.h - * - * Created on: Apr 7, 2014 - * Author: jonny - */ - -#ifndef MEMSPECLOADER_H_ -#define MEMSPECLOADER_H_ - -#include -#include "../../../common/third_party/tinyxml2.h" -#include "../../../common/Utils.h" -#include "Configuration.h" - -namespace core { - -class MemSpecLoader -{ -public: - //void loadConfiguration(Configuration& config, std::string memspecUri, std::string memconfigUri); - static void loadMemConfig(std::string memconfigUri); - static void loadMemConfig(XMLElement* memconfig); -private: - //void loadMemConfig(Configuration& config, tinyxml2::XMLElement* memspec); - //void loadMemSpec(Configuration& config, tinyxml2::XMLElement* memspec); - //void loadDDR4(Configuration& config, tinyxml2::XMLElement* memspec); - //void loadWideIO(Configuration& config, tinyxml2::XMLElement* memspec); -}; - -} /* namespace core */ - -#endif /* MEMSPECLOADER_H_ */ diff --git a/DRAMSys/tests/TLM_compliance/fifoStrict.xml b/DRAMSys/tests/TLM_compliance/fifoStrict.xml index dc5126eb..d5814755 100644 --- a/DRAMSys/tests/TLM_compliance/fifoStrict.xml +++ b/DRAMSys/tests/TLM_compliance/fifoStrict.xml @@ -8,7 +8,7 @@ - + diff --git a/DRAMSys/tests/TLM_compliance/sim-batch.xml b/DRAMSys/tests/TLM_compliance/sim-batch.xml index 98f51a71..f42c0180 100644 --- a/DRAMSys/tests/TLM_compliance/sim-batch.xml +++ b/DRAMSys/tests/TLM_compliance/sim-batch.xml @@ -21,7 +21,7 @@ - + @@ -31,11 +31,11 @@ - + - + diff --git a/DRAMSys/tests/TLM_compliance/test.pl b/DRAMSys/tests/TLM_compliance/test.pl index 6aafa38f..ac8ec45e 100644 --- a/DRAMSys/tests/TLM_compliance/test.pl +++ b/DRAMSys/tests/TLM_compliance/test.pl @@ -52,10 +52,10 @@ elsif ($Config{osname} eq "linux") chdir("../../../build/simulator/"); -$exampleInitiatorLine = `grep -n '#define USE_EXAMPLE_INITIATOR' ../../DRAMSys/simulator/src/simulation/SimulationManager.h | cut -d: -f 1`; +$exampleInitiatorLine = `grep -n '#define USE_EXAMPLE_INITIATOR' ../../DRAMSys/library/src/simulation/SimulationManager.h | cut -d: -f 1`; chomp $exampleInitiatorLine; -system("sed -i.bu '" . $exampleInitiatorLine . "s^.*^#define USE_EXAMPLE_INITIATOR 1^' ../../DRAMSys/simulator/src/simulation/SimulationManager.h"); +system("sed -i.bu '" . $exampleInitiatorLine . "s^.*^#define USE_EXAMPLE_INITIATOR 1^' ../../DRAMSys/library/src/simulation/SimulationManager.h"); `make -j$numberOfCores > /dev/null 2>&1`; @@ -72,7 +72,7 @@ if("" ne `grep "Error: tlm2_protocol_checker" ../../DRAMSys/tests/TLM_compliance exit -1; } -system("sed -i.bu '" . $exampleInitiatorLine . "s^.*^#define USE_EXAMPLE_INITIATOR 0^' ../../DRAMSys/simulator/src/simulation/SimulationManager.h"); +system("sed -i.bu '" . $exampleInitiatorLine . "s^.*^#define USE_EXAMPLE_INITIATOR 0^' ../../DRAMSys/library/src/simulation/SimulationManager.h"); `make -j$numberOfCores > /dev/null 2>&1`; @@ -91,7 +91,7 @@ clean_backup_files(); exit 0; sub clean_backup_files { - `rm -rf ../../DRAMSys/simulator/src/simulation/SimulationManager.h.bu`; + `rm -rf ../../DRAMSys/library/src/simulation/SimulationManager.h.bu`; `rm -rf ../../DRAMSys/tests/TLM_compliance/fifoStrict.xml.bu`; } diff --git a/DRAMSys/tests/continuous_testing_py/autotest.py b/DRAMSys/tests/continuous_testing_py/autotest.py index 9ca1ab89..111acae7 100644 --- a/DRAMSys/tests/continuous_testing_py/autotest.py +++ b/DRAMSys/tests/continuous_testing_py/autotest.py @@ -55,8 +55,8 @@ tempfile.tempdir = workingdir + '/' + rootdir builddir = tempfile.mkdtemp() simdir = builddir + '/simulator' -mcConfigPath = rootdir + '/DRAMSys/simulator/resources/configs/mcconfigs' -memSpecsPath = rootdir + '/DRAMSys/simulator/resources/configs/memspecs' +mcConfigPath = rootdir + '/DRAMSys/library/resources/configs/mcconfigs' +memSpecsPath = rootdir + '/DRAMSys/library/resources/configs/memspecs' baseConfigPath = workingdir + '/baseconfig.xml' diff --git a/DRAMSys/tests/continuous_testing_py/baseconfig.xml b/DRAMSys/tests/continuous_testing_py/baseconfig.xml index d7d6406e..b968b056 100644 --- a/DRAMSys/tests/continuous_testing_py/baseconfig.xml +++ b/DRAMSys/tests/continuous_testing_py/baseconfig.xml @@ -20,7 +20,7 @@ - + @@ -32,18 +32,18 @@ - + - + - + diff --git a/DRAMSys/tests/error/fr_fcfs.xml b/DRAMSys/tests/error/fr_fcfs.xml index b7b89273..c2861799 100644 --- a/DRAMSys/tests/error/fr_fcfs.xml +++ b/DRAMSys/tests/error/fr_fcfs.xml @@ -8,7 +8,7 @@ - + - + diff --git a/DRAMSys/tests/simple/sim-batch.xml b/DRAMSys/tests/simple/sim-batch.xml index 616e95a0..6ab12347 100644 --- a/DRAMSys/tests/simple/sim-batch.xml +++ b/DRAMSys/tests/simple/sim-batch.xml @@ -21,7 +21,7 @@ - + @@ -31,11 +31,11 @@ - + - + diff --git a/DRAMSys/tests/timing_compliance/fifoStrict.xml b/DRAMSys/tests/timing_compliance/fifoStrict.xml index cba9c369..2c84267e 100644 --- a/DRAMSys/tests/timing_compliance/fifoStrict.xml +++ b/DRAMSys/tests/timing_compliance/fifoStrict.xml @@ -8,7 +8,7 @@ - + diff --git a/DRAMSys/tests/timing_compliance/sim-batch.xml b/DRAMSys/tests/timing_compliance/sim-batch.xml index 16c6b333..9813a99d 100644 --- a/DRAMSys/tests/timing_compliance/sim-batch.xml +++ b/DRAMSys/tests/timing_compliance/sim-batch.xml @@ -21,7 +21,7 @@ - + @@ -31,11 +31,11 @@ - + - + diff --git a/DRAMSys/tests/timing_compliance/test.pl b/DRAMSys/tests/timing_compliance/test.pl index 3406ad0e..369542c5 100644 --- a/DRAMSys/tests/timing_compliance/test.pl +++ b/DRAMSys/tests/timing_compliance/test.pl @@ -45,7 +45,7 @@ chomp $powerAnalysisLine; $powerDownModeLine = `grep -n ' ../../DRAMSys/tests/timing_compliance/output.txt`; + `python3.5 ../../DRAMSys/traceAnalyzer/scripts/tests.py $_ > ../../DRAMSys/tests/timing_compliance/output.txt`; if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/timing_compliance/output.txt`) { @@ -80,7 +80,7 @@ foreach (@powerDownModes) foreach (@files) { - `python3.5 ../../DRAMSys/analyzer/scripts/tests.py $_ > ../../DRAMSys/tests/timing_compliance/output.txt`; + `python3.5 ../../DRAMSys/traceAnalyzer/scripts/tests.py $_ > ../../DRAMSys/tests/timing_compliance/output.txt`; if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/timing_compliance/output.txt`) { diff --git a/DRAMSys/analyzer/README.md b/DRAMSys/traceAnalyzer/README.md similarity index 100% rename from DRAMSys/analyzer/README.md rename to DRAMSys/traceAnalyzer/README.md diff --git a/DRAMSys/analyzer/businessObjects/calculatedMetric.h b/DRAMSys/traceAnalyzer/businessObjects/calculatedMetric.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/calculatedMetric.h rename to DRAMSys/traceAnalyzer/businessObjects/calculatedMetric.h diff --git a/DRAMSys/analyzer/businessObjects/comment.h b/DRAMSys/traceAnalyzer/businessObjects/comment.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/comment.h rename to DRAMSys/traceAnalyzer/businessObjects/comment.h diff --git a/DRAMSys/analyzer/businessObjects/generalinfo.h b/DRAMSys/traceAnalyzer/businessObjects/generalinfo.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/generalinfo.h rename to DRAMSys/traceAnalyzer/businessObjects/generalinfo.h diff --git a/DRAMSys/analyzer/businessObjects/phases/phase.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp similarity index 100% rename from DRAMSys/analyzer/businessObjects/phases/phase.cpp rename to DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp diff --git a/DRAMSys/analyzer/businessObjects/phases/phase.h b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/phases/phase.h rename to DRAMSys/traceAnalyzer/businessObjects/phases/phase.h diff --git a/DRAMSys/analyzer/businessObjects/phases/phasefactory.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.cpp similarity index 100% rename from DRAMSys/analyzer/businessObjects/phases/phasefactory.cpp rename to DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.cpp diff --git a/DRAMSys/analyzer/businessObjects/phases/phasefactory.h b/DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/phases/phasefactory.h rename to DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.h diff --git a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp b/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp similarity index 99% rename from DRAMSys/analyzer/businessObjects/pythoncaller.cpp rename to DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp index 4442b020..3a072eba 100644 --- a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp @@ -53,7 +53,7 @@ PythonCaller::PythonCaller() : metricFunctionName("calculateMetrics"), getMetricFunctionName("getMetrics"), - pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"), + pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/traceAnalyzer/scripts/"), plotsModuleName("plots"), plotsFunctionName("generatePlots") { diff --git a/DRAMSys/analyzer/businessObjects/pythoncaller.h b/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/pythoncaller.h rename to DRAMSys/traceAnalyzer/businessObjects/pythoncaller.h diff --git a/DRAMSys/analyzer/businessObjects/testresult.h b/DRAMSys/traceAnalyzer/businessObjects/testresult.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/testresult.h rename to DRAMSys/traceAnalyzer/businessObjects/testresult.h diff --git a/DRAMSys/analyzer/businessObjects/timespan.cpp b/DRAMSys/traceAnalyzer/businessObjects/timespan.cpp similarity index 100% rename from DRAMSys/analyzer/businessObjects/timespan.cpp rename to DRAMSys/traceAnalyzer/businessObjects/timespan.cpp diff --git a/DRAMSys/analyzer/businessObjects/timespan.h b/DRAMSys/traceAnalyzer/businessObjects/timespan.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/timespan.h rename to DRAMSys/traceAnalyzer/businessObjects/timespan.h diff --git a/DRAMSys/analyzer/businessObjects/tracecalculatedmetrics.h b/DRAMSys/traceAnalyzer/businessObjects/tracecalculatedmetrics.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/tracecalculatedmetrics.h rename to DRAMSys/traceAnalyzer/businessObjects/tracecalculatedmetrics.h diff --git a/DRAMSys/analyzer/businessObjects/tracetestresults.cpp b/DRAMSys/traceAnalyzer/businessObjects/tracetestresults.cpp similarity index 100% rename from DRAMSys/analyzer/businessObjects/tracetestresults.cpp rename to DRAMSys/traceAnalyzer/businessObjects/tracetestresults.cpp diff --git a/DRAMSys/analyzer/businessObjects/tracetestresults.h b/DRAMSys/traceAnalyzer/businessObjects/tracetestresults.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/tracetestresults.h rename to DRAMSys/traceAnalyzer/businessObjects/tracetestresults.h diff --git a/DRAMSys/analyzer/businessObjects/tracetime.h b/DRAMSys/traceAnalyzer/businessObjects/tracetime.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/tracetime.h rename to DRAMSys/traceAnalyzer/businessObjects/tracetime.h diff --git a/DRAMSys/analyzer/businessObjects/transaction.cpp b/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp similarity index 100% rename from DRAMSys/analyzer/businessObjects/transaction.cpp rename to DRAMSys/traceAnalyzer/businessObjects/transaction.cpp diff --git a/DRAMSys/analyzer/businessObjects/transaction.h b/DRAMSys/traceAnalyzer/businessObjects/transaction.h similarity index 100% rename from DRAMSys/analyzer/businessObjects/transaction.h rename to DRAMSys/traceAnalyzer/businessObjects/transaction.h diff --git a/DRAMSys/analyzer/data/QueryTexts.h b/DRAMSys/traceAnalyzer/data/QueryTexts.h similarity index 100% rename from DRAMSys/analyzer/data/QueryTexts.h rename to DRAMSys/traceAnalyzer/data/QueryTexts.h diff --git a/DRAMSys/analyzer/data/tracedb.cpp b/DRAMSys/traceAnalyzer/data/tracedb.cpp similarity index 100% rename from DRAMSys/analyzer/data/tracedb.cpp rename to DRAMSys/traceAnalyzer/data/tracedb.cpp diff --git a/DRAMSys/analyzer/data/tracedb.h b/DRAMSys/traceAnalyzer/data/tracedb.h similarity index 100% rename from DRAMSys/analyzer/data/tracedb.h rename to DRAMSys/traceAnalyzer/data/tracedb.h diff --git a/DRAMSys/analyzer/evaluationtool.cpp b/DRAMSys/traceAnalyzer/evaluationtool.cpp similarity index 100% rename from DRAMSys/analyzer/evaluationtool.cpp rename to DRAMSys/traceAnalyzer/evaluationtool.cpp diff --git a/DRAMSys/analyzer/evaluationtool.h b/DRAMSys/traceAnalyzer/evaluationtool.h similarity index 100% rename from DRAMSys/analyzer/evaluationtool.h rename to DRAMSys/traceAnalyzer/evaluationtool.h diff --git a/DRAMSys/analyzer/evaluationtool.ui b/DRAMSys/traceAnalyzer/evaluationtool.ui similarity index 100% rename from DRAMSys/analyzer/evaluationtool.ui rename to DRAMSys/traceAnalyzer/evaluationtool.ui diff --git a/DRAMSys/analyzer/gototimedialog.cpp b/DRAMSys/traceAnalyzer/gototimedialog.cpp similarity index 100% rename from DRAMSys/analyzer/gototimedialog.cpp rename to DRAMSys/traceAnalyzer/gototimedialog.cpp diff --git a/DRAMSys/analyzer/gototimedialog.h b/DRAMSys/traceAnalyzer/gototimedialog.h similarity index 100% rename from DRAMSys/analyzer/gototimedialog.h rename to DRAMSys/traceAnalyzer/gototimedialog.h diff --git a/DRAMSys/analyzer/gototimedialog.ui b/DRAMSys/traceAnalyzer/gototimedialog.ui similarity index 100% rename from DRAMSys/analyzer/gototimedialog.ui rename to DRAMSys/traceAnalyzer/gototimedialog.ui diff --git a/DRAMSys/analyzer/main.cpp b/DRAMSys/traceAnalyzer/main.cpp similarity index 100% rename from DRAMSys/analyzer/main.cpp rename to DRAMSys/traceAnalyzer/main.cpp diff --git a/DRAMSys/analyzer/mainwindow.cpp b/DRAMSys/traceAnalyzer/mainwindow.cpp similarity index 100% rename from DRAMSys/analyzer/mainwindow.cpp rename to DRAMSys/traceAnalyzer/mainwindow.cpp diff --git a/DRAMSys/analyzer/mainwindow.h b/DRAMSys/traceAnalyzer/mainwindow.h similarity index 100% rename from DRAMSys/analyzer/mainwindow.h rename to DRAMSys/traceAnalyzer/mainwindow.h diff --git a/DRAMSys/analyzer/markerplotitem.cpp b/DRAMSys/traceAnalyzer/markerplotitem.cpp similarity index 100% rename from DRAMSys/analyzer/markerplotitem.cpp rename to DRAMSys/traceAnalyzer/markerplotitem.cpp diff --git a/DRAMSys/analyzer/markerplotitem.h b/DRAMSys/traceAnalyzer/markerplotitem.h similarity index 100% rename from DRAMSys/analyzer/markerplotitem.h rename to DRAMSys/traceAnalyzer/markerplotitem.h diff --git a/DRAMSys/analyzer/preferences.ui b/DRAMSys/traceAnalyzer/preferences.ui similarity index 100% rename from DRAMSys/analyzer/preferences.ui rename to DRAMSys/traceAnalyzer/preferences.ui diff --git a/DRAMSys/analyzer/presentation/commenttreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/commenttreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/commenttreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/commenttreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/commenttreewidget.h b/DRAMSys/traceAnalyzer/presentation/commenttreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/commenttreewidget.h rename to DRAMSys/traceAnalyzer/presentation/commenttreewidget.h diff --git a/DRAMSys/analyzer/presentation/debugmessagetreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/debugmessagetreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/debugmessagetreewidget.h b/DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/debugmessagetreewidget.h rename to DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.h diff --git a/DRAMSys/analyzer/presentation/pornotracescroller.cpp b/DRAMSys/traceAnalyzer/presentation/pornotracescroller.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/pornotracescroller.cpp rename to DRAMSys/traceAnalyzer/presentation/pornotracescroller.cpp diff --git a/DRAMSys/analyzer/presentation/pornotracescroller.h b/DRAMSys/traceAnalyzer/presentation/pornotracescroller.h similarity index 100% rename from DRAMSys/analyzer/presentation/pornotracescroller.h rename to DRAMSys/traceAnalyzer/presentation/pornotracescroller.h diff --git a/DRAMSys/analyzer/presentation/selectedtransactiontreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/selectedtransactiontreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/selectedtransactiontreewidget.h b/DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/selectedtransactiontreewidget.h rename to DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.h diff --git a/DRAMSys/analyzer/presentation/tracePlotMouseLabel.cpp b/DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/tracePlotMouseLabel.cpp rename to DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.cpp diff --git a/DRAMSys/analyzer/presentation/tracePlotMouseLabel.h b/DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracePlotMouseLabel.h rename to DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.h diff --git a/DRAMSys/analyzer/presentation/tracedrawing.cpp b/DRAMSys/traceAnalyzer/presentation/tracedrawing.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/tracedrawing.cpp rename to DRAMSys/traceAnalyzer/presentation/tracedrawing.cpp diff --git a/DRAMSys/analyzer/presentation/tracedrawing.h b/DRAMSys/traceAnalyzer/presentation/tracedrawing.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracedrawing.h rename to DRAMSys/traceAnalyzer/presentation/tracedrawing.h diff --git a/DRAMSys/analyzer/presentation/tracedrawingproperties.h b/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracedrawingproperties.h rename to DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h diff --git a/DRAMSys/analyzer/presentation/tracemetrictreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/tracemetrictreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/tracemetrictreewidget.h b/DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracemetrictreewidget.h rename to DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.h diff --git a/DRAMSys/analyzer/presentation/tracenavigator.cpp b/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/tracenavigator.cpp rename to DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp diff --git a/DRAMSys/analyzer/presentation/tracenavigator.h b/DRAMSys/traceAnalyzer/presentation/tracenavigator.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracenavigator.h rename to DRAMSys/traceAnalyzer/presentation/tracenavigator.h diff --git a/DRAMSys/analyzer/presentation/traceplot.cpp b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/traceplot.cpp rename to DRAMSys/traceAnalyzer/presentation/traceplot.cpp diff --git a/DRAMSys/analyzer/presentation/traceplot.h b/DRAMSys/traceAnalyzer/presentation/traceplot.h similarity index 100% rename from DRAMSys/analyzer/presentation/traceplot.h rename to DRAMSys/traceAnalyzer/presentation/traceplot.h diff --git a/DRAMSys/analyzer/presentation/traceplotitem.cpp b/DRAMSys/traceAnalyzer/presentation/traceplotitem.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/traceplotitem.cpp rename to DRAMSys/traceAnalyzer/presentation/traceplotitem.cpp diff --git a/DRAMSys/analyzer/presentation/traceplotitem.h b/DRAMSys/traceAnalyzer/presentation/traceplotitem.h similarity index 100% rename from DRAMSys/analyzer/presentation/traceplotitem.h rename to DRAMSys/traceAnalyzer/presentation/traceplotitem.h diff --git a/DRAMSys/analyzer/presentation/tracetesttreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/tracetesttreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/tracetesttreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/tracetesttreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/tracetesttreewidget.h b/DRAMSys/traceAnalyzer/presentation/tracetesttreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/tracetesttreewidget.h rename to DRAMSys/traceAnalyzer/presentation/tracetesttreewidget.h diff --git a/DRAMSys/analyzer/presentation/transactiontreewidget.cpp b/DRAMSys/traceAnalyzer/presentation/transactiontreewidget.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/transactiontreewidget.cpp rename to DRAMSys/traceAnalyzer/presentation/transactiontreewidget.cpp diff --git a/DRAMSys/analyzer/presentation/transactiontreewidget.h b/DRAMSys/traceAnalyzer/presentation/transactiontreewidget.h similarity index 100% rename from DRAMSys/analyzer/presentation/transactiontreewidget.h rename to DRAMSys/traceAnalyzer/presentation/transactiontreewidget.h diff --git a/DRAMSys/analyzer/presentation/util/clkgrid.cpp b/DRAMSys/traceAnalyzer/presentation/util/clkgrid.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/util/clkgrid.cpp rename to DRAMSys/traceAnalyzer/presentation/util/clkgrid.cpp diff --git a/DRAMSys/analyzer/presentation/util/clkgrid.h b/DRAMSys/traceAnalyzer/presentation/util/clkgrid.h similarity index 100% rename from DRAMSys/analyzer/presentation/util/clkgrid.h rename to DRAMSys/traceAnalyzer/presentation/util/clkgrid.h diff --git a/DRAMSys/analyzer/presentation/util/colorgenerator.cpp b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/util/colorgenerator.cpp rename to DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp diff --git a/DRAMSys/analyzer/presentation/util/colorgenerator.h b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h similarity index 100% rename from DRAMSys/analyzer/presentation/util/colorgenerator.h rename to DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h diff --git a/DRAMSys/analyzer/presentation/util/customlabelscaledraw.h b/DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.h similarity index 100% rename from DRAMSys/analyzer/presentation/util/customlabelscaledraw.h rename to DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.h diff --git a/DRAMSys/analyzer/presentation/util/engineeringScaleDraw.h b/DRAMSys/traceAnalyzer/presentation/util/engineeringScaleDraw.h similarity index 100% rename from DRAMSys/analyzer/presentation/util/engineeringScaleDraw.h rename to DRAMSys/traceAnalyzer/presentation/util/engineeringScaleDraw.h diff --git a/DRAMSys/analyzer/presentation/util/testlight.cpp b/DRAMSys/traceAnalyzer/presentation/util/testlight.cpp similarity index 100% rename from DRAMSys/analyzer/presentation/util/testlight.cpp rename to DRAMSys/traceAnalyzer/presentation/util/testlight.cpp diff --git a/DRAMSys/analyzer/presentation/util/testlight.h b/DRAMSys/traceAnalyzer/presentation/util/testlight.h similarity index 100% rename from DRAMSys/analyzer/presentation/util/testlight.h rename to DRAMSys/traceAnalyzer/presentation/util/testlight.h diff --git a/DRAMSys/analyzer/queryeditor.cpp b/DRAMSys/traceAnalyzer/queryeditor.cpp similarity index 100% rename from DRAMSys/analyzer/queryeditor.cpp rename to DRAMSys/traceAnalyzer/queryeditor.cpp diff --git a/DRAMSys/analyzer/queryeditor.h b/DRAMSys/traceAnalyzer/queryeditor.h similarity index 100% rename from DRAMSys/analyzer/queryeditor.h rename to DRAMSys/traceAnalyzer/queryeditor.h diff --git a/DRAMSys/analyzer/queryeditor.ui b/DRAMSys/traceAnalyzer/queryeditor.ui similarity index 100% rename from DRAMSys/analyzer/queryeditor.ui rename to DRAMSys/traceAnalyzer/queryeditor.ui diff --git a/DRAMSys/analyzer/schedulerwrapper.h b/DRAMSys/traceAnalyzer/schedulerwrapper.h similarity index 100% rename from DRAMSys/analyzer/schedulerwrapper.h rename to DRAMSys/traceAnalyzer/schedulerwrapper.h diff --git a/DRAMSys/analyzer/scripts/memUtil.py b/DRAMSys/traceAnalyzer/scripts/memUtil.py similarity index 100% rename from DRAMSys/analyzer/scripts/memUtil.py rename to DRAMSys/traceAnalyzer/scripts/memUtil.py diff --git a/DRAMSys/analyzer/scripts/metrics.py b/DRAMSys/traceAnalyzer/scripts/metrics.py similarity index 98% rename from DRAMSys/analyzer/scripts/metrics.py rename to DRAMSys/traceAnalyzer/scripts/metrics.py index 24bf8e1e..f62084d6 100644 --- a/DRAMSys/analyzer/scripts/metrics.py +++ b/DRAMSys/traceAnalyzer/scripts/metrics.py @@ -228,14 +228,6 @@ def number_of_accesses(connection): return result[0] -@metric -def number_of_refreshes(connection): - cursor = connection.cursor() - cursor.execute("SELECT COUNT(*) FROM Phases WHERE PhaseName = 'REFA'") - result = cursor.fetchone() - return result[0] - - @metric def bank_overlap_ratio(connection): # Calculates how many banks are open in parallel diff --git a/DRAMSys/analyzer/scripts/plots.py b/DRAMSys/traceAnalyzer/scripts/plots.py similarity index 100% rename from DRAMSys/analyzer/scripts/plots.py rename to DRAMSys/traceAnalyzer/scripts/plots.py diff --git a/DRAMSys/analyzer/scripts/scripts.pri b/DRAMSys/traceAnalyzer/scripts/scripts.pri similarity index 58% rename from DRAMSys/analyzer/scripts/scripts.pri rename to DRAMSys/traceAnalyzer/scripts/scripts.pri index 2e99f781..27affc4a 100644 --- a/DRAMSys/analyzer/scripts/scripts.pri +++ b/DRAMSys/traceAnalyzer/scripts/scripts.pri @@ -1,5 +1,5 @@ -# Relative paths to "DRAMSys/analyzer" because this file is included in -# "DRAMSys/analyzer/traceAnalyzer.pro" +# Relative paths to "DRAMSys/traceAnalyzer" because this file is included in +# "DRAMSys/traceAnalyzer/traceAnalyzer.pro" OTHER_FILES += scripts/memUtil.py OTHER_FILES += scripts/metrics.py diff --git a/DRAMSys/analyzer/scripts/sonification.pl b/DRAMSys/traceAnalyzer/scripts/sonification.pl similarity index 100% rename from DRAMSys/analyzer/scripts/sonification.pl rename to DRAMSys/traceAnalyzer/scripts/sonification.pl diff --git a/DRAMSys/analyzer/scripts/tests.py b/DRAMSys/traceAnalyzer/scripts/tests.py similarity index 100% rename from DRAMSys/analyzer/scripts/tests.py rename to DRAMSys/traceAnalyzer/scripts/tests.py diff --git a/DRAMSys/analyzer/selectmetrics.cpp b/DRAMSys/traceAnalyzer/selectmetrics.cpp similarity index 100% rename from DRAMSys/analyzer/selectmetrics.cpp rename to DRAMSys/traceAnalyzer/selectmetrics.cpp diff --git a/DRAMSys/analyzer/selectmetrics.h b/DRAMSys/traceAnalyzer/selectmetrics.h similarity index 100% rename from DRAMSys/analyzer/selectmetrics.h rename to DRAMSys/traceAnalyzer/selectmetrics.h diff --git a/DRAMSys/analyzer/selectmetrics.ui b/DRAMSys/traceAnalyzer/selectmetrics.ui similarity index 100% rename from DRAMSys/analyzer/selectmetrics.ui rename to DRAMSys/traceAnalyzer/selectmetrics.ui diff --git a/DRAMSys/analyzer/traceAnalyzer.pro b/DRAMSys/traceAnalyzer/traceAnalyzer.pro similarity index 100% rename from DRAMSys/analyzer/traceAnalyzer.pro rename to DRAMSys/traceAnalyzer/traceAnalyzer.pro diff --git a/DRAMSys/analyzer/traceanalyzer.cpp b/DRAMSys/traceAnalyzer/traceanalyzer.cpp similarity index 100% rename from DRAMSys/analyzer/traceanalyzer.cpp rename to DRAMSys/traceAnalyzer/traceanalyzer.cpp diff --git a/DRAMSys/analyzer/traceanalyzer.h b/DRAMSys/traceAnalyzer/traceanalyzer.h similarity index 100% rename from DRAMSys/analyzer/traceanalyzer.h rename to DRAMSys/traceAnalyzer/traceanalyzer.h diff --git a/DRAMSys/analyzer/traceanalyzer.ui b/DRAMSys/traceAnalyzer/traceanalyzer.ui similarity index 100% rename from DRAMSys/analyzer/traceanalyzer.ui rename to DRAMSys/traceAnalyzer/traceanalyzer.ui diff --git a/DRAMSys/analyzer/tracefiletab.cpp b/DRAMSys/traceAnalyzer/tracefiletab.cpp similarity index 100% rename from DRAMSys/analyzer/tracefiletab.cpp rename to DRAMSys/traceAnalyzer/tracefiletab.cpp diff --git a/DRAMSys/analyzer/tracefiletab.h b/DRAMSys/traceAnalyzer/tracefiletab.h similarity index 100% rename from DRAMSys/analyzer/tracefiletab.h rename to DRAMSys/traceAnalyzer/tracefiletab.h diff --git a/DRAMSys/analyzer/tracefiletab.ui b/DRAMSys/traceAnalyzer/tracefiletab.ui similarity index 100% rename from DRAMSys/analyzer/tracefiletab.ui rename to DRAMSys/traceAnalyzer/tracefiletab.ui