Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44109 )
Change subject: WIP,sim: Add unit test for SimObjects
......................................................................
WIP,sim: Add unit test for SimObjects
Add a unit test for sim/sim_object.
Change-Id: I9a27c213e78b25089d4f161bde06f0d4c49814fb
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/base/SConscript
M src/base/stats/SConscript
M src/sim/SConscript
M src/sim/probe/SConscript
A src/sim/sim_object.test.cc
5 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/base/SConscript b/src/base/SConscript
index bd63bdf..a4c619f 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -63,7 +63,7 @@
Source('logging.cc')
GTest('logging.test', 'logging.test.cc', 'logging.cc', 'hostinfo.cc',
'cprintf.cc', 'gtest/logging.cc', skip_lib=True)
-Source('match.cc', add_tags='gem5 trace')
+Source('match.cc', add_tags=['gem5 simobject', 'gem5 trace'])
GTest('match.test', 'match.test.cc', 'match.cc', 'str.cc')
Source('output.cc')
Source('pixel.cc')
diff --git a/src/base/stats/SConscript b/src/base/stats/SConscript
index d39543b..10c2aa0 100644
--- a/src/base/stats/SConscript
+++ b/src/base/stats/SConscript
@@ -29,7 +29,7 @@
Import('*')
-Source('group.cc')
+Source('group.cc', add_tags='gem5 simobject')
Source('info.cc')
Source('storage.cc')
Source('text.cc')
diff --git a/src/sim/SConscript b/src/sim/SConscript
index 77e7797..d7f74fe 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -45,7 +45,7 @@
Source('backtrace_%s.cc' % env['BACKTRACE_IMPL'], add_tags='gem5 trace')
Source('core.cc')
Source('cur_tick.cc', add_tags='gem5 trace')
-Source('tags.cc')
+Source('tags.cc', add_tags='gem5 simobject')
Source('cxx_config.cc')
Source('cxx_manager.cc')
Source('cxx_config_ini.cc')
@@ -55,7 +55,7 @@
Source('eventq.cc', add_tags='gem5 events')
Source('futex_map.cc')
Source('global_event.cc')
-Source('globals.cc')
+Source('globals.cc', add_tags='gem5 simobject')
Source('init.cc', add_tags='python')
Source('init_signals.cc')
Source('main.cc', tags='main')
@@ -67,7 +67,7 @@
Source('serialize.cc', add_tags='gem5 serialize')
Source('se_workload.cc')
Source('sim_events.cc', add_tags='gem5 drain')
-Source('sim_object.cc')
+Source('sim_object.cc', add_tags='gem5 simobject')
Source('sub_system.cc')
Source('ticked_object.cc')
Source('simulate.cc')
@@ -88,6 +88,8 @@
tag_implies('gem5 drain', ['gem5 events', 'gem5 trace'])
tag_implies('gem5 events', ['gem5 serialize', 'gem5 trace'])
tag_implies('gem5 serialize', 'gem5 trace')
+tag_implies('gem5 simobject',
+ ['gem5 drain', 'gem5 events', 'gem5 serialize', 'gem5 trace'])
GTest('byteswap.test', 'byteswap.test.cc', '../base/types.cc')
GTest('drain.test', 'drain.test.cc', with_tag('gem5 drain'))
@@ -99,6 +101,7 @@
GTest('proxy_ptr.test', 'proxy_ptr.test.cc')
GTest('serialize.test', 'serialize.test.cc', with_tag('gem5 serialize'))
GTest('serialize_handlers.test', 'serialize_handlers.test.cc')
+GTest('sim_object.test', 'sim_object.test.cc', with_tag('gem5 simobject'))
if env['TARGET_ISA'] != 'null':
SimObject('InstTracer.py')
diff --git a/src/sim/probe/SConscript b/src/sim/probe/SConscript
index 8123e4e..6e796a7 100644
--- a/src/sim/probe/SConscript
+++ b/src/sim/probe/SConscript
@@ -38,5 +38,5 @@
Import('*')
SimObject('Probe.py')
-Source('probe.cc')
+Source('probe.cc', add_tags='gem5 simobject')
DebugFlag('ProbeVerbose')
diff --git a/src/sim/sim_object.test.cc b/src/sim/sim_object.test.cc
new file mode 100644
index 0000000..eb26d58
--- /dev/null
+++ b/src/sim/sim_object.test.cc
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 Daniel R. Carvalho
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest-spi.h>
+#include <gtest/gtest.h>
+
+#include "sim/sim_object.hh"
+
+TEST(SimObjectTest, Test)
+{
+ SimObjectParams params;
+ params.eventq_index = 0;
+ SimObject test(params);
+}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44109
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9a27c213e78b25089d4f161bde06f0d4c49814fb
Gerrit-Change-Number: 44109
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
