Commit Graph

324 Commits

Author SHA1 Message Date
Éder Ferreira Zulian
03e45ea7bc Merge remote branch 'upstream/master' 2015-07-03 15:05:16 +02:00
Éder Ferreira Zulian
9b3348a5a4 This is a fix for a bug Matthias found related to the output of the trace analyser when using Single Data Rate Memories. 2015-07-03 14:57:32 +02:00
Matthias Jung
5895e615f8 Merge pull request #21 from fzeder/master
This just remove the pbuff submodule from dram.vp.system project.
2015-07-03 13:09:42 +02:00
Éder Ferreira Zulian
2341089a0d Pbuff submodule removed.
It will be added as a regular folder in a specific branch.
2015-07-03 11:51:49 +02:00
Éder Ferreira Zulian
039064d2d5 fix 2015-06-30 17:19:05 +02:00
Éder Ferreira Zulian
15dd65acfe Small fix: user removed 2015-06-30 17:15:43 +02:00
Matthias Jung
3ddcae259f submodule changed 2015-06-30 14:25:59 +02:00
Matthias Jung
736ee0fa44 Submodule for packet buffering added 2015-06-30 13:44:50 +02:00
Matthias Jung
8ea6316471 Merge pull request #19 from fzeder/master
Small changes to get QTCreator's auto-complete and syntax highlight working properly.
2015-06-28 22:54:17 +02:00
Éder Ferreira Zulian
8e81da403e Merge remote branch 'upstream/master' 2015-06-28 15:10:13 +02:00
Éder Ferreira Zulian
c0ded2274f Some template arguments removed.
BUSWIDTH will be treated separately.
2015-06-28 15:07:41 +02:00
Éder Ferreira Zulian
701d7cd535 QTCreator's syntax highlight and auto-complete working properly. 2015-06-28 14:09:35 +02:00
Matthias Jung
7539be9228 Merge pull request #18 from fzeder/master
Multiple TLM recorders based on the number of channels. It looks reasonable to me however I will test it :)
2015-06-28 13:59:10 +02:00
Éder Ferreira Zulian
8764850e98 Using proper configuration when creating TLMRecorder instances.
Fix after code review.
2015-06-27 15:34:19 +02:00
Éder Ferreira Zulian
c207eef02c Authors list updated 2015-06-25 15:03:14 +02:00
Éder Ferreira Zulian
edc78e05dd Oops, I forgot to commit this. 2015-06-25 14:07:59 +02:00
Éder Ferreira Zulian
6051946389 Support to multiple TLM recorders - one per channel.
Each module connected to a channel (e.g. channel Controller and DRAM) is able
to access the TLM recorder for that channel.

A module connected to more than one channel must be able to access
multiple TLM recorders (one from each channel) and must also be able to decide
for which TLM recorder records a transaction should be forwarded. The Arbiter
is an example of this kind of module and is currently able to do that.

Output file names after this implementation:

<trace setup ID>_channel[0-9]+.tdb (dependent on the number of channels)
<trace setup ID>.txt (a single file, independent of the number of channels)

Tests were made with this sim-batch.xml:

<simulation>
    <simconfig>
        <Debug value="1" />
        <DatabaseRecording value="1" />
        <PowerAnalysis value="1" />
        <NumberOfTracePlayers value="1"/>
        <NumberOfMemChannels value="4"/>
    </simconfig>

    <memspecs>
        <memspec src="../../DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml"></memspec>
    </memspecs>

    <addressmappings>
        <addressmapping src="../../DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
    </addressmappings>

    <memconfigs>
        <memconfig src="../../DRAMSys/dramSys/resources/configs/memconfigs/fifo.xml"/>
    </memconfigs>

    <tracesetups>
        <tracesetup id="fifo">
            <device clkMhz="200">wideio_multi_channel.stl</device>
        </tracesetup>
    </tracesetups>
</simulation>

Output files generated:

fifo_channel0.tdb
fifo_channel1.tdb
fifo_channel2.tdb
fifo_channel3.tdb
fifo.txt
2015-06-25 13:54:01 +02:00
Matthias Jung
f3d8d596bf Merge pull request #17 from fzeder/master
Please see the individual commits
2015-06-24 13:33:32 +02:00
Éder Ferreira Zulian
a61d7ecb36 Change in project structure. 2015-06-23 16:31:19 +02:00
Éder Ferreira Zulian
8fb4718938 Number of channels accordingly WideIO address mapping. 2015-06-23 15:29:36 +02:00
Matthias Jung
151e646609 Merge pull request #16 from fzeder/master
Please see individual commits
2015-06-23 14:01:43 +02:00
Éder Ferreira Zulian
d82898b439 Removal of some gitignore files that we do not need anymore. 2015-06-22 18:28:38 +02:00
Éder Ferreira Zulian
f45c017331 README file updated. 2015-06-22 18:18:10 +02:00
Éder Ferreira Zulian
438c99970f README file updated 2015-06-22 18:03:10 +02:00
Éder Ferreira Zulian
6f776c067e Changes in project structure.
Now we have a root project file - dram.vp.system.pro - that includes
dramSys.pro and traceAnanlyzer.pro files. This way it is possible to build
both projects easily.

