Re: [m5-dev] changeset in m5: garnet: removed flit_width from Routers

2011-04-29 Thread Joel Hestness
Hey Brad,
  I just did an update of my repo from revision 8107:2e269d6fb3e6 to the
latest, and I got some warnings.  I haven't encountered any problems yet,
but I'm not sure if they might be problematic:

joel@vein:~/research/m5/m5$ hg pull -u
pulling from http://repo.m5sim.org/m5
searching for changes
adding changesets
adding manifests
adding file changes
added 157 changesets with 2344 changes to 1326 files
warning: detected divergent renames of src/mem/ruby/network/Network.cc to:
 src/mem/ruby/network/BasicLink.cc
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.cc
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.cc
 src/mem/ruby/network/simple/SimpleLink.cc
warning: detected divergent renames of src/mem/ruby/network/Network.hh to:
 src/mem/ruby/network/BasicLink.hh
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.hh
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.hh
 src/mem/ruby/network/simple/SimpleLink.hh
warning: detected divergent renames of
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.py to:
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.py
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.py
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py
1306 files updated, 0 files merged, 50 files removed, 0 files unresolved

  Joel



On Thu, Apr 28, 2011 at 7:31 PM, Brad Beckmann wrote:

> changeset 89d0e7c17d1e in /z/repo/m5
> details: http://repo.m5sim.org/m5?cmd=changeset;node=89d0e7c17d1e
> description:
>garnet: removed flit_width from Routers
>
> diffstat:
>
>  src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py  |  1 -
>  src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc|  1 -
>  src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh|  1 -
>  src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py |  1 -
>  src/mem/ruby/network/orion/NetworkPower.cc|  3 ++-
>  5 files changed, 2 insertions(+), 5 deletions(-)
>
> diffs (55 lines):
>
> diff -r 39e42ccddd63 -r 89d0e7c17d1e
> src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py
> --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py  Thu
> Apr 28 17:18:14 2011 -0700
> +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py  Thu
> Apr 28 17:18:14 2011 -0700
> @@ -39,6 +39,5 @@
>   "virtual channels per message class")
> virt_nets = Param.Int(Parent.number_of_virtual_networks,
>   "number of virtual networks")
> -flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size")
>
>
> diff -r 39e42ccddd63 -r 89d0e7c17d1e
> src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
> --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.ccThu Apr 28
> 17:18:14 2011 -0700
> +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.ccThu Apr 28
> 17:18:14 2011 -0700
> @@ -49,7 +49,6 @@
> m_virtual_networks = p->virt_nets;
> m_vc_per_vnet = p->vcs_per_class;
> m_num_vcs = m_virtual_networks * m_vc_per_vnet;
> -m_flit_width = p->flit_width;
>
> m_routing_unit = new RoutingUnit_d(this);
> m_vc_alloc = new VCallocator_d(this);
> diff -r 39e42ccddd63 -r 89d0e7c17d1e
> src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
> --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hhThu Apr 28
> 17:18:14 2011 -0700
> +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hhThu Apr 28
> 17:18:14 2011 -0700
> @@ -96,7 +96,6 @@
>   private:
> int m_virtual_networks, m_num_vcs, m_vc_per_vnet;
> GarnetNetwork_d *m_network_ptr;
> -int m_flit_width;
>
> std::vector buf_read_count;
> std::vector buf_write_count;
> diff -r 39e42ccddd63 -r 89d0e7c17d1e
> src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py
> --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py Thu
> Apr 28 17:18:14 2011 -0700
> +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py Thu
> Apr 28 17:18:14 2011 -0700
> @@ -39,6 +39,5 @@
>   "virtual channels per message class")
> virt_nets = Param.Int(Parent.number_of_virtual_networks,
>   "number of virtual networks")
> -flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size")
>
>
> diff -r 39e42ccddd63 -r 89d0e7c17d1e
> src/mem/ruby/network/orion/NetworkPower.cc
> --- a/src/mem/ruby/network/orion/NetworkPower.ccThu Apr 28 17:18:14
> 2011 -0700
> +++ b/src/mem/ruby/network/orion/NetworkPower.ccThu Apr 28 17:18:14
> 2011 -0700
> @@ -96,7 +96,8 @@
> uint32_t num_vc_per_vclass = m_vc_per_vnet;
> uint32_t in_buf_per_data_vc = m_network_ptr->getBuffersPerDataVC();
> uint32_t in_buf_per_ctrl_vc = m_network_ptr->getBuffersPerCtrlVC();
> -uint32_t flit_width = m_flit_width * 8; //flit width in bits
> +//flit width in bits
> +uint32_t flit_width =

