Merge remote-tracking branch 'upstream/master'

DRAMSys/analyzer/paths.pro

@@ -1,42 +0,0 @@
-# This file has to be included after CONFIG has been adjusted and before the
-# path variables are used.
-# It has to be adjusted to your paths or at your choice set the proper
-# environment variables to reflect your paths.
-
-libqwt_home = $$(LIBQWT_HOME)
-isEmpty(libqwt_home) {
-    libqwt_home = /opt/qwt/lib
-}
-message(LIBQWT path is $${libqwt_home})
-
-QMAKE_RPATHDIR += $${libqwt_home}
-message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
-
-libqwt_headers = $$(LIBQWT_HEADERS)
-isEmpty(libqwt_headers) {
-    libqwt_headers = /opt/qwt/include
-}
-message(Getting LIBQWT headers from $${libqwt_headers})
-
-CONFIG(qwt){
-    LIBS += -L$${libqwt_home}/ -lqwt -lutil
-    INCLUDEPATH += $${libqwt_headers}
-}
-
-python_home = $$(PYTHON_HOME)
-isEmpty(python_home) {
-    python_home = /opt/python/lib
-}
-message(Python home is $${python_home})
-
-python_headers = $$(PYTHON_HEADERS)
-isEmpty(python_headers) {
-    python_headers = /opt/python/include/python3.4m
-}
-message(Getting python headers from $${python_headers})
-
-CONFIG(python){
-    LIBS += -L$${python_home} -lpython3.4m
-    INCLUDEPATH += $${python_headers}
-}
-

DRAMSys/analyzer/scripts/scripts.pri

@@ -0,0 +1,8 @@
+# Relative paths to "DRAMSys/analyzer" because this file is included in
+# "DRAMSys/analyzer/traceAnalyzer.pro"
+
+OTHER_FILES += scripts/memUtil.py
+OTHER_FILES += scripts/metrics.py
+OTHER_FILES += scripts/tests.py
+OTHER_FILES += scripts/plots.py
+

DRAMSys/analyzer/traceAnalyzer.pro

@@ -28,7 +28,46 @@ macx: {
         LIBS += -L/opt/local/Library/Frameworks/Python.framework/Versions/3.4/lib/python3.4/config-3.4m/ -lpython3.4
 }
 
-include(paths.pro)
+# QWT library and header files
+libqwt_home = $$(LIBQWT_HOME)
+isEmpty(libqwt_home) {
+    libqwt_home = /opt/qwt/lib
+}
+message(LIBQWT path is $${libqwt_home})
+
+QMAKE_RPATHDIR += $${libqwt_home}
+message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
+
+libqwt_headers = $$(LIBQWT_HEADERS)
+isEmpty(libqwt_headers) {
+    libqwt_headers = /opt/qwt/include
+}
+message(Getting LIBQWT headers from $${libqwt_headers})
+
+CONFIG(qwt){
+    LIBS += -L$${libqwt_home}/ -lqwt -lutil
+    INCLUDEPATH += $${libqwt_headers}
+}
+
+# Python library and header files
+python_home = $$(PYTHON_HOME)
+isEmpty(python_home) {
+    python_home = /opt/python/lib
+}
+message(Python home is $${python_home})
+
+python_headers = $$(PYTHON_HEADERS)
+isEmpty(python_headers) {
+    python_headers = /opt/python/include/python3.4m
+}
+message(Getting python headers from $${python_headers})
+
+CONFIG(python) {
+    LIBS += -L$${python_home} -lpython3.4m
+    INCLUDEPATH += $${python_headers}
+}
+
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = traceAnalyzer
@@ -115,8 +154,7 @@ FORMS    += \
     preferences.ui \
     evaluationtool.ui
 
-OTHER_FILES += \
-    common/static/createTraceDB.sql \
-    scripts/metrics.py \
-    scripts/tests.py \
-    scripts/plots.py
+# Additional Files:
+# scripts (DRAMSys/analyzer/scripts)
+include(scripts/scripts.pri)
+

