From 7ecc7f50831c2bc65bdca2d945e2b094dadad142 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 16 Aug 2006 14:45:12 -0400 Subject: Update reference outputs --HG-- extra : convert_revision : df9cf835e0910df1e8e80152825fde9327d4aadb --- .../ref/alpha/eio/simple-atomic/config.ini | 24 +++++++++++----------- .../ref/alpha/eio/simple-atomic/config.out | 17 +++++++-------- .../ref/alpha/eio/simple-atomic/m5stats.txt | 10 ++++----- .../ref/alpha/eio/simple-atomic/stdout | 8 ++++---- .../ref/alpha/eio/simple-timing/stderr | 14 ++++++++++--- .../ref/alpha/eio/simple-timing/stdout | 13 +++++------- 6 files changed, 46 insertions(+), 40 deletions(-) (limited to 'tests/quick/20.eio-short/ref/alpha/eio') diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini index 4cbe1fce6..d322a7a40 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini @@ -48,13 +48,13 @@ text_file=m5stats.txt [system] type=System -children=cpu physmem workload +children=cpu membus physmem mem_mode=atomic physmem=system.physmem [system.cpu] type=AtomicSimpleCPU -children=mem +children=workload clock=1 defer_registration=false function_trace=false @@ -63,13 +63,20 @@ max_insts_all_threads=0 max_insts_any_thread=500000 max_loads_all_threads=0 max_loads_any_thread=0 -mem=system.cpu.mem +mem=system.physmem simulate_stalls=false system=system width=1 -workload=system.workload +workload=system.cpu.workload -[system.cpu.mem] +[system.cpu.workload] +type=EioProcess +chkpt= +file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +output=cout +system=system + +[system.membus] type=Bus bus_id=0 @@ -78,13 +85,6 @@ type=PhysicalMemory file= latency=1 -[system.workload] -type=EioProcess -chkpt= -file=/z/ktlim2/clean/newmem-merge/tests/test-progs/anagram/bin/anagram-vshort.eio.gz -output=cout -system=system - [trace] bufsize=0 dump_on_exit=false diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out index 65a9f6f7f..32bafae43 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out @@ -16,26 +16,26 @@ type=System physmem=system.physmem mem_mode=atomic -[system.workload] +[system.membus] +type=Bus +bus_id=0 + +[system.cpu.workload] type=EioProcess -file=/z/ktlim2/clean/newmem-merge/tests/test-progs/anagram/bin/anagram-vshort.eio.gz +file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz chkpt= output=cout system=system -[system.cpu.mem] -type=Bus -bus_id=0 - [system.cpu] type=AtomicSimpleCPU max_insts_any_thread=500000 max_insts_all_threads=0 max_loads_any_thread=0 max_loads_all_threads=0 -mem=system.cpu.mem +mem=system.physmem system=system -workload=system.workload +workload=system.cpu.workload clock=1 defer_registration=false width=1 @@ -81,6 +81,7 @@ print_data=true print_iregs=false print_fetchseq=false print_cpseq=false +print_reg_delta=false pc_symbol=true intel_format=false trace_system=client diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt index 29c0b91ac..e91773070 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 1310554 # Simulator instruction rate (inst/s) -host_mem_usage 147620 # Number of bytes of host memory used -host_seconds 0.38 # Real time elapsed on the host -host_tick_rate 1308843 # Simulator tick rate (ticks/s) +host_inst_rate 1501109 # Simulator instruction rate (inst/s) +host_mem_usage 146480 # Number of bytes of host memory used +host_seconds 0.33 # Real time elapsed on the host +host_tick_rate 1499216 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 500000 # Number of instructions simulated sim_seconds 0.000000 # Number of seconds simulated @@ -13,6 +13,6 @@ system.cpu.not_idle_fraction 1 # Pe system.cpu.numCycles 500000 # number of cpu cycles simulated system.cpu.num_insts 500000 # Number of instructions executed system.cpu.num_refs 182204 # Number of memory references -system.workload.PROG:num_syscalls 18 # Number of system calls +system.cpu.workload.PROG:num_syscalls 18 # Number of system calls ---------- End Simulation Statistics ---------- diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout index 80b37e259..2fa2166aa 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout @@ -7,8 +7,8 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Jul 27 2006 17:25:03 -M5 started Thu Jul 27 17:25:11 2006 -M5 executing on zamp.eecs.umich.edu -command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/test1/atomic tests/test1/run.py +M5 compiled Aug 16 2006 13:05:10 +M5 started Wed Aug 16 14:41:54 2006 +M5 executing on zizzer.eecs.umich.edu +command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/quick/20.eio-short/alpha/eio/simple-atomic tests/run.py quick/20.eio-short/alpha/eio/simple-atomic Exiting @ tick 499999 because a thread reached the max instruction count diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr index 4e444fa6b..6f99fb456 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr @@ -1,3 +1,11 @@ -warn: Entering event queue @ 0. Starting simulation... - -gzip: stdout: Broken pipe +Traceback (most recent call last): + File "", line 1, in ? + File "build/ALPHA_SE/python/m5/main.py", line 314, in main + execfile(sys.argv[0], scope) + File "tests/run.py", line 18, in ? + execfile(os.path.join(tests_root, 'configs', config + '.py')) + File "tests/configs/simple-timing.py", line 13, in ? + MyCache(size = '2MB')) + File "build/ALPHA_SE/python/m5/objects/BaseCPU.py", line 52, in addTwoLevelCacheHierarchy + self.l2cache.cpu_side = toL2Bus.port +NameError: global name 'toL2Bus' is not defined diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout index c14f4a3c9..bb29247b4 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout @@ -1,14 +1,11 @@ -main dictionary has 1245 entries -49508 bytes wasted ->M5 Simulator System +M5 Simulator System Copyright (c) 2001-2006 The Regents of The University of Michigan All Rights Reserved -M5 compiled Jul 27 2006 17:25:03 -M5 started Thu Jul 27 17:25:14 2006 -M5 executing on zamp.eecs.umich.edu -command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/test1/timing tests/test1/run.py --timing -Exiting @ tick 680774 because a thread reached the max instruction count +M5 compiled Aug 16 2006 13:05:10 +M5 started Wed Aug 16 14:41:54 2006 +M5 executing on zizzer.eecs.umich.edu +command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/quick/20.eio-short/alpha/eio/simple-timing tests/run.py quick/20.eio-short/alpha/eio/simple-timing -- cgit v1.2.3