[m5-dev] Cron /z/m5/regression/do-regression quick

2011-04-29 Thread Cron Daemon
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target `build/ALPHA_SE/python/m5/internal/param_RubyNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target 
`build/ALPHA_SE/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target `build/ALPHA_SE/python/m5/internal/param_Topology_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target `build/ALPHA_SE/python/m5/internal/param_RubySystem_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target 
`build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target 
`build/ALPHA_SE/python/m5/internal/param_SimpleNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not found, 
needed by target 
`build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_d_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubyNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_Topology_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubySystem_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_SimpleNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' 
not found, needed by target 
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetwork_d_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubyNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Topology_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubySystem_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_SimpleNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_GarnetNetwork_d_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_RubyNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_Topology_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_RubySystem_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency 
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found, needed by 
target 
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/pa

[m5-dev] changeset in m5: Util: Replace mkblankimage.sh with the new gem5...

2011-04-29 Thread Gabe Black
changeset 7939dd0c4ff2 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=7939dd0c4ff2
description:
Util: Replace mkblankimage.sh with the new gem5img.py.

This change replaces the mkblankimage.sh script, used for creating new 
disk
images, with a new gem5img.py script. The new version is written in 
python
instead of bash, takes its parameters from command line arguments 
instead of
prompting for them, and finds a free loopback device dynamically 
instead of
hardcoding /dev/loop1. The file system used is now optionally 
configurable,
and the blank image is filled by a "hole" left by lseek and write 
instead of
literally filling it with zeroes.

The functionality of the new script is broken into subcommands "init",
"mount", "umount", "new", "partition", and "format". "init" creates a 
new file
of the appropriate size, partitions it, and then formats the first (and 
only)
new parition. "mount" attaches a new loopback device to the first 
parition of
the image file and mounts it to the specified mount point. "umount" 
unmounts
the specified mount point and identifies and cleans up the underlying 
loopback
device. "new", "partition", and "format" are the individual stages of 
"init"
but broken out so they can be run individually. That's so an image can 
be
reinitialized in place if needed.

Two features of the original script are being dropped. The first is the
ability to specify a source directory to copy into the new file system. 
The
second is the ability to specify a list of commands to run which are 
expected
to (but not required to) update the permissions of the files in the new 
fs.
Both of these seem easy enough to do manually, especially given the 
"mount"
and "umount" commands, that removing them would meaningfully simplify 
the
script without making it less useful.

diffstat:

 util/gem5img.py  |  372 +++
 util/mkblankimage.sh |  219 --
 2 files changed, 372 insertions(+), 219 deletions(-)

diffs (truncated from 599 to 300 lines):

diff -r dba41dbef071 -r 7939dd0c4ff2 util/gem5img.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/util/gem5img.py   Fri Apr 29 04:46:19 2011 -0400
@@ -0,0 +1,372 @@
+#!/usr/bin/python
+#
+# gem5img.py
+# Script for managing a gem5 disk image.
+#
+
+from optparse import OptionParser
+import os
+from os import environ as env
+import string
+from subprocess import CalledProcessError, Popen, PIPE, STDOUT
+from sys import exit, argv
+
+
+# Some constants.
+MaxLBACylinders = 16383
+MaxLBAHeads = 16
+MaxLBASectors = 63
+MaxLBABlocks = MaxLBACylinders * MaxLBAHeads * MaxLBASectors
+
+BlockSize = 512
+MB = 1024 * 1024
+
+# Setup PATH to look in the sbins.
+env['PATH'] += ':/sbin:/usr/sbin'
+
+# Whether to print debug output.
+debug = False
+
+# Figure out cylinders, heads and sectors from a size in blocks.
+def chsFromSize(sizeInBlocks):
+if sizeInBlocks >= MaxLBABlocks:
+sizeInMBs = (sizeInBlocks * BlockSize) / MB
+print '%d MB is too big for LBA, truncating file.' % sizeInMBs
+return (MaxLBACylinders, MaxLBAHeads, MaxLBASectors)
+
+sectors = sizeInBlocks
+if sizeInBlocks > 63:
+sectors = 63
+
+headSize = sizeInBlocks / sectors
+heads = 16
+if headSize < 16:
+heads = sizeInBlocks
+
+cylinders = sizeInBlocks / (sectors * heads)
+
+return (cylinders, heads, sectors)
+
+
+# Figure out if we should use sudo.
+def needSudo():
+if not hasattr(needSudo, 'notRoot'):
+needSudo.notRoot = (os.geteuid() != 0)
+if needSudo.notRoot:
+print 'You are not root. Using sudo.'
+return needSudo.notRoot
+
+# Run an external command.
+def runCommand(command, inputVal=''):
+print "%>", ' '.join(command)
+proc = Popen(command, stdin=PIPE)
+proc.communicate(inputVal)
+return proc.returncode
+
+# Run an external command and capture its output. This is intended to be
+# used with non-interactive commands where the output is for internal use.
+def getOutput(command, inputVal=''):
+global debug
+if debug:
+print "%>", ' '.join(command)
+proc = Popen(command, stderr=STDOUT,
+ stdin=PIPE, stdout=PIPE)
+(out, err) = proc.communicate(inputVal)
+return (out, proc.returncode)
+
+# Run a command as root, using sudo if necessary.
+def runPriv(command, inputVal=''):
+realCommand = command
+if needSudo():
+realCommand = [findProg('sudo')] + command
+return runCommand(realCommand, inputVal)
+
+def privOutput(command, inputVal=''):
+realCommand = command
+if needSudo():
+realCommand = [findProg('sudo')] + command
+return getOutput(realCommand, inputVal)
+
+# Find the path to a program.
+def findProg(program, cleanupDev=None):

Re: [m5-dev] Cron /z/m5/regression/do-regression quick

2011-04-29 Thread Beckmann, Brad
I can't reproduce these scons errors and they don't seem to happen from a clean 
build.  Can we blow away the current build directory on zizzer and re-run the 
regression tester?  I would do it myself, but I don't have access to zizzer.

Thanks,

Brad


> -Original Message-
> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org]
> On Behalf Of Cron Daemon
> Sent: Friday, April 29, 2011 12:17 AM
> To: m5-dev@m5sim.org
> Subject: [m5-dev] Cron  /z/m5/regression/do-regression
> quick
>
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_RubyNetwork_wrap.cc'.
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'
> .
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_Topology_wrap.cc'.
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_RubySystem_wrap.cc'.
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_wrap.cc'.
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_SimpleNetwork_wrap.cc'.
> scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
> found, needed by target
> `build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_d_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubyNetwo
> rk_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_BaseGarnet
> Network_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_Topology_w
> rap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubySystem
> _wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetw
> ork_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_SimpleNetw
> ork_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
> by target
> `build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetw
> ork_d_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubyN
> etwork_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_BaseGa
> rnetNetwork_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Topolo
> gy_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubySy
> stem_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Garnet
> Network_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Simple
> Network_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Garnet
> Network_d_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_Ruby
> Network_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found,
> needed by target
> `build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_Base
> GarnetNetwork_wrap.cc'.
> scons: *** Implicit dependency
> `build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not fo

Re: [m5-dev] Cron /z/m5/regression/do-regression quick

2011-04-29 Thread Gabriel Michael Black
I deleted the build directory but I'll let it rerun naturally tonight.  
If somebody wants to rerun them manually go ahead.


Gabe

Quoting "Beckmann, Brad" :

I can't reproduce these scons errors and they don't seem to happen  
from a clean build.  Can we blow away the current build directory on  
zizzer and re-run the regression tester?  I would do it myself, but  
I don't have access to zizzer.


Thanks,

Brad



-Original Message-
From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org]
On Behalf Of Cron Daemon
Sent: Friday, April 29, 2011 12:17 AM
To: m5-dev@m5sim.org
Subject: [m5-dev] Cron  /z/m5/regression/do-regression
quick

scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_RubyNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_BaseGarnetNetwork_wrap.cc'
.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_Topology_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_RubySystem_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_SimpleNetwork_wrap.cc'.
scons: *** Implicit dependency `build/ALPHA_SE/params/ExtLink.hh' not
found, needed by target
`build/ALPHA_SE/python/m5/internal/param_GarnetNetwork_d_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubyNetwo
rk_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_BaseGarnet
Network_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_Topology_w
rap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_RubySystem
_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetw
ork_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_SimpleNetw
ork_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_hammer/params/ExtLink.hh' not found, needed
by target
`build/ALPHA_SE_MOESI_hammer/python/m5/internal/param_GarnetNetw
ork_d_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubyN
etwork_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_BaseGa
rnetNetwork_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Topolo
gy_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_RubySy
stem_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Garnet
Network_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Simple
Network_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MESI_CMP_directory/python/m5/internal/param_Garnet
Network_d_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_Ruby
Network_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MOESI_CMP_directory/python/m5/internal/param_Base
GarnetNetwork_wrap.cc'.
scons: *** Implicit dependency
`build/ALPHA_SE_MOESI_CMP_directory/params/ExtLink.hh' not found,
needed by target
`build/ALPHA_SE_MOESI_CMP_directory

