From 46450c3563a96c67dc089d8ab874a40928bb2ee4 Mon Sep 17 00:00:00 2001 From: Josef Weidendorfer Date: Thu, 10 Jun 2010 12:50:22 +0000 Subject: [PATCH] Fix typo introduced with r11165, include "Ge" in regtests git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11170 --- callgrind/sim.c | 4 ++-- callgrind/tests/Makefile.am | 3 ++- callgrind/tests/threads-use.stderr.exp | 20 ++++++++++++++++++++ callgrind/tests/threads-use.vgtest | 3 +++ callgrind/tests/threads.stderr.exp | 2 +- callgrind/tests/threads.vgtest | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 callgrind/tests/threads-use.stderr.exp create mode 100644 callgrind/tests/threads-use.vgtest diff --git a/callgrind/sim.c b/callgrind/sim.c index 42824561dd..01fd5bc279 100644 --- a/callgrind/sim.c +++ b/callgrind/sim.c @@ -1778,8 +1778,8 @@ void CLG_(init_eventsets)() } 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) diff --git a/callgrind/tests/Makefile.am b/callgrind/tests/Makefile.am index 03e0f9f764..2fb9fe2655 100644 --- a/callgrind/tests/Makefile.am +++ b/callgrind/tests/Makefile.am @@ -15,7 +15,8 @@ EXTRA_DIST = \ 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 diff --git a/callgrind/tests/threads-use.stderr.exp b/callgrind/tests/threads-use.stderr.exp new file mode 100644 index 0000000000..4f0bb99485 --- /dev/null +++ b/callgrind/tests/threads-use.stderr.exp @@ -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: diff --git a/callgrind/tests/threads-use.vgtest b/callgrind/tests/threads-use.vgtest new file mode 100644 index 0000000000..6299b1fb68 --- /dev/null +++ b/callgrind/tests/threads-use.vgtest @@ -0,0 +1,3 @@ +prog: threads +vgopts: --separate-threads=yes --cacheuse=yes --collect-bus=yes --collect-systime=yes +cleanup: rm callgrind.out.* diff --git a/callgrind/tests/threads.stderr.exp b/callgrind/tests/threads.stderr.exp index d0b7820ae3..da443cf50e 100644 --- a/callgrind/tests/threads.stderr.exp +++ b/callgrind/tests/threads.stderr.exp @@ -1,6 +1,6 @@ -Events : Ir +Events : Ir Ge Collected : I refs: diff --git a/callgrind/tests/threads.vgtest b/callgrind/tests/threads.vgtest index d015eebb5e..4ff103aabe 100644 --- a/callgrind/tests/threads.vgtest +++ b/callgrind/tests/threads.vgtest @@ -1,3 +1,3 @@ prog: threads -vgopts: --separate-threads=yes +vgopts: --separate-threads=yes --collect-bus=yes cleanup: rm callgrind.out.* -- 2.47.2