derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim: Move cur tick to its own files

Browse Source 
When declared within sim/core.hh, unit tests that use the
current tick would have to unnecessarily include many other
extra files.

Change-Id: Ib4348312afb90765edb4f94c80785df1275b2004
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39835
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
This commit is contained in:
Daniel R. Carvalho
2021-01-16 21:55:12 -03:00
committed by Daniel Carvalho
parent 4ff5fa567b
commit 3bb86373ee
5 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sim/SConscript
View File

@@ -44,6 +44,7 @@ SimObject('PowerDomain.py')
Source('async.cc')
Source('backtrace_%s.cc' % env['BACKTRACE_IMPL'])
Source('core.cc')
Source('cur_tick.cc')
Source('tags.cc')
Source('cxx_config.cc')
Source('cxx_manager.cc')

8
src/sim/core.cc
View File

@@ -37,14 +37,6 @@
#include "base/cprintf.hh"
#include "base/logging.hh"
#include "base/output.hh"
#include "sim/eventq.hh"
namespace Gem5Internal
{
__thread Tick *_curTickPtr;
} // namespace Gem5Internal
namespace SimClock {
/// The simulated frequency of curTick(). (In ticks per second)

14
src/sim/core.hh
View File

@@ -39,17 +39,9 @@
#include <string>
#include "base/types.hh"
namespace Gem5Internal
{
// This pointer is maintained by curEventQueue in src/sim/eventq.hh.
extern __thread Tick *_curTickPtr;
} // namespace Gem5Internal
/// The universal simulation clock.
inline Tick curTick() { return *Gem5Internal::_curTickPtr; }
// @todo The next include is not needed in this file, but must be kept
// until the transitive includes are fixed
#include "sim/cur_tick.hh"
/// These are variables that are set based on the simulator frequency
///@{

36
src/sim/cur_tick.cc Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (c) 2021 Daniel R. Carvalho
* All rights reserved.
*
* 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 "sim/cur_tick.hh"
namespace Gem5Internal
{
__thread Tick *_curTickPtr;
} // namespace Gem5Internal

45
src/sim/cur_tick.hh Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (c) 2021 Daniel R. Carvalho
* All rights reserved.
*
* 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.
*/
#ifndef __SIM_CUR_TICK_HH__
#define __SIM_CUR_TICK_HH__
#include "base/types.hh"
namespace Gem5Internal
{
// This pointer is maintained by curEventQueue in src/sim/eventq.hh.
extern __thread Tick *_curTickPtr;
} // namespace Gem5Internal
/// The universal simulation clock.
inline Tick curTick() { return *Gem5Internal::_curTickPtr; }
#endif /* __SIM_CUR_TICK_HH__ */