configs,ext,stdlib: Update DRAMSys integration (#525)
Recent breaking changes in the DRAMSys API require user code to be updated. These updates have been applied to the gem5 integration. Furthermore, as DRAMSys started to use CMake dependency management, it is no longer sensible to maintain two separate build systems for DRAMSys. The use of the DRAMSys integration in gem5 will therefore from now on require that CMake is installed on the target machine. Additionally, support for snapshots have been implemented into DRAMSys and coupled with gem5's checkpointing API.
This commit is contained in:
Derek Christ
38
ext/dramsys/CMakeLists.txt
Normal file
38
ext/dramsys/CMakeLists.txt
Normal file
@@ -0,0 +1,38 @@
|
||||
# Copyright (c) 2023 Fraunhofer IESE
|
||||
# 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.
|
||||
|
||||
cmake_minimum_required(VERSION 3.22.0)
|
||||
project(DRAMSys)
|
||||
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
|
||||
add_library(systemc INTERFACE)
|
||||
|
||||
target_include_directories(systemc INTERFACE "${SCONS_SOURCE_DIR}/src/systemc/ext/systemc_home/include")
|
||||
|
||||
add_library(SystemC::systemc ALIAS systemc)
|
||||
|
||||
add_subdirectory(DRAMSys)
|
||||
@@ -1,11 +1,13 @@
|
||||
Follow these steps to get DRAMSys as part of gem5
|
||||
Follow these steps to build DRAMSys as part of gem5
|
||||
|
||||
1. Go to ext/dramsys (this directory)
|
||||
2. Clone DRAMSys: 'git clone https://github.com/tukl-msd/DRAMSys DRAMSys'
|
||||
3. Change directory to DRAMSys: 'cd DRAMSys'
|
||||
4. Checkout the correct commit: 'git checkout -b gem5 09f6dcbb91351e6ee7cadfc7bc8b29d97625db8f'
|
||||
5. Recursively obtain the submodules: 'git submodule update --init --recursive'
|
||||
2. Clone DRAMSys: 'git clone https://github.com/tukl-msd/DRAMSys --branch v5.0 --depth 1 DRAMSys'
|
||||
|
||||
The latest verified working version is v5.0, but later versions might work too.
|
||||
gem5 will automatically pick up DRAMSys as an external module when it is rebuilt.
|
||||
|
||||
If you wish to run a simulation using the gem5 processor cores, make sure to enable the storage mode in DRAMSys.
|
||||
This is done by setting the value of the "StoreMode" key to "Store" in the base configuration file.
|
||||
Those configuration file can be found in 'DRAMSys/library/resources/configs/simulator'.
|
||||
|
||||
Currently, DRAMSys is only supported in conjunction with a cache. Running DRAMSys in Release mode without caches will silently fail!
|
||||
|
||||
@@ -25,72 +25,54 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
Import('env')
|
||||
Import("env")
|
||||
|
||||
build_root = Dir('../..').abspath
|
||||
src_root = Dir('DRAMSys/DRAMSys/library').srcnode().abspath
|
||||
build_root = Dir("../..").abspath
|
||||
build_current = Dir(".").abspath
|
||||
src_root = Dir(".").srcnode().abspath
|
||||
scons_root = Dir("#").abspath
|
||||
|
||||
# See if we got a cloned DRAMSys repo as a subdirectory and set the
|
||||
# HAVE_DRAMSys flag accordingly
|
||||
if not os.path.exists(Dir('.').srcnode().abspath + '/DRAMSys'):
|
||||
env['HAVE_DRAMSYS'] = False
|
||||
if not os.path.exists(Dir(".").srcnode().abspath + "/DRAMSys"):
|
||||
env["HAVE_DRAMSYS"] = False
|
||||
Return()
|
||||
|
||||
env['HAVE_DRAMSYS'] = True
|
||||
env["HAVE_DRAMSYS"] = True
|
||||
|
||||
dramsys_files = []
|
||||
dramsys_configuration_files = []
|
||||
subprocess.run(
|
||||
[
|
||||
"cmake",
|
||||
f"-S{src_root}",
|
||||
f"-B{build_current}",
|
||||
"-DCMAKE_BUILD_TYPE=Release",
|
||||
f"-DSCONS_SOURCE_DIR:STRING={scons_root}",
|
||||
"-DDRAMSYS_BUILD_CLI=OFF"
|
||||
],
|
||||
check=True
|
||||
)
|
||||
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/controller"))
|
||||
for root, dirs, files in os.walk(f"{src_root}/src/controller", topdown=False):
|
||||
for dir in dirs:
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % os.path.join(root, dir)))
|
||||
subprocess.run(
|
||||
["cmake", "--build", build_current],
|
||||
check=True
|
||||
)
|
||||
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/simulation"))
|
||||
for root, dirs, files in os.walk(f"{src_root}/src/simulation", topdown=False):
|
||||
for dir in dirs:
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % os.path.join(root, dir)))
|
||||
env.Append(LIBS="DRAMSys_libdramsys")
|
||||
env.Append(LIBPATH=Dir("./DRAMSys/src/libdramsys").abspath)
|
||||
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/configuration"))
|
||||
for root, dirs, files in os.walk(f"{src_root}/src/configuration", topdown=False):
|
||||
for dir in dirs:
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % os.path.join(root, dir)))
|
||||
env.Append(LIBS="DRAMSys_Configuration")
|
||||
env.Append(LIBPATH=Dir("./DRAMSys/src/configuration").abspath)
|
||||
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/error"))
|
||||
dramsys_files.extend(Glob(f"{src_root}/src/error/ECC/Bit.cpp"))
|
||||
dramsys_files.extend(Glob(f"{src_root}/src/error/ECC/ECC.cpp"))
|
||||
dramsys_files.extend(Glob(f"{src_root}/src/error/ECC/Word.cpp"))
|
||||
env.Append(LIBS="sqlite3")
|
||||
env.Append(LIBPATH=Dir("./DRAMSys/lib/sqlite3").abspath)
|
||||
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/common"))
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/common/configuration"))
|
||||
dramsys_files.extend(Glob("%s/*.cpp" % f"{src_root}/src/common/configuration/memspec"))
|
||||
dramsys_files.extend(Glob("%s/*.c" % f"{src_root}/src/common/third_party/sqlite-amalgamation"))
|
||||
env.Append(CPPPATH=src_root + "/DRAMSys/src/libdramsys")
|
||||
env.Append(CPPPATH=src_root + "/DRAMSys/src/configuration")
|
||||
env.Append(CPPPATH=src_root + "/DRAMSys/src/util")
|
||||
env.Append(CPPPATH=src_root + "/DRAMSys/lib/nlohmann_json/include")
|
||||
|
||||
env.Prepend(CPPPATH=[
|
||||
src_root + "/src",
|
||||
src_root + "/src/common/configuration",
|
||||
src_root + "/src/common/third_party/nlohmann/include",
|
||||
])
|
||||
|
||||
env.Prepend(CPPDEFINES=[("DRAMSysResourceDirectory", '\\"' + os.getcwd() + '/resources' + '\\"')])
|
||||
env.Prepend(CPPDEFINES=[("SYSTEMC_VERSION", 20191203)])
|
||||
|
||||
dramsys = env.Clone()
|
||||
|
||||
if '-Werror' in dramsys['CCFLAGS']:
|
||||
dramsys['CCFLAGS'].remove('-Werror')
|
||||
|
||||
dramsys.Prepend(CPPPATH=[
|
||||
src_root + "/src/common/third_party/sqlite-amalgamation",
|
||||
build_root + "/systemc/ext"
|
||||
])
|
||||
|
||||
dramsys.Prepend(CPPDEFINES=[("SQLITE_ENABLE_RTREE", "1")])
|
||||
|
||||
dramsys_configuration = env.Clone()
|
||||
|
||||
dramsys.Library('dramsys', dramsys_files)
|
||||
|
||||
env.Append(LIBS=['dramsys', 'dl'])
|
||||
env.Append(LIBPATH=[Dir('.')])
|
||||
env.Prepend(CPPDEFINES=[("DRAMSYS_RESOURCE_DIR",
|
||||
'\\"' + os.getcwd() + '/DRAMSys/configs' + '\\"')])
|
||||
|
||||
Reference in New Issue
Block a user