From 3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48 Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:40 -0600 Subject: syscall_emul: [patch 5/22] remove LiveProcess class and use Process instead The EIOProcess class was removed recently and it was the only other class which derived from Process. Since every Process invocation is also a LiveProcess invocation, it makes sense to simplify the organization by combining the fields from LiveProcess into Process. --- tests/long/se/10.mcf/test.py | 2 +- tests/long/se/20.parser/test.py | 2 +- tests/long/se/30.eon/test.py | 2 +- tests/long/se/40.perlbmk/test.py | 2 +- tests/long/se/50.vortex/test.py | 2 +- tests/long/se/60.bzip2/test.py | 2 +- tests/long/se/70.twolf/test.py | 2 +- tests/quick/se/00.hello.mp/test.py | 6 +++--- tests/quick/se/00.hello/test.py | 4 ++-- tests/quick/se/01.hello-2T-smt/test.py | 4 ++-- tests/quick/se/02.insttest/test.py | 4 ++-- tests/quick/se/04.gpu/test.py | 6 +++--- tests/quick/se/10.mcf/test.py | 2 +- tests/quick/se/30.eon/test.py | 2 +- tests/quick/se/40.m5threads-test-atomic/test.py | 4 ++-- tests/quick/se/50.vortex/test.py | 2 +- tests/quick/se/70.twolf/test.py | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/long/se/10.mcf/test.py b/tests/long/se/10.mcf/test.py index 0ea3f370d..30245c61e 100644 --- a/tests/long/se/10.mcf/test.py +++ b/tests/long/se/10.mcf/test.py @@ -30,5 +30,5 @@ m5.util.addToPath('../configs/common') from cpu2000 import mcf workload = mcf(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() root.system.physmem.range=AddrRange('256MB') diff --git a/tests/long/se/20.parser/test.py b/tests/long/se/20.parser/test.py index fa72847c7..d15b341ac 100644 --- a/tests/long/se/20.parser/test.py +++ b/tests/long/se/20.parser/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import parser workload = parser(isa, opsys, 'mdred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/long/se/30.eon/test.py b/tests/long/se/30.eon/test.py index 2ad1ef429..c610c1699 100644 --- a/tests/long/se/30.eon/test.py +++ b/tests/long/se/30.eon/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import eon_cook workload = eon_cook(isa, opsys, 'mdred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/long/se/40.perlbmk/test.py b/tests/long/se/40.perlbmk/test.py index cf29421ba..2d97c80a6 100644 --- a/tests/long/se/40.perlbmk/test.py +++ b/tests/long/se/40.perlbmk/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import perlbmk_makerand workload = perlbmk_makerand(isa, opsys, 'mdred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/long/se/50.vortex/test.py b/tests/long/se/50.vortex/test.py index 794a11aa1..66b95d312 100644 --- a/tests/long/se/50.vortex/test.py +++ b/tests/long/se/50.vortex/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import vortex workload = vortex(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/long/se/60.bzip2/test.py b/tests/long/se/60.bzip2/test.py index c217f159c..b7e268864 100644 --- a/tests/long/se/60.bzip2/test.py +++ b/tests/long/se/60.bzip2/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import bzip2_source workload = bzip2_source(isa, opsys, 'lgred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/long/se/70.twolf/test.py b/tests/long/se/70.twolf/test.py index 5b99b86fa..a63442ad1 100644 --- a/tests/long/se/70.twolf/test.py +++ b/tests/long/se/70.twolf/test.py @@ -31,7 +31,7 @@ from cpu2000 import twolf import os workload = twolf(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() cwd = root.system.cpu[0].workload[0].cwd #Remove two files who's presence or absence affects execution diff --git a/tests/quick/se/00.hello.mp/test.py b/tests/quick/se/00.hello.mp/test.py index 91fbfb7ed..de1214460 100644 --- a/tests/quick/se/00.hello.mp/test.py +++ b/tests/quick/se/00.hello.mp/test.py @@ -35,10 +35,10 @@ benchmarks = [ ] for i, cpu in zip(range(len(cpus)), root.system.cpu): - p = LiveProcess() + p = Process() p.executable = benchmarks[i*2] p.cmd = benchmarks[(i*2)+1] root.system.cpu[i].workload = p root.system.cpu[i].max_insts_all_threads = 10000000 -#root.system.cpu.workload = LiveProcess(cmd = 'hello', - # executable = binpath('hello')) +#root.system.cpu.workload = Process(cmd = 'hello', + # executable = binpath('hello')) diff --git a/tests/quick/se/00.hello/test.py b/tests/quick/se/00.hello/test.py index c37f8415c..669867739 100644 --- a/tests/quick/se/00.hello/test.py +++ b/tests/quick/se/00.hello/test.py @@ -26,7 +26,7 @@ # # Authors: Steve Reinhardt -root.system.cpu[0].workload = LiveProcess(cmd = 'hello', - executable = binpath('hello')) +root.system.cpu[0].workload = Process(cmd = 'hello', + executable = binpath('hello')) if root.system.cpu[0].checker != NULL: root.system.cpu[0].checker.workload = root.system.cpu[0].workload diff --git a/tests/quick/se/01.hello-2T-smt/test.py b/tests/quick/se/01.hello-2T-smt/test.py index 6f8b18361..b6c3c71a2 100644 --- a/tests/quick/se/01.hello-2T-smt/test.py +++ b/tests/quick/se/01.hello-2T-smt/test.py @@ -26,7 +26,7 @@ # # Authors: Korey Sewell -process1 = LiveProcess(cmd = 'hello', executable = binpath('hello')) -process2 = LiveProcess(cmd = 'hello', executable = binpath('hello')) +process1 = Process(cmd = 'hello', executable = binpath('hello')) +process2 = Process(cmd = 'hello', executable = binpath('hello')) root.system.cpu[0].workload = [process1, process2] diff --git a/tests/quick/se/02.insttest/test.py b/tests/quick/se/02.insttest/test.py index 23e028d25..2899dd1be 100644 --- a/tests/quick/se/02.insttest/test.py +++ b/tests/quick/se/02.insttest/test.py @@ -26,5 +26,5 @@ # # Authors: Ali Saidi -root.system.cpu[0].workload = LiveProcess(cmd = 'insttest', - executable = binpath('insttest')) +root.system.cpu[0].workload = Process(cmd = 'insttest', + executable = binpath('insttest')) diff --git a/tests/quick/se/04.gpu/test.py b/tests/quick/se/04.gpu/test.py index a074a8144..0de781c88 100644 --- a/tests/quick/se/04.gpu/test.py +++ b/tests/quick/se/04.gpu/test.py @@ -42,7 +42,7 @@ else: driver = ClDriver(filename="hsa", codefile=kernel_files) root.system.cpu[2].cl_driver = driver -root.system.cpu[0].workload = LiveProcess(cmd = 'gpu-hello', - executable = binpath('gpu-hello'), - drivers = [driver]) +root.system.cpu[0].workload = Process(cmd = 'gpu-hello', + executable = binpath('gpu-hello'), + drivers = [driver]) diff --git a/tests/quick/se/10.mcf/test.py b/tests/quick/se/10.mcf/test.py index 0ea3f370d..30245c61e 100644 --- a/tests/quick/se/10.mcf/test.py +++ b/tests/quick/se/10.mcf/test.py @@ -30,5 +30,5 @@ m5.util.addToPath('../configs/common') from cpu2000 import mcf workload = mcf(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() root.system.physmem.range=AddrRange('256MB') diff --git a/tests/quick/se/30.eon/test.py b/tests/quick/se/30.eon/test.py index 2ad1ef429..c610c1699 100644 --- a/tests/quick/se/30.eon/test.py +++ b/tests/quick/se/30.eon/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import eon_cook workload = eon_cook(isa, opsys, 'mdred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/quick/se/40.m5threads-test-atomic/test.py b/tests/quick/se/40.m5threads-test-atomic/test.py index 50976c771..f0110d5ea 100755 --- a/tests/quick/se/40.m5threads-test-atomic/test.py +++ b/tests/quick/se/40.m5threads-test-atomic/test.py @@ -1,5 +1,5 @@ -process = LiveProcess(executable = binpath('m5threads', 'test_atomic'), - cmd = ['test_atomic', str(nb_cores)]) +process = Process(executable = binpath('m5threads', 'test_atomic'), + cmd = ['test_atomic', str(nb_cores)]) for i in range(nb_cores): root.system.cpu[i].workload = process diff --git a/tests/quick/se/50.vortex/test.py b/tests/quick/se/50.vortex/test.py index 794a11aa1..66b95d312 100644 --- a/tests/quick/se/50.vortex/test.py +++ b/tests/quick/se/50.vortex/test.py @@ -30,4 +30,4 @@ m5.util.addToPath('../configs/common') from cpu2000 import vortex workload = vortex(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() diff --git a/tests/quick/se/70.twolf/test.py b/tests/quick/se/70.twolf/test.py index 5b99b86fa..a63442ad1 100644 --- a/tests/quick/se/70.twolf/test.py +++ b/tests/quick/se/70.twolf/test.py @@ -31,7 +31,7 @@ from cpu2000 import twolf import os workload = twolf(isa, opsys, 'smred') -root.system.cpu[0].workload = workload.makeLiveProcess() +root.system.cpu[0].workload = workload.makeProcess() cwd = root.system.cpu[0].workload[0].cwd #Remove two files who's presence or absence affects execution -- cgit v1.2.3