From acf55533e68b862fd2406edb9bab071c3b387321 Mon Sep 17 00:00:00 2001 From: Thanh Tran Date: Thu, 6 Oct 2016 10:59:24 +0200 Subject: [PATCH 01/13] Remove hard-coded QWT & Python Path in QMake Project file of traceAnalyzer --- DRAMSys/analyzer/traceAnalyzer.pro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DRAMSys/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/traceAnalyzer.pro index 177e2b4d..057ed8f8 100644 --- a/DRAMSys/analyzer/traceAnalyzer.pro +++ b/DRAMSys/analyzer/traceAnalyzer.pro @@ -22,12 +22,12 @@ unix:!macx { macx: { CONFIG += c++11 QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC - QMAKE_LFLAGS += -F/opt/qwt-6.1.2/lib - LIBS += -F/opt/qwt-6.1.2/lib/ -framework qwt - INCLUDEPATH += /opt/qwt-6.1.2/lib/qwt.framework/Headers - DEPENDPATH += /opt/qwt-6.1.2 - INCLUDEPATH += /usr/local/Cellar/python3/3.5.2_1/Frameworks/Python.framework/Versions/3.5/include/python3.5m - LIBS += -L/usr/local/Cellar/python3/3.5.2_1/Frameworks/Python.framework/Versions/3.5/lib -lpython3.5 + QMAKE_LFLAGS += -F$$(LIBQWT_HOME) + LIBS += -F$$(LIBQWT_HOME) -framework qwt + INCLUDEPATH += $$(LIBQWT_HEADERS) + DEPENDPATH += $$replace(LIBQWT_HOME, lib, ) + INCLUDEPATH += $$(PYTHON_HEADERS) + LIBS += -L$$(PYTHON_HOME) -lpython3.5 } # QWT library and header files From f0807f1e3371d9010d505ed3633fd4b53fb1e487 Mon Sep 17 00:00:00 2001 From: Thanh Tran Date: Thu, 6 Oct 2016 11:00:37 +0200 Subject: [PATCH 02/13] Update procedure of installation on Mac OSX --- README.md | 123 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 539b4e51..e2507eb0 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ They are: - SystemC 2.3.1 and TLM 2.0 - The sources can be downloaded from http://accellera.org/downloads/standards/systemc. + The sources can be downloaded from [this](http://accellera.org/downloads/standards/systemc). For installation instructions see the installation notes file contained in the release package. @@ -80,7 +80,7 @@ They are: $ sudo make install ``` - For further information refer to http://qwt.sourceforge.net/ + For further information refer to [this](http://qwt.sourceforge.net/) - python3.5 @@ -211,68 +211,123 @@ $ ./traceAnalyzer ``` ### Building on OSX +- Install XCode + +- Install SystemC manually in /opt: + +``` bash +$ ./configure --prefix=/opt/systemc +$ make +$ sudo make install +``` + +- Install the required python 3 over macports: -- Install SystemC in /opt (as usual with ./configure --prefix=/opt/systemc; make; make install;). -- Install the required python over macports: ``` bash sudo port install python34 ``` +or you can install manually using official package provided in [link](https://www.python.org/downloads/) + +**Note:** Official Python Package will be installed in +``` +/Library/Frameworks/Python.framework +``` + - Install the QtCreator via macports: + ``` bash -sudo port install qt5-creator qt5 +$ sudo port install qt5-creator qt5 +``` + +or you can install it using offical setup file from [link](https://www.qt.io/download-open-source/#section-2) + +**Note:** You have later setup PATH for Qt5 and its tool if you install QtCreator manually, e.g: + +``` bash +# Setting PATH for Qt5 and its tools +PATH="/Users//Qt5.7.0/5.7/clang_64/bin:${PATH}" +export PATH ``` - Install the QWT manually to /opt/qwt, then do: -``` bash -cd /Library/Frameworks -sudo ln -s /opt/qwt-6.1.2/lib/qwt.framework/ . -``` -- The boost library must be installed manually, since the macports version is not compatible with DRAMSys: - -In your “user-config.jam”, put this: ``` bash -using clang : 11 - : "/usr/bin/clang++" - : "-std=c++11 -stdlib=libc++" "-stdlib=libc++"" - ; +$ cd /Library/Frameworks +$ sudo ln -s /opt/qwt-6.1.2/lib/qwt.framework/ . +``` + +- The boost library can be installed manually or through homebrew: + +Manually: Install boost lib (filesystem & system) in /opt/boost -``` -Then compile and install it: ``` bash -./b2 toolset=clang-11 -sudo ./b2 install -``` -DRAMSys and Analyzer only runs if the following is configured in the project settings: +$ ./bootstrap.sh --prefix=/opt/boost --with-libraries=filesystem,system +$ sudo ./b2 install ``` -DYLD_LIBRARY_PATH=/opt/boost/lib -LIBQWT_HEADERS=/opt/local/include -LIBQWT_HOME=/opt/local/lib -PYTHON_HEADERS=/opt/local/include -PYTHON_HOME=/opt/local/lib -SYSTEMC_TARGET_ARCH=macosx64 -``` -For the trace analyzer the file /opt/local/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m/pyport.h has to be changed like this: https://trac.macports.org/attachment/ticket/44288/issue10910-workaround.txt + +Homebrew: Install boost lib (all, which consumes large storage) in /usr/local/Cellar + +``` bash +$ sudo brew install boost +``` + + +- Export correct Environment Variables in your terminal's profile, e.g: + +``` bash +# Setting for DRAMSys +# SystemC home and target architecture +export SYSTEMC_HOME=/opt/systemc +export SYSTEMC_TARGET_ARCH=macosx64 +# DRAMSys libraries and headers +export PYTHON_HOME=/Library/Frameworks/Python.framework/Versions/3.5/lib +export PYTHON_HEADERS=/Library/Frameworks/Python.framework/Versions/3.5/Headers +export LIBQWT_HOME=/opt/qwt-6.1.4/lib +export LIBQWT_HEADERS=/opt/qwt-6.1.4/lib/qwt.framework/Headers +export LIBBOOST_HOME=/opt/boost/lib +export LIBBOOST_HEADERS=/opt/boost/include + +# Add Boost Lib into Dynamic Lib Path +DYLD_LIBRARY_PATH="/opt/boost/lib:${DYLD_LIBRARY_PATH}" +export DYLD_LIBRARY_PATH +``` + +- For the trace analyzer the file: +``` +/opt/local/Library/Frameworks/Python.framework/Versions/3.5/include/python3.4m/pyport.h +``` +has to be changed like [this](https://trac.macports.org/attachment/ticket/44288/issue10910-workaround.txt) + +- Install package [xerces](http://xerces.apache.org/mirrors.cgi) if your system does not have. + +- Type following command inside your dram.vp.system folder: + +``` bash +$ mkdir build +$ qmake ../DRAMSys/dram.vp.system.pro +$ make -j +``` + +Now you can try to run DramSys and traceAnalyzer App inside folder simulator and analyzer, respectively ### DRAMSys Thermal Simulation The thermal simulation is performed by a **3D-ICE** [8] server accessed through the network. Therefore users interested in thermal simulation during their DRAMSys simulations need to make sure they have a 3D-ICE server up and -running before starting. For more information about 3D-ICE visit the official -website http://esl.epfl.ch/3D-ICE. +running before starting. For more information about 3D-ICE visit the [official website](http://esl.epfl.ch/3D-ICE). #### Installing the lastest 3D-ICE version -Download the lastest version. Make sure you got version 2.2.6 or greater: +[Download](http://esl.epfl.ch/3d-ice/download.html) the lastest version. Make sure you got version 2.2.6 or greater: ``` bash $ wget http://esl.epfl.ch/files/content/sites/esl/files/3dice/releases/3d-ice-latest.zip $ tar -xvzf 3d-ice-latest.zip ``` -Install SuperLU dependencies: +Install [SuperLU](http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_5.2.1.tar.gz) dependencies: ``` bash $ sudo apt-get install build-essential git bison flex libblas-dev From 4177e150b9a936ee06a0185ddd8902032837a1ef Mon Sep 17 00:00:00 2001 From: Thanh Tran Date: Mon, 10 Oct 2016 16:19:07 +0200 Subject: [PATCH 03/13] Change to install python3 and systemc via homebrew --- README.md | 53 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e2507eb0..ebf04455 100644 --- a/README.md +++ b/README.md @@ -221,10 +221,31 @@ $ make $ sudo make install ``` -- Install the required python 3 over macports: +Or you can install via homebrew: ``` bash -sudo port install python34 +$ brew install systemc +``` + +in this case, systemc will be installed, e.g. in: +``` +/usr/local/Cellar/systemc/2.3.1 +``` +and make a simlink of the lib directory: +``` +ln -s lib/ lib-macosx64 +``` + + +- Install the required python 3 over homebrew: + +``` bash +$ brew install python3 +``` + +Python3 (via homebrew) will be installed in +``` +/usr/local/Cellar/python3/3.5.2_2/Frameworks/Python.framework ``` or you can install manually using official package provided in [link](https://www.python.org/downloads/) @@ -234,13 +255,7 @@ or you can install manually using official package provided in [link](https://ww /Library/Frameworks/Python.framework ``` -- Install the QtCreator via macports: - -``` bash -$ sudo port install qt5-creator qt5 -``` - -or you can install it using offical setup file from [link](https://www.qt.io/download-open-source/#section-2) +- Install the QtCreator using offical setup file from [link](https://www.qt.io/download-open-source/#section-2) **Note:** You have later setup PATH for Qt5 and its tool if you install QtCreator manually, e.g: @@ -266,10 +281,13 @@ $ ./bootstrap.sh --prefix=/opt/boost --with-libraries=filesystem,system $ sudo ./b2 install ``` -Homebrew: Install boost lib (all, which consumes large storage) in /usr/local/Cellar +Homebrew: Install boost lib (all, which consumes large storage) in +``` +/usr/local/Cellar +``` ``` bash -$ sudo brew install boost +$ brew install boost ``` @@ -277,12 +295,21 @@ $ sudo brew install boost ``` bash # Setting for DRAMSys -# SystemC home and target architecture +# SystemC via official source export SYSTEMC_HOME=/opt/systemc export SYSTEMC_TARGET_ARCH=macosx64 -# DRAMSys libraries and headers +# SystemC via Homebrew +#export SYSTEMC_HOME=/usr/local/Cellar/systemc/2.3.1 +#export SYSTEMC_TARGET_ARCH=macosx64 + +# Python via official pkg export PYTHON_HOME=/Library/Frameworks/Python.framework/Versions/3.5/lib export PYTHON_HEADERS=/Library/Frameworks/Python.framework/Versions/3.5/Headers + +# Python3 via Homebrew +#export PYTHON_HOME=/usr/local/Cellar/python3/3.5.2_2/Frameworks/Python.framework/Versions/3.5/lib +#export PYTHON_HEADERS=/usr/local/Cellar/python3/3.5.2_2/Frameworks/Python.framework/Versions/3.5/Headers + export LIBQWT_HOME=/opt/qwt-6.1.4/lib export LIBQWT_HEADERS=/opt/qwt-6.1.4/lib/qwt.framework/Headers export LIBBOOST_HOME=/opt/boost/lib From a8bd6eaecd6e01d0c8fd33ba8523566c88577784 Mon Sep 17 00:00:00 2001 From: sprado Date: Mon, 17 Oct 2016 23:50:21 +0200 Subject: [PATCH 04/13] Update ControllerCore.cpp --- DRAMSys/simulator/src/controller/core/ControllerCore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DRAMSys/simulator/src/controller/core/ControllerCore.cpp b/DRAMSys/simulator/src/controller/core/ControllerCore.cpp index 8de6d3f5..da9df026 100644 --- a/DRAMSys/simulator/src/controller/core/ControllerCore.cpp +++ b/DRAMSys/simulator/src/controller/core/ControllerCore.cpp @@ -139,7 +139,7 @@ void ControllerCore::triggerRefresh(tlm::tlm_generic_payload& payload) powerDownManager->wakeUpForRefresh(bank, time); //expects PDNA and PDNP to exit without delay bool pdnpToSrefTransition = false; if (config.PowerDownMode == EPowerDownMode::Staggered) { - pdnpToSrefTransition = state->getLastCommand(Command::PDNPX,bank).getStart() >= time; + pdnpToSrefTransition = state->getLastCommand(Command::PDNPX,bank).getStart() >= time; } if (pdnpToSrefTransition) { powerDownManager->sleep(bank,time); From 20bb441a91b2b63f47d14a32f02187788d093d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 18 Oct 2016 16:30:31 +0200 Subject: [PATCH 05/13] Informative message added. --- DRAMSys/analyzer/scripts/plots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DRAMSys/analyzer/scripts/plots.py b/DRAMSys/analyzer/scripts/plots.py index f953c4f4..ef672088 100755 --- a/DRAMSys/analyzer/scripts/plots.py +++ b/DRAMSys/analyzer/scripts/plots.py @@ -165,7 +165,7 @@ def generatePlots(pathToTrace): cursor.execute(" SELECT WindowSize FROM GeneralInfo") windowSize = float(cursor.fetchone()[0]) if(windowSize == 0): - outputFiles = "No output file created" + outputFiles = "No output file created. Check WindowSize and EnableWindowing configs." else: cursor.execute(" SELECT TraceEnd FROM GeneralInfo ") traceEnd = float(cursor.fetchone()[0]) From 4c6cdad98256f66e500fcbfac731262221fb9358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 18 Oct 2016 18:45:05 +0200 Subject: [PATCH 06/13] Two new address mapping files added to qtcreator --- DRAMSys/simulator/resources/resources.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DRAMSys/simulator/resources/resources.pri b/DRAMSys/simulator/resources/resources.pri index 3f2dc9ce..b6b2661c 100644 --- a/DRAMSys/simulator/resources/resources.pri +++ b/DRAMSys/simulator/resources/resources.pri @@ -69,6 +69,8 @@ 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_ddr3_x16_brc.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_x16_rbc.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 From 0735bc33ebef97af1ade627c6a3687dd1727f273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 18 Oct 2016 22:17:58 +0200 Subject: [PATCH 07/13] New DDR3 address mapping files. Matthias sent these files to me via e-mail (20161018). --- .../amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml | 25 +++++++++++++++++++ .../amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml | 25 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml create mode 100644 DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml new file mode 100644 index 00000000..39d66692 --- /dev/null +++ b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml new file mode 100644 index 00000000..6f384970 --- /dev/null +++ b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml @@ -0,0 +1,25 @@ + + + + + + + + + + From 2f0f26900b57d331f746b662342ab35e28502a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 18 Oct 2016 22:23:30 +0200 Subject: [PATCH 08/13] Adding more address mapping files to qtcreator --- DRAMSys/simulator/resources/resources.pri | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DRAMSys/simulator/resources/resources.pri b/DRAMSys/simulator/resources/resources.pri index b6b2661c..107a0b36 100644 --- a/DRAMSys/simulator/resources/resources.pri +++ b/DRAMSys/simulator/resources/resources.pri @@ -71,7 +71,9 @@ OTHER_FILES += resources/configs/memspecs/MatzesWideIO-short.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3_x16_brc.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3_x16_rbc.xml -OTHER_FILES += resources/configs/amconfigs/am_ddr4.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml +OTHER_FILES += resources/configs/amconfigs/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 From 746d667685f85a3a033959cc86a2f134317e377f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 18 Oct 2016 22:39:28 +0200 Subject: [PATCH 09/13] DDR address mappings BRC and RBC. --- ....xml => am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml} | 0 .../am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml | 25 +++++++++++++++++++ ....xml => am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml} | 0 .../am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml | 25 +++++++++++++++++++ DRAMSys/simulator/resources/resources.pri | 6 +++-- 5 files changed, 54 insertions(+), 2 deletions(-) rename DRAMSys/simulator/resources/configs/amconfigs/{am_ddr3_8x1Gbx8_dimm_p1KB.xml => am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml} (100%) create mode 100644 DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml rename DRAMSys/simulator/resources/configs/amconfigs/{am_ddr3_8x2Gbx8_dimm_p1KB.xml => am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml} (100%) create mode 100644 DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml b/DRAMSys/simulator/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.xml rename to DRAMSys/simulator/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/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml new file mode 100644 index 00000000..46cb5158 --- /dev/null +++ b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml b/DRAMSys/simulator/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.xml rename to DRAMSys/simulator/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/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml new file mode 100644 index 00000000..7f9e64fe --- /dev/null +++ b/DRAMSys/simulator/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/DRAMSys/simulator/resources/resources.pri b/DRAMSys/simulator/resources/resources.pri index 107a0b36..f3fcbaf7 100644 --- a/DRAMSys/simulator/resources/resources.pri +++ b/DRAMSys/simulator/resources/resources.pri @@ -71,8 +71,10 @@ OTHER_FILES += resources/configs/memspecs/MatzesWideIO-short.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3_x16_brc.xml OTHER_FILES += resources/configs/amconfigs/am_ddr3_x16_rbc.xml -OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB.xml -OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.xml +OTHER_FILES += resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.xml OTHER_FILES += resources/configs/amconfigs/resources/configs/amconfigs/am_ddr4.xml OTHER_FILES += resources/configs/amconfigs/am_highHits.xml OTHER_FILES += resources/configs/amconfigs/am_highPara.xml From d5496c5caabe0fdc7113fd471e8f1e3baa33948e Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Tue, 18 Oct 2016 22:53:11 +0200 Subject: [PATCH 10/13] polished ddr3 example for the DRAMSys Workshop --- .../resources/simulations/ddr3-example.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example.xml b/DRAMSys/simulator/resources/simulations/ddr3-example.xml index 73da61ff..dd1635e5 100644 --- a/DRAMSys/simulator/resources/simulations/ddr3-example.xml +++ b/DRAMSys/simulator/resources/simulations/ddr3-example.xml @@ -5,7 +5,7 @@ - + @@ -29,21 +29,32 @@ + + + - + + + + + - chstone-adpcm_32.stl + + ddr3_example.stl From beaf397c9018c3ce0643740f031627cec3b6438f Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Tue, 18 Oct 2016 23:23:21 +0200 Subject: [PATCH 11/13] Fixed bug during file renaming --- DRAMSys/simulator/resources/simulations/ddr3-example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DRAMSys/simulator/resources/simulations/ddr3-example.xml b/DRAMSys/simulator/resources/simulations/ddr3-example.xml index dd1635e5..689690eb 100644 --- a/DRAMSys/simulator/resources/simulations/ddr3-example.xml +++ b/DRAMSys/simulator/resources/simulations/ddr3-example.xml @@ -37,7 +37,7 @@ - + From 031c3301f120416831dffca31322fa0fddfb2e47 Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Wed, 19 Oct 2016 11:19:22 +0200 Subject: [PATCH 12/13] Added memspecs from DRAMPower to the pri file --- DRAMSys/simulator/resources/resources.pri | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/DRAMSys/simulator/resources/resources.pri b/DRAMSys/simulator/resources/resources.pri index f3fcbaf7..6ec3546c 100644 --- a/DRAMSys/simulator/resources/resources.pri +++ b/DRAMSys/simulator/resources/resources.pri @@ -48,6 +48,7 @@ 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 +OTHER_FILES += resources/traces/ddr3_example.stl # memconfigs OTHER_FILES += resources/configs/memconfigs/fifoStrict.xml @@ -66,6 +67,42 @@ 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 +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml +OTHER_FILES += resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml +OTHER_FILES += resources/configs/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml +OTHER_FILES += resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml +OTHER_FILES += resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.xml + + # address mapping configs OTHER_FILES += resources/configs/amconfigs/am_ddr3.xml From a49178fdc1c5dd24b1e8e4e4aaf0d7b84c8c0186 Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Wed, 19 Oct 2016 11:19:47 +0200 Subject: [PATCH 13/13] Fixed typo in BW output from GiB/s to Gibit/s --- DRAMSys/simulator/src/simulation/Dram.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h index 0641ed23..bb4a3d2b 100644 --- a/DRAMSys/simulator/src/simulation/Dram.h +++ b/DRAMSys/simulator/src/simulation/Dram.h @@ -244,9 +244,9 @@ struct Dram : sc_module cout << name() << string("\tTotal Time: \t") <<(endTime-startTime).to_string() << endl; //cout << name() << string("\tTotal IDLE: \t") <