|
From: <sv...@va...> - 2010-06-10 12:50:31
|
Author: weidendo
Date: 2010-06-10 13:50:22 +0100 (Thu, 10 Jun 2010)
New Revision: 11170
Log:
Fix typo introduced with r11165, include "Ge" in regtests
Added:
trunk/callgrind/tests/threads-use.stderr.exp
trunk/callgrind/tests/threads-use.vgtest
Modified:
trunk/callgrind/sim.c
trunk/callgrind/tests/Makefile.am
trunk/callgrind/tests/threads.stderr.exp
trunk/callgrind/tests/threads.vgtest
Modified: trunk/callgrind/sim.c
===================================================================
--- trunk/callgrind/sim.c 2010-06-10 06:26:21 UTC (rev 11169)
+++ trunk/callgrind/sim.c 2010-06-10 12:50:22 UTC (rev 11170)
@@ -1778,8 +1778,8 @@
}
else { // clo_simulate_writeback
CLG_(register_event_group4)(EG_IR, "Ir", "I1mr", "I2mr", "I2dmr");
- CLG_(register_event_group4)(EG_DR, "Dr", "D1mr", "D2mr", "I2dmr");
- CLG_(register_event_group4)(EG_DW, "Dw", "D1mw", "D2mw", "I2dmw");
+ CLG_(register_event_group4)(EG_DR, "Dr", "D1mr", "D2mr", "D2dmr");
+ CLG_(register_event_group4)(EG_DW, "Dw", "D1mw", "D2mw", "D2dmw");
}
if (CLG_(clo).collect_bus)
Modified: trunk/callgrind/tests/Makefile.am
===================================================================
--- trunk/callgrind/tests/Makefile.am 2010-06-10 06:26:21 UTC (rev 11169)
+++ trunk/callgrind/tests/Makefile.am 2010-06-10 12:50:22 UTC (rev 11170)
@@ -15,7 +15,8 @@
notpower2-wb.vgtest notpower2-wb.stderr.exp \
notpower2-hwpref.vgtest notpower2-hwpref.stderr.exp \
notpower2-use.vgtest notpower2-use.stderr.exp \
- threads.vgtest threads.stderr.exp
+ threads.vgtest threads.stderr.exp \
+ threads-use.vgtest threads-use.stderr.exp
check_PROGRAMS = clreq simwork threads
Added: trunk/callgrind/tests/threads-use.stderr.exp
===================================================================
--- trunk/callgrind/tests/threads-use.stderr.exp (rev 0)
+++ trunk/callgrind/tests/threads-use.stderr.exp 2010-06-10 12:50:22 UTC (rev 11170)
@@ -0,0 +1,20 @@
+
+
+Events : Ir Dr Dw I1mr D1mr D1mw I2mr D2mr D2mw AcCost1 SpLoss1 AcCost2 SpLoss2 Ge sysCount sysTime
+Collected :
+
+I refs:
+I1 misses:
+L2i misses:
+I1 miss rate:
+L2i miss rate:
+
+D refs:
+D1 misses:
+L2d misses:
+D1 miss rate:
+L2d miss rate:
+
+L2 refs:
+L2 misses:
+L2 miss rate:
Added: trunk/callgrind/tests/threads-use.vgtest
===================================================================
--- trunk/callgrind/tests/threads-use.vgtest (rev 0)
+++ trunk/callgrind/tests/threads-use.vgtest 2010-06-10 12:50:22 UTC (rev 11170)
@@ -0,0 +1,3 @@
+prog: threads
+vgopts: --separate-threads=yes --cacheuse=yes --collect-bus=yes --collect-systime=yes
+cleanup: rm callgrind.out.*
Modified: trunk/callgrind/tests/threads.stderr.exp
===================================================================
--- trunk/callgrind/tests/threads.stderr.exp 2010-06-10 06:26:21 UTC (rev 11169)
+++ trunk/callgrind/tests/threads.stderr.exp 2010-06-10 12:50:22 UTC (rev 11170)
@@ -1,6 +1,6 @@
-Events : Ir
+Events : Ir Ge
Collected :
I refs:
Modified: trunk/callgrind/tests/threads.vgtest
===================================================================
--- trunk/callgrind/tests/threads.vgtest 2010-06-10 06:26:21 UTC (rev 11169)
+++ trunk/callgrind/tests/threads.vgtest 2010-06-10 12:50:22 UTC (rev 11170)
@@ -1,3 +1,3 @@
prog: threads
-vgopts: --separate-threads=yes
+vgopts: --separate-threads=yes --collect-bus=yes
cleanup: rm callgrind.out.*
|