After buiding from QTCreator the results will be in dram.vp.system/build* and
its sub-directories.
2015-06-22 17:15:29 +02:00
Éder Ferreira Zulian
494ae584ad Old script removed. 2015-06-22 15:51:27 +02:00
Éder Ferreira Zulian
ffbbff3cbf Small changes in code and README file.
Cosmetic changes in code.
Small improvements in the README text.
2015-06-22 12:44:20 +02:00
Éder Ferreira Zulian
14062a9d9b The power and energy ouput information is always displayed. 2015-06-22 12:39:36 +02:00
Éder Ferreira Zulian
12821e99b3 Print the channel number related to the power and energy information. 2015-06-18 16:28:15 +02:00
Éder Ferreira Zulian
707b7073a8 Readme file updated. Text enhanced. 2015-06-18 13:17:58 +02:00
Éder Ferreira Zulian
21ad5962aa Test if the "NumberOfTracePlayers" is defined in the XML file. 2015-06-17 13:15:46 +02:00
Éder Ferreira Zulian
e9ba47df88 Readme file updated: added info about simulation setups. 2015-06-17 13:14:48 +02:00
Éder Ferreira Zulian
23128a15f4 Properly adding trace setups to a simulation batch.
Get the number of trace players from the XML tree. At this point the
configuration was not loaded yet.
2015-06-16 19:56:34 +02:00
Éder Ferreira Zulian
3bf154e673 Readme file updated: mention the output files generaed by DRAMSys. 2015-06-16 18:21:38 +02:00
Éder Ferreira Zulian
baea94d46f Changed default configuration back to "fr_fcfs.xml" and "chstone-adpcm_32.stl". 2015-06-16 11:16:58 +02:00
Éder Ferreira Zulian
9826354de1 Get number of trace players and number of channes from config.
- Using multi_passthrough_sockets in the arbiter.
- Trace players, controllers and arbiter's queues are allocated dynamically.
2015-06-16 00:38:42 +02:00
Éder Ferreira Zulian
fbde607efd Controllers and drams objects creation based base on the number of channels. 2015-06-12 18:08:32 +02:00
Éder Ferreira Zulian
97a50dff9f Now players are created dynamically based on the number of players. 2015-06-12 16:45:54 +02:00
Éder Ferreira Zulian
57287ae113 Bringing back some compiler flags to the "proj" file.
Without these flags lots of warning are generated.
2015-06-12 13:04:14 +02:00
Éder Ferreira Zulian
34cae6d675 Readme file updated.
When working in a fork one must add the official repository as a remote
upstream in order to be able to sync with it.
2015-06-12 13:03:12 +02:00
Éder Ferreira Zulian
69c22c3f1c Merge remote branch 'upstream/master' 2015-06-12 11:32:48 +02:00
Éder Ferreira Zulian
ae09bb105c First steps on inplementing full support to multiple memory channels/controllers based on config
Changes in the Arbiter block:
- now multiple initiator sockets are possible. These intiator sockets connect to multiple memory controllers;
- added lots of comments to the code in order to make it easier to understand.

Changes in Simulaton[cpp,h]:
- added TODO messages in some points that need to be changed to provide full support to multiple memory channles/controllers based on configuration.
2015-06-12 10:52:06 +02:00
Matthias Jung
a7ec172d8a fifo file fixed 2015-06-10 15:43:57 +02:00
Matthias Jung
0ecf98f71b Merge pull request #14 from EIT-Wehn/drampowerfix
Drampowerfix
2015-06-10 15:22:24 +02:00
Matthias Jung
66c6589794 Removed XERCES from DRAMPower 2015-06-10 15:20:57 +02:00
Matthias Jung
f243f3afd0 removed unnecessary librarys 2015-06-10 10:44:19 +02:00
Matthias Jung
1eb83cb7f9 small warning fixed 2015-06-09 09:02:53 +02:00
Matthias Jung
8819f9b39c added support for debug_transport in Controller and DRAM 2015-06-08 14:53:39 +02:00
Éder Ferreira Zulian
a557e789ef Dir simconfigs removed 2015-06-08 13:51:09 +02:00
Éder Ferreira Zulian
3e15e0dd66 Merge remote branch 'upstream/master' 2015-06-05 17:02:53 +02:00