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

misc: Merge branch 'release-staging-v20.1.0.0' into develop

Browse Source 
Change-Id: I3694b251855b969c7bd3807f34e1b4241d47d586
This commit is contained in:
Bobby R. Bruce
2020-09-30 20:39:06 -07:00
parent dcf242d838 090fa08c14
commit d0772a0bfe
33 changed files with 198 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gem5/cpu_tests/ref/Bubblesort
View File

@@ -1,6 +1,2 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
-50000

4
tests/gem5/cpu_tests/ref/FloatMM
View File

@@ -1,6 +1,2 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
-776.000061

4
tests/gem5/dram-lowp/ref/simout
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
--- Done DRAM low power sweep ---
Fixed params -

21
tests/gem5/fixture.py
View File

@@ -42,6 +42,7 @@ import shutil
import sys
import socket
import threading
import gzip
from six.moves import urllib
@@ -260,11 +261,11 @@ class DownloadedProgram(UniqueFixture):
and downloads an updated version if it is needed.
"""
def __new__(cls, url, path, filename):
def __new__(cls, url, path, filename, gzip_decompress=False):
target = joinpath(path, filename)
return super(DownloadedProgram, cls).__new__(cls, target)
def _init(self, url, path, filename, **kwargs):
def _init(self, url, path, filename, gzip_decompress=False, **kwargs):
"""
url: string
The url of the archive
@@ -272,12 +273,16 @@ class DownloadedProgram(UniqueFixture):
The absolute path of the directory containing the archive
filename: string
The name of the archive
gzip_decompress: boolean
True if this target resource have been compressed using gzip and
is to be decompressed prior to usage.
"""
self.url = url
self.path = path
self.filename = joinpath(path, filename)
self.name = "Downloaded:" + self.filename
self.gzip_decompress = gzip_decompress
def _download(self):
import errno
@@ -288,7 +293,17 @@ class DownloadedProgram(UniqueFixture):
except OSError as e:
if e.errno != errno.EEXIST:
raise
urllib.request.urlretrieve(self.url, self.filename)
if self.gzip_decompress:
gzipped_filename = self.filename + ".gz"
urllib.request.urlretrieve(self.url, gzipped_filename)
with open(self.filename, 'w') as outfile:
with gzip.open(gzipped_filename, 'r') as infile:
shutil.copyfileobj(infile, outfile)
os.remove(gzipped_filename)
else:
urllib.request.urlretrieve(self.url, self.filename)
def _getremotetime(self):
import datetime, time

0
tests/gem5/hello_se/ref/simerr
View File

4
tests/gem5/hello_se/ref/simout
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
**** REAL SIMULATION ****
Hello world!

4
tests/gem5/insttest_se/ref/sparc/linux/insttest/simout
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
**** REAL SIMULATION ****
Begining test of difficult SPARC instructions...

4
tests/gem5/learning_gem5/ref/hello
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
Beginning simulation!
Hello world!

4
tests/gem5/learning_gem5/ref/hello_goodbye
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
Beginning simulation!
Exiting @ tick 10944163 because Goodbye hello!! Goodbye hello!! Goodbye hello!! Goodbye hello!! Goodbye hello!! Goodbye hello!! Goo

4
tests/gem5/learning_gem5/ref/simple
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
Hello World! From a SimObject!
Beginning simulation!

4
tests/gem5/learning_gem5/ref/test
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000 ticks per second
Beginning simulation!
Exiting @ tick 9981 because Ruby Tester completed

4
tests/gem5/learning_gem5/ref/threads
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
Beginning simulation!
Running on 2 cores. with 100 values

4
tests/gem5/m5threads_test_atomic/ref/sparc64/simout
View File

@@ -1,7 +1,3 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
Global frequency set at 1000000000000 ticks per second
Init done
[Iteration 1, Thread 1] Got lock

3
tests/gem5/verifier.py
View File

@@ -115,6 +115,9 @@ class DerivedGoldStandard(MatchGoldStandard):
class MatchStdout(DerivedGoldStandard):
_file = constants.gem5_simulation_stdout
_default_ignore_regex = [
re.compile('^\s+$'), # Remove blank lines.
re.compile('^gem5 Simulator System'),
re.compile('^gem5 is copyrighted software'),
re.compile('^Redirecting (stdout|stderr) to'),
re.compile('^gem5 version '),
re.compile('^gem5 compiled '),

4
tests/gem5/x86-boot-tests/test_linux_boot.py
View File

@@ -34,13 +34,13 @@ else:
base_path = joinpath(absdirpath(__file__), '..', 'resources',
'ubuntu-boot')
image_url = config.resource_url + '/images/x86/ubuntu-18-04/base.img'
image_url = config.resource_url + '/images/x86/ubuntu-18-04/base.img.gz'
kernel_url = config.resource_url + '/kernels/x86/static/vmlinux-4.19.83'
image_name = 'ubuntu-18-04-base.img'
kernel_name = 'vmlinux-4.19.83' # 4.19 is LTS (Projected EOL: Dec, 2020)
image = DownloadedProgram(image_url, base_path, image_name)
image = DownloadedProgram(image_url, base_path, image_name, True)
kernel = DownloadedProgram(kernel_url, base_path, kernel_name)