changeset 6153b582c9b5 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=6153b582c9b5
description:
unittest: Fix build errors
Committed by: Nilay Vaish <[email protected]>
diffstat:
src/unittest/SConscript | 3 --
src/unittest/initest.cc | 2 +
src/unittest/rangemaptest.cc | 6 ++--
src/unittest/stattest.cc | 46 ++++++++++++++++++++++++++-----------------
src/unittest/symtest.cc | 2 +
5 files changed, 35 insertions(+), 24 deletions(-)
diffs (192 lines):
diff -r baaed1733069 -r 6153b582c9b5 src/unittest/SConscript
--- a/src/unittest/SConscript Wed Jan 29 23:21:26 2014 -0600
+++ b/src/unittest/SConscript Thu Jan 30 12:21:58 2014 -0600
@@ -37,9 +37,7 @@
UnitTest('cprintftest', 'cprintftest.cc')
UnitTest('cprintftime', 'cprintftest.cc')
UnitTest('initest', 'initest.cc')
-UnitTest('lrutest', 'lru_test.cc')
UnitTest('nmtest', 'nmtest.cc')
-UnitTest('offtest', 'offtest.cc')
UnitTest('rangemaptest', 'rangemaptest.cc')
UnitTest('refcnttest', 'refcnttest.cc')
UnitTest('strnumtest', 'strnumtest.cc')
@@ -51,4 +49,3 @@
UnitTest('symtest', 'symtest.cc')
UnitTest('tokentest', 'tokentest.cc')
-UnitTest('tracetest', 'tracetest.cc')
diff -r baaed1733069 -r 6153b582c9b5 src/unittest/initest.cc
--- a/src/unittest/initest.cc Wed Jan 29 23:21:26 2014 -0600
+++ b/src/unittest/initest.cc Thu Jan 30 12:21:58 2014 -0600
@@ -41,6 +41,8 @@
char *progname;
+void usage();
+
void
usage()
{
diff -r baaed1733069 -r 6153b582c9b5 src/unittest/rangemaptest.cc
--- a/src/unittest/rangemaptest.cc Wed Jan 29 23:21:26 2014 -0600
+++ b/src/unittest/rangemaptest.cc Thu Jan 30 12:21:58 2014 -0600
@@ -52,7 +52,7 @@
{
AddrRangeMap<int> r;
- AddrRangeMap<int>::iterator i;
+ AddrRangeMap<int>::const_iterator i;
i = r.insert(RangeIn(10, 40), 5);
assert(i != r.end());
@@ -61,7 +61,7 @@
i = r.find(RangeIn(20, 30));
assert(i != r.end());
- cout << i->first << " " << i->second << endl;
+ cout << i->first.to_string() << " " << i->second << endl;
i = r.find(RangeIn(55, 55));
assert(i == r.end());
@@ -74,7 +74,7 @@
i = r.find(RangeIn(20, 30));
assert(i != r.end());
- cout << i->first << " " << i->second << endl;
+ cout << i->first.to_string() << " " << i->second << endl;
return 0;
}
diff -r baaed1733069 -r 6153b582c9b5 src/unittest/stattest.cc
--- a/src/unittest/stattest.cc Wed Jan 29 23:21:26 2014 -0600
+++ b/src/unittest/stattest.cc Thu Jan 30 12:21:58 2014 -0600
@@ -49,6 +49,13 @@
using namespace std;
using namespace Stats;
+double testfunc();
+struct StatTest;
+StatTest & __stattest();
+void stattest_init();
+void stattest_run();
+
+
double
testfunc()
{
@@ -130,6 +137,9 @@
void
StatTest::init()
{
+ EventQueue *q = getEventQueue(0);
+ curEventQueue(q);
+
cprintf("sizeof(Scalar) = %d\n", sizeof(Scalar));
cprintf("sizeof(Vector) = %d\n", sizeof(Vector));
cprintf("sizeof(Distribution) = %d\n", sizeof(Distribution));
@@ -419,7 +429,7 @@
s15[9].sample(1234);
s10.sample(1000000000);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s10.sample(100000);
s10.sample(100000);
s10.sample(100000);
@@ -494,50 +504,50 @@
s15[0].sample(1234);
s15[1].sample(4134);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[4].sample(1213);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[3].sample(1124);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[2].sample(1243);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[7].sample(1244);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[4].sample(7234);
s15[2].sample(9234);
s15[3].sample(1764);
s15[7].sample(1564);
s15[3].sample(3234);
s15[1].sample(2234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[5].sample(1234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[9].sample(4334);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[2].sample(1234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[4].sample(4334);
s15[6].sample(1234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[8].sample(8734);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[1].sample(5234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[3].sample(8234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[7].sample(5234);
s15[4].sample(4434);
s15[3].sample(7234);
s15[2].sample(1934);
s15[1].sample(9234);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[5].sample(5634);
s15[3].sample(1264);
s15[7].sample(5223);
s15[0].sample(1234);
s15[0].sample(5434);
s15[3].sample(8634);
- curTick(curTick() + ULL(1000000));
+ curEventQueue()->setCurTick(curTick() + ULL(1000000));
s15[1].sample(1234);
s4 = curTick();
@@ -546,7 +556,7 @@
s3 = 12;
s3++;
- curTick(curTick() + 9);
+ curEventQueue()->setCurTick(curTick() + 9);
s1 = 9;
s1 += 9;
@@ -621,7 +631,7 @@
s9.sample(10);
s9.sample(10);
- curTick(curTick() + 9);
+ curEventQueue()->setCurTick(curTick() + 9);
s4 = curTick();
s6.sample(100);
s6.sample(100);
diff -r baaed1733069 -r 6153b582c9b5 src/unittest/symtest.cc
--- a/src/unittest/symtest.cc Wed Jan 29 23:21:26 2014 -0600
+++ b/src/unittest/symtest.cc Thu Jan 30 12:21:58 2014 -0600
@@ -35,6 +35,8 @@
using namespace std;
+void usage(const char *progname);
+
void
usage(const char *progname)
{
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
