style: Strip newline when checking lines

[gem5.git] / tests / configs / tsunami-simple-atomic-dual.py

diff --git a/tests/configs/tsunami-simple-atomic-dual.py b/tests/configs/tsunami-simple-atomic-dual.py
index 6bcefd74f6afef689e1859763da7118cf6b7f40b..f54015cd36ca07d26dce9c4b12d4aa85333d9d88 100644 (file)
--- a/tests/configs/tsunami-simple-atomic-dual.py
+++ b/tests/configs/tsunami-simple-atomic-dual.py
@@ -1,6 +1,15 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2012 ARM Limited
 # All rights reserved.
 #
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder.  You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
 # 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
@@ -24,20 +33,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: Steve Reinhardt
+# Authors: Andreas Sandberg
 
-import m5
 from m5.objects import *
-m5.AddToPath('../configs/common')
-import FSConfig
-
-AlphaConsole.cpu = Parent.cpu[0]
-IntrControl.cpu = Parent.cpu[0]
-
-cpus = [ AtomicSimpleCPU() for i in xrange(2) ]
-system = FSConfig.makeLinuxAlphaSystem('atomic')
-system.cpu = cpus
-for c in cpus:
-    c.connectMemPorts(system.membus)
+from alpha_generic import *
 
-root = Root(clock = '2GHz', system = system)
+root = LinuxAlphaFSSystem(mem_mode='atomic',
+                          mem_class=SimpleMemory,
+                          cpu_class=AtomicSimpleCPU,
+                          num_cpus=2).create_root()