Reorganized such that build dependencies wont fail

Also some LPDDR4 starting was conducted

.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

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)

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}
 

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

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)
 

DRAMSys/library/resources/configs/mcconfigs/sms.xml

@@ -9,7 +9,7 @@
     <PowerDownTimeout value="100" />
     <!-- Error Modelling -->
     <ErrorChipSeed value="42" />
-    <ErrorCSVFile value="../../DRAMSys/simulator/src/error/error.csv" />
+    <ErrorCSVFile value="../../DRAMSys/library/src/error/error.csv" />
     <!-- Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel) -->
     <StoreMode value="NoStorage" />
     <ControllerCoreDisableRefresh value="0"/>

DRAMSys/library/resources/configs/simulator/wideio.xml

@@ -12,7 +12,7 @@
     <CheckTLM2Protocol value = "0" />
     <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
-    <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
+    <ErrorCSVFile value="../../DRAMSys/library/resources/error/wideio.csv" />
     <!-- Modes:
 	- NoStorage,
 	- Store (store data without errormodel),

DRAMSys/library/resources/configs/simulator/wideio_ecc.xml

@@ -12,7 +12,7 @@
     <CheckTLM2Protocol value = "0" />
     <ECCControllerMode value = "Hamming" />
     <ErrorChipSeed value="42" />
-    <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
+    <ErrorCSVFile value="../../DRAMSys/library/resources/error/wideio.csv" />
     <!-- Modes:
 	- NoStorage,
 	- Store (store data without errormodel),

DRAMSys/library/resources/configs/simulator/wideio_thermal.xml

@@ -12,7 +12,7 @@
     <CheckTLM2Protocol value = "0" />
     <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
-    <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
+    <ErrorCSVFile value="../../DRAMSys/library/resources/error/wideio.csv" />
     <!-- Modes:
 	- NoStorage,
 	- Store (store data without errormodel),

DRAMSys/library/resources/resources.pri

@@ -1,5 +1,5 @@
-# Relative paths to "DRAMSys/simulator" because this file is included in
-# "DRAMSys/simulator/simulator.pro"
+# Relative paths to "DRAMSys/library" because this file is included in
+# "DRAMSys/library/simulator.pro"
 
 # Simulation Files
 OTHER_FILES += resources/simulations/ddr3-example.xml
@@ -31,7 +31,6 @@ OTHER_FILES += resources/scripts/DRAMSylva/LICENSE
 OTHER_FILES += resources/scripts/DRAMSylva/README
 OTHER_FILES += resources/scripts/DRAMSylva/DRAMSylva.patch
 OTHER_FILES += resources/scripts/DRAMSylva/DRAMSylva.sh
-OTHER_FILES += resources/scripts/DRAMSylva/DRAMSylvaCSVPlot.py
 
 # Trace Files
 OTHER_FILES += resources/traces/chstone-aes_32.stl
@@ -78,6 +77,7 @@ OTHER_FILES += resources/traces/sms_t4.stl
 OTHER_FILES += resources/traces/ddr3_postpone_ref_test_1.stl
 OTHER_FILES += resources/traces/ddr3_postpone_ref_test_2.stl
 OTHER_FILES += resources/traces/ddr3_postpone_ref_test_3.stl
+OTHER_FILES += resources/traces/ip*.stl
 
 # Memory Controller Configs
 OTHER_FILES += resources/configs/mcconfigs/fifoStrict.xml
@@ -157,6 +157,10 @@ OTHER_FILES += resources/configs/thermalsim/powerInfo.xml
 OTHER_FILES += resources/configs/thermalsim/stack.stk
 OTHER_FILES += resources/configs/thermalsim/config.xml
 
+# Add DRAMPower
+OTHER_FILES += src/common/third_party/DRAMPower/*
+OTHER_FILES += src/common/third_party/DRAMPower/src/*
+
 # Error Simulation data
 OTHER_FILES += resources/error/wideio.csv
 
@@ -164,3 +168,7 @@ DISTFILES += \
     $$PWD/traces/read_write_switch.stl \
     $$PWD/configs/mcconfigs/fr_fcfs_rp.xml \
     $$PWD/configs/mcconfigs/fr_fcfs_grp.xml \
+    $$PWD/configs/simulator/lpddr4.xml \
+    $$PWD/simulations/lpddr4-single-device.xml \
+    $$PWD/configs/amconfigs/am_lpddr4.xml \
+    $$PWD/configs/memspecs/MICRON_6Gb_LPDDR4-3200_NDA_NDA_NDA.xml