Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/18528 )
Change subject: tests: Add missing kernels to system creation
......................................................................
tests: Add missing kernels to system creation
Change 149c1fc2d070a8ce073263880ecf2ccf7535e569 removed the
default value of the kernels, and fs tests rely on those.
Change-Id: I6d83420af5881ab59c2d223a9915f363dd8a1c69
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18528
Reviewed-by: Gabe Black <gabebl...@google.com>
Maintainer: Gabe Black <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M tests/configs/alpha_generic.py
M tests/configs/pc-simple-timing-ruby.py
M tests/configs/twosys-tsunami-simple-atomic.py
M tests/configs/x86_generic.py
4 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/configs/alpha_generic.py b/tests/configs/alpha_generic.py
index a5be4f2..3547f69 100644
--- a/tests/configs/alpha_generic.py
+++ b/tests/configs/alpha_generic.py
@@ -40,7 +40,7 @@
from m5.objects import *
from m5.proxy import *
m5.util.addToPath('../configs/')
-from common import FSConfig
+from common import FSConfig, SysPaths
from common.Caches import *
from base_config import *
@@ -60,6 +60,7 @@
def create_system(self):
system = FSConfig.makeLinuxAlphaSystem(self.mem_mode)
+ system.kernel = SysPaths.binary('vmlinux')
self.init_system(system)
return system
diff --git a/tests/configs/pc-simple-timing-ruby.py
b/tests/configs/pc-simple-timing-ruby.py
index 18c9909..ffac062 100644
--- a/tests/configs/pc-simple-timing-ruby.py
+++ b/tests/configs/pc-simple-timing-ruby.py
@@ -30,7 +30,7 @@
from m5.objects import *
m5.util.addToPath('../configs/')
from common.Benchmarks import SysConfig
-from common import FSConfig
+from common import FSConfig, SysPaths
from ruby import Ruby
from common import Options
@@ -54,6 +54,7 @@
mdesc = SysConfig(disk = 'linux-x86.img')
system = FSConfig.makeLinuxX86System('timing', options.num_cpus,
mdesc=mdesc, Ruby=True)
+system.kernel = SysPaths.binary('x86_64-vmlinux-2.6.22.9')
# Dummy voltage domain for all our clock domains
system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
diff --git a/tests/configs/twosys-tsunami-simple-atomic.py
b/tests/configs/twosys-tsunami-simple-atomic.py
index 7d0768e..3892745 100644
--- a/tests/configs/twosys-tsunami-simple-atomic.py
+++ b/tests/configs/twosys-tsunami-simple-atomic.py
@@ -29,11 +29,11 @@
import m5
from m5.objects import *
m5.util.addToPath('../configs/')
-from common.FSConfig import *
-from common.Benchmarks import *
+from common import Benchmarks, FSConfig, SysPaths
test_sys = makeLinuxAlphaSystem('atomic',
SysConfig('netperf-stream-client.rcS'))
+test_sys.kernel = SysPaths.binary('vmlinux')
# Dummy voltage domain for all test_sys clock domains
test_sys.voltage_domain = VoltageDomain()
@@ -70,6 +70,7 @@
drive_sys = makeLinuxAlphaSystem('atomic',
SysConfig('netperf-server.rcS'))
+drive_sys.kernel = SysPaths.binary('vmlinux')
# Dummy voltage domain for all drive_sys clock domains
drive_sys.voltage_domain = VoltageDomain()
# Create the system clock domain
diff --git a/tests/configs/x86_generic.py b/tests/configs/x86_generic.py
index 53c046a..e280fc5 100644
--- a/tests/configs/x86_generic.py
+++ b/tests/configs/x86_generic.py
@@ -41,7 +41,7 @@
from m5.proxy import *
m5.util.addToPath('../configs/')
from common.Benchmarks import SysConfig
-from common import FSConfig
+from common import FSConfig, SysPaths
from common.Caches import *
from base_config import *
@@ -60,6 +60,7 @@
system = FSConfig.makeLinuxX86System(self.mem_mode,
numCPUs=self.num_cpus,
mdesc=mdesc)
+ system.kernel = SysPaths.binary('x86_64-vmlinux-2.6.22.9')
self.init_system(system)
return system
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18528
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I6d83420af5881ab59c2d223a9915f363dd8a1c69
Gerrit-Change-Number: 18528
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