Re: [m5-dev] Review Request: NetworkTest: added sim_cycles parameter to the network tester.

2011-04-29 Thread Tushar Krishna

---
This is an automatically generated e-mail. To reply, visit:
http://reviews.m5sim.org/r/660/#review1172
---



src/cpu/testers/networktest/networktest.cc


Hey Brad,
One concern that I have with my current implementation here is that if 
--fixed-pkts is enabled, then the tester is not scheduled after injecting 
maxPackets. 
Once all packets are delivered (=> no more events from the network side as 
well), there is no agent to call exitSimLoop to end the simulation, so it ends 
at m5's max tick (9223372036854775807) cycles. This does not slow down the 
simulation (since there are no events after all delivery), and is ok. But it 
does screw up the power stats etc which use Ruby_cycles, and sort of looks ugly 
since m5 prints out that the simulation ended after 9223372036854775807 cycles.

One option is to end the simulation as soon as the tester injects 
maxPackets, but that wont result in all packets getting delivered, defeating 
the purpose of fixed-pkts which I added for network debugging.

The other option is to keep scheduling the tester till simCycles, but 
simply stopping the generation of packets after maxPackets (this was what I was 
doing earlier). But this requires the simCycles input to be greater than the 
time by which all packets are expected to be injected (which depends upon 
maxPackets and injection rate).