DRAMSys/dram.vp.system.pro

@@ -19,3 +19,7 @@ $$eval(thermalsim) {
 SUBDIRS += simulator/simulator.pro
 SUBDIRS += analyzer/traceAnalyzer.pro
 
+# Additional Files:
+# tests folder (DRAMSys/tests)
+include(tests/tests.pri)
+

DRAMSys/simulator/resources/resources.pri

@@ -0,0 +1,84 @@
+# Relative paths to "DRAMSys/simulator" because this file is included in
+# "DRAMSys/simulator/simulator.pro"
+
+# simulation files
+OTHER_FILES += resources/simulations/sim-batch.xml
+OTHER_FILES += resources/simulations/ddr3-example.xml
+
+# scripts
+OTHER_FILES += resources/scripts/address_scrambler.pl
+OTHER_FILES += resources/scripts/createTraceDB.sql
+OTHER_FILES += resources/scripts/stride_detection.pl
+OTHER_FILES += resources/scripts/analyse_trace.pl
+OTHER_FILES += resources/scripts/video_rendering/temperatur.job.pl
+OTHER_FILES += resources/scripts/video_rendering/temperatur.pl
+OTHER_FILES += resources/scripts/video_rendering/Makefile
+
+# trace files
+OTHER_FILES += resources/traces/chstone-aes_32.stl
+OTHER_FILES += resources/traces/test2.stl
+OTHER_FILES += resources/traces/voco2.stl
+OTHER_FILES += resources/traces/chstone-bf_32.stl
+OTHER_FILES += resources/traces/trace2.stl
+OTHER_FILES += resources/traces/chstone-sha_32.stl
+OTHER_FILES += resources/traces/prettyTest
+OTHER_FILES += resources/traces/test.stl
+OTHER_FILES += resources/traces/mediabench-mpeg2encode_32.stl
+OTHER_FILES += resources/traces/mediabench-unepic_32.stl
+OTHER_FILES += resources/traces/chstone-mips_32.stl
+OTHER_FILES += resources/traces/mediabench-gsmdecode_32.stl
+OTHER_FILES += resources/traces/mediabench-c-ray-1.1_32.stl
+OTHER_FILES += resources/traces/eiersalat.stl
+OTHER_FILES += resources/traces/mediabench-fractal_32.stl
+OTHER_FILES += resources/traces/wideio_multi_channel.stl
+OTHER_FILES += resources/traces/mediabench-g721decode_32.stl
+OTHER_FILES += resources/traces/mediabench-jpegencode_32.stl
+OTHER_FILES += resources/traces/chstone-jpeg_32.stl
+OTHER_FILES += resources/traces/trace.stl
+OTHER_FILES += resources/traces/mediabench-h263decode_32.stl
+OTHER_FILES += resources/traces/mediabench-h263encode_32.stl
+OTHER_FILES += resources/traces/mediabench-mpeg2decode_32.stl
+OTHER_FILES += resources/traces/chstone-gsm_32.stl
+OTHER_FILES += resources/traces/mediabench-epic_32.stl
+OTHER_FILES += resources/traces/empty.stl
+OTHER_FILES += resources/traces/mediabench-adpcmencode_32.stl
+OTHER_FILES += resources/traces/chstone-adpcm_32.stl
+OTHER_FILES += resources/traces/mediabench-jpegdecode_32.stl
+OTHER_FILES += resources/traces/mediabench-g721encode_32.stl
+OTHER_FILES += resources/traces/small.stl
+OTHER_FILES += resources/traces/chstone-motion_32.stl
+OTHER_FILES += resources/traces/mediabench-adpcmdecode_32.stl
+
+# memconfigs
+OTHER_FILES += resources/configs/memconfigs/fifoStrict.xml
+OTHER_FILES += resources/configs/memconfigs/fifo.xml
+OTHER_FILES += resources/configs/memconfigs/_old/par_bs_unaware.xml
+OTHER_FILES += resources/configs/memconfigs/_old/fr_fcfs_unaware.xml
+OTHER_FILES += resources/configs/memconfigs/_old/grouper.xml
+OTHER_FILES += resources/configs/memconfigs/_old/par_bs.xml
+OTHER_FILES += resources/configs/memconfigs/_old/fr_fcfs_bankwise.xml
+OTHER_FILES += resources/configs/memconfigs/fr_fcfs.xml
+
+# memspecs
+OTHER_FILES += resources/configs/memspecs/memspec.dtd
+OTHER_FILES += resources/configs/memspecs/MatzesWideIO.xml
+OTHER_FILES += resources/configs/memspecs/DDR4.xml
+OTHER_FILES += resources/configs/memspecs/WideIO.xml
+OTHER_FILES += resources/configs/memspecs/MatzesWideIO-short.xml
+
+# address mapping configs
+OTHER_FILES += resources/configs/amconfigs/am_ddr3.xml
+OTHER_FILES += resources/configs/amconfigs/am_ddr4.xml
+OTHER_FILES += resources/configs/amconfigs/am_highHits.xml
+OTHER_FILES += resources/configs/amconfigs/am_highPara.xml
+OTHER_FILES += resources/configs/amconfigs/am_wideio.xml
+OTHER_FILES += resources/configs/amconfigs/am_lowHits.xml
+OTHER_FILES += resources/configs/amconfigs/am_lowPara.xml
+OTHER_FILES += resources/configs/amconfigs/am_wideioFourBanks.xml
+
+# thermal simulation configs
+OTHER_FILES += resources/configs/thermalsim/core.flp
+OTHER_FILES += resources/configs/thermalsim/mem.flp
+OTHER_FILES += resources/configs/thermalsim/powerInfo.xml
+OTHER_FILES += resources/configs/thermalsim/stack.stk
+

DRAMSys/simulator/simulator.pro

@@ -216,20 +216,6 @@ $$eval(thermalsim) {
 }
 
 # Additional Files:
-OTHER_FILES += resources/simulations/sim-batch.xml
-OTHER_FILES += resources/simulations/ddr3-example.xml
+# resources folder (DRAMSys/simulator/resources)
+include(resources/resources.pri)
 
-OTHER_FILES += resources/configs/amconfig/am_ddr3.xml
-OTHER_FILES += resources/configs/amconfig/am_ddr4.xml
-OTHER_FILES += resources/configs/amconfig/am_highHits.xml
-OTHER_FILES += resources/configs/amconfig/am_highPara.xml
-OTHER_FILES += resources/configs/amconfig/am_lowHits.xml
-OTHER_FILES += resources/configs/amconfig/am_lowPara.xml
-OTHER_FILES += resources/configs/amconfig/am_wideio.xml
-OTHER_FILES += resources/configs/amconfig/am_wideioFourBanks.xml
-
-OTHER_FILES += resources/configs/memconfigs/fifo.xml
-OTHER_FILES += resources/configs/memconfigs/fifoStrict.xml
-OTHER_FILES += resources/configs/memconfigs/fr_fcfs.xml
-
-OTHER_FILES += resources/scripts/createTraceDB.sql

DRAMSys/tests/tests.pri

@@ -0,0 +1,19 @@
+# Relative paths to "DRAMSys" because this file is included in
+# "DRAMSys/dram.vp.system.pro"
+
+OTHER_FILES += tests/start.pl
+
+# simple test
+OTHER_FILES += tests/simple/sim-batch.xml
+OTHER_FILES += tests/simple/fifoStrict.xml
+OTHER_FILES += tests/simple/test.pl
+OTHER_FILES += tests/simple/expected.txt
+
+# error test
+OTHER_FILES += tests/error/sim-batch.xml
+OTHER_FILES += tests/error/test.pl
+OTHER_FILES += tests/error/am_wideio.xml
+OTHER_FILES += tests/error/fr_fcfs.xml
+OTHER_FILES += tests/error/generateErrorTest.pl
+OTHER_FILES += tests/error/WideIO.xml
+