From 8bafb07d24995fe09f864acea6643fadaf094c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Tue, 30 Oct 2018 16:36:06 +0100 Subject: [PATCH] Fixes - repository URL and repository updated github --> gitlab dram.vp.system --> dram.sys --- DRAMSys/gem5/examples/tlm_elastic_slave.py | 4 +- .../examples/tlm_elastic_slave_mc_direct.py | 8 +-- .../examples/tlm_elastic_slave_with_l2.py | 4 +- DRAMSys/tests/start.pl | 2 +- README.md | 62 +++++-------------- 5 files changed, 25 insertions(+), 55 deletions(-) diff --git a/DRAMSys/gem5/examples/tlm_elastic_slave.py b/DRAMSys/gem5/examples/tlm_elastic_slave.py index 07f97fa0..3aedaa57 100644 --- a/DRAMSys/gem5/examples/tlm_elastic_slave.py +++ b/DRAMSys/gem5/examples/tlm_elastic_slave.py @@ -99,8 +99,8 @@ system.cpu.dcache.cpu_side = system.cpu.dcache_port # XXX: Assign input trace files to the eTraceCPU (you have to set this path # properly before running gem5): -system.cpu.instTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" -system.cpu.dataTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" +system.cpu.instTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" +system.cpu.dataTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" # Setting up L1 BUS: system.membus = IOXBar(width = 16) diff --git a/DRAMSys/gem5/examples/tlm_elastic_slave_mc_direct.py b/DRAMSys/gem5/examples/tlm_elastic_slave_mc_direct.py index 58c0b632..5132ca6e 100644 --- a/DRAMSys/gem5/examples/tlm_elastic_slave_mc_direct.py +++ b/DRAMSys/gem5/examples/tlm_elastic_slave_mc_direct.py @@ -105,10 +105,10 @@ system.cpu[1].createThreads() # XXX: Assign input trace files to the eTraceCPU (you have to set this path # properly before running gem5): -system.cpu[0].instTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" -system.cpu[0].dataTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" -system.cpu[1].instTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" -system.cpu[1].dataTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" +system.cpu[0].instTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" +system.cpu[0].dataTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" +system.cpu[1].instTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" +system.cpu[1].dataTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" # Setting up memory BUS: system.physmem = SimpleMemory() # This must be instantiated, even if not needed diff --git a/DRAMSys/gem5/examples/tlm_elastic_slave_with_l2.py b/DRAMSys/gem5/examples/tlm_elastic_slave_with_l2.py index 8efd3c79..195c4758 100644 --- a/DRAMSys/gem5/examples/tlm_elastic_slave_with_l2.py +++ b/DRAMSys/gem5/examples/tlm_elastic_slave_with_l2.py @@ -105,8 +105,8 @@ system.cpu.dcache.cpu_side = system.cpu.dcache_port # XXX: Assign input trace files to the eTraceCPU (you have to set this path # properly before running gem5): -system.cpu.instTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" -system.cpu.dataTraceFile="dram.vp.system/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" +system.cpu.instTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.inst.gz" +system.cpu.dataTraceFile="dram.sys/DRAMSys/gem5/etraces/system.cpu.traceListener.data.gz" # Setting up L1 BUS: system.tol2bus = L2XBar() diff --git a/DRAMSys/tests/start.pl b/DRAMSys/tests/start.pl index 501853c0..e8be4992 100755 --- a/DRAMSys/tests/start.pl +++ b/DRAMSys/tests/start.pl @@ -45,7 +45,7 @@ my $pathSelector = shift || ""; if($pathSelector eq "absolute") { - chdir("/home/test_dramsys/dram.vp.system/DRAMSys/tests") || die("chdir"); + chdir("/home/test_dramsys/dram.sys/DRAMSys/tests") || die("chdir"); } my $timestamp_color = "green"; diff --git a/README.md b/README.md index e914d48e..9383b178 100644 --- a/README.md +++ b/README.md @@ -18,67 +18,37 @@ $ mkdir projects $ cd projects ``` -Configure git on your machine. Some basic configurations follow. Replace -**rhrkuser** with your own RHRK user when configuring your email. +Configure git on your machine. Some basic configurations follow. ```bash $ git config --global user.name "FirstName OtherNames LastName" -$ git config --global user.email rhrkuser@rhrk.uni-kl.de +$ git config --global user.email user@email $ git config --global credential.helper 'cache --timeout=3600' $ git config --global color.ui auto ``` -Login using your **git.rhrk** account. Fork the repository by clicking in -**Fork** in the upper-right corner of this page. - -Now clone **your fork** of the official repository into a local folder on your -computer. Replace the occurrences of the word **user** with your own RHRK user -name. **Note that it appears twice in the line below**. +Now clone the repository into a local folder on your computer. +Replace the occurrences of the word **user** with your own user name. ```bash -$ git clone --recursive https://user@git.rhrk.uni-kl.de/user/dram.vp.system.git +$ git clone --recursive https://user@git.eit.uni-kl.de:ems/astdm/dram.sys.git ``` The *--recursive* flag tells git to initialize all submodules within the repository. **DRAMPower** [2] and **tinyxml** are examples third party repositories that were embedded within the source tree as submodules. -Now you can implement, test, commit and push features into your **fork** of -the official repository. +Now you can implement, test, commit and push features into a **branch**. -When you consider your work stable enough to be merged into the official -repository it is time to open a **pull request** using the web interface of -git.rhrk.uni-kl.de. +When you consider your work stable enough to be merged into the master branch +it is time to open a **merge request** using the web interface. -Your changes will be reviewed and finally integrated to the official -repository. +Your changes will be reviewed and finally integrated to the master branch. After cloning go to the project directory. ```bash -$ cd dram.vp.system -``` - -When working with a fork, the official repository must be added as a remote for -your fork. Replace the word **user** with your own RHRK user name. - -```bash -$ git remote add upstream https://user@git.rhrk.uni-kl.de/EIT-Wehn/dram.vp.system.git -``` - -In general, from time to time you should update your fork in order to keep it -synchronized with the official repository. It is important to keep track of -the evolution of the official repository and avoid a huge divergence. - -To get the latest changes from the official repository merged into your fork -you can use the commands that follow: - -```bash -$ git fetch upstream -$ git checkout master -$ git merge upstream/master -$ git push origin HEAD -$ git submodule update --init --recursive +$ cd dram.sys ``` ### Dependencies @@ -167,7 +137,7 @@ $ qtcreator & Use the menu bar and open the DRAMSys project. -**File -> Open Project -> dram.vp.system/DRAMSys/DRAMSys.pro** +**File -> Open Project -> dram.sys/DRAMSys/DRAMSys.pro** When you open the project for the first time a configuration window pops-up. Then click in **Configure Project** and after that **Build** the project. @@ -312,7 +282,7 @@ has to be changed like [this](https://trac.macports.org/attachment/ticket/44288/ - Install package [xerces](http://xerces.apache.org/mirrors.cgi) if your system does not have. -- Type following command inside your dram.vp.system folder: +- Type following command inside your dram.sys folder: ```bash $ mkdir build @@ -981,7 +951,7 @@ Users can profit of running multiple simulations automatically with [DRAMSylva](DRAMSys/library/resources/scripts/DRAMSylva/DRAMSylva.sh). Every time you run the script you get a new folder with the name containing -the execution time: dram.vp.system\_YYYY\_MM\_DD-HH.MM.SS. +the execution time: dram.sys\_YYYY\_MM\_DD-HH.MM.SS. Example on how to run the script: @@ -993,7 +963,7 @@ $ bash DRAMSylva.sh To see the generated plots and CSV files: ```bash -$ nautilus dram.vp.system_YYYY_MM_DD-HH.MM.SS/build/simulator +$ nautilus dram.sys_YYYY_MM_DD-HH.MM.SS/build/simulator ``` In that folder you will find plots as PDF files and CSV files with the output @@ -1007,7 +977,7 @@ data used to generate the plots. The CSV files are: Use the command below to find all generated CSV files: ```bash -$ ls -l dram.vp.system_YYYY_MM_DD-HH.MM.SS/build/simulator/*.csv +$ ls -l dram.sys_YYYY_MM_DD-HH.MM.SS/build/simulator/*.csv ``` The generated CSV files can be open in a spreadsheet program for further @@ -1541,7 +1511,7 @@ Copy this configuration file to the building directory of DRAMSys where the executable **DRAMSys_gem5** is located: ``` -dram.vp.system/build-DRAMSys-Desktop_Qt_5_7_0_clang_64bit-Debug/gem5 +dram.sys/build-DRAMSys-Desktop_Qt_5_7_0_clang_64bit-Debug/gem5 ``` Also the traffic generatior configuration file (conf/tgen.cfg) must be stored