[Unlike the ruby random tester, the tester here does not track anything to 
determine when everything is delivered].

Any suggestions?

Thanks,
Tushar


- Tushar


On 2011-04-25 16:18:04, Tushar Krishna wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://reviews.m5sim.org/r/660/
> ---
> 
> (Updated 2011-04-25 16:18:04)
> 
> 
> Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, Nathan 
> Binkert, and Brad Beckmann.
> 
> 
> Summary
> ---
> 
> NetworkTest: added sim_cycles parameter to the network tester.
> 
> The network tester terminates after injecting for sim_cycles
> (default=1000), instead of having to explicitly pass --maxtick from the
> command line as before. If fixed_pkts is enabled, the tester stops
> scheduling itself after injecting maxpackets number of packets.
> The tester also works with zero command line arguments now.
> 
> 
> Diffs
> -
> 
>   configs/example/ruby_network_test.py de679a068dd8 
>   src/cpu/testers/networktest/NetworkTest.py de679a068dd8 
>   src/cpu/testers/networktest/networktest.hh de679a068dd8 
>   src/cpu/testers/networktest/networktest.cc de679a068dd8 
> 
> Diff: http://reviews.m5sim.org/r/660/diff
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Tushar
> 
>

___
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev


[m5-dev] Review Request: network: added Torus and Pt2Pt topologies

2011-04-29 Thread Tushar Krishna

---
This is an automatically generated e-mail. To reply, visit:
http://reviews.m5sim.org/r/667/
---

Review request for Default, Ali Saidi, Gabe Black, Steve Reinhardt, Nathan 
Binkert, and Brad Beckmann.


Summary
---

network: added Torus and Pt2Pt topologies


Diffs
-

  src/mem/ruby/network/topologies/Pt2Pt.py PRE-CREATION 
  src/mem/ruby/network/topologies/SConscript 7939dd0c4ff2 
  src/mem/ruby/network/topologies/Torus.py PRE-CREATION 

Diff: http://reviews.m5sim.org/r/667/diff


Testing
---


Thanks,

Tushar

___
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev