Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/25943 )
Change subject: tests: Migrated 51.memcheck scons-based tests to testlib
......................................................................
tests: Migrated 51.memcheck scons-based tests to testlib
"configs/example/memcheck.py" has been modified to keep the generated
"memcheck.cfg" in the "configs/example" directory. This generated file
is now ignored by git.
Change-Id: I19fab96419aa29e851139e759cc88b96465dd668
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/25943
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M .gitignore
M configs/example/memcheck.py
A tests/gem5/memcheck/test_memcheck.py
3 files changed, 42 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/.gitignore b/.gitignore
index a55c03e..977e82b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
/system/arm/bootloader/arm64/boot.arm64
/system/arm/bootloader/arm64/boot_emm.arm64
/system/arm/bootloader/arm64/boot_v2.arm64
+configs/example/memcheck.cfg
diff --git a/configs/example/memcheck.py b/configs/example/memcheck.py
index 8d0082d..6d80d60 100644
--- a/configs/example/memcheck.py
+++ b/configs/example/memcheck.py
@@ -194,8 +194,9 @@
cache_proto.insert(0, next)
# Create a config to be used by all the traffic generators
-cfg_file_name = "configs/example/memcheck.cfg"
-cfg_file = open(cfg_file_name, 'w')
+cfg_file_name = "memcheck.cfg"
+cfg_file_path = os.path.dirname(__file__) + "/" +cfg_file_name
+cfg_file = open(cfg_file_path, 'w')
# Three states, with random, linear and idle behaviours. The random
# and linear states access memory in the range [0 : 16 Mbyte] with 8
@@ -213,7 +214,7 @@
cfg_file.close()
# Make a prototype for the tester to be used throughout
-proto_tester = TrafficGen(config_file = cfg_file_name)
+proto_tester = TrafficGen(config_file = cfg_file_path)
# Set up the system along with a DRAM controller
system = System(physmem = DDR3_1600_8x8())
diff --git a/tests/gem5/memcheck/test_memcheck.py
b/tests/gem5/memcheck/test_memcheck.py
new file mode 100644
index 0000000..9709dd5
--- /dev/null
+++ b/tests/gem5/memcheck/test_memcheck.py
@@ -0,0 +1,37 @@
+# Copyright (c) 2020 The Regents of the University of California
+# 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.
+
+from testlib import *
+
+gem5_verify_config(
+ name='test-memcheck',
+ fixtures=(),
+ verifiers=verifiers,
+ config=joinpath(config.base_dir, 'configs', 'example','memcheck.py'),
+ config_args=['-m', '100000000000'],
+ valid_isas=('NULL',),
+ valid_hosts=constants.supported_hosts,
+)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/25943
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: I19fab96419aa29e851139e759cc88b96465dd668
Gerrit-Change-Number: 25943
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Mahyar Samani <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
