From 07f091d6ed63d9b54c0415eacc070c3ea67566fc Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 30 Jun 2007 17:59:45 -0700 Subject: [PATCH] Get rid of remaining traces of obsolete CoherenceProtocol object. --HG-- extra : convert_revision : c5555b00bef1b304a84886188ad2c0dcb4d7c5b9 --- configs/common/Caches.py | 1 - configs/splash2/cluster.py | 6 +----- configs/splash2/run.py | 4 ---- src/mem/cache/BaseCache.py | 1 - tests/configs/memtest.py | 1 - tests/configs/o3-timing-mp.py | 1 - tests/configs/simple-atomic-mp.py | 1 - tests/configs/simple-timing-mp.py | 1 - tests/configs/tsunami-simple-atomic-dual.py | 1 - tests/configs/tsunami-simple-atomic.py | 1 - tests/configs/tsunami-simple-timing-dual.py | 1 - tests/configs/tsunami-simple-timing.py | 1 - 12 files changed, 1 insertion(+), 19 deletions(-) diff --git a/configs/common/Caches.py b/configs/common/Caches.py index 4bff2c8a4..43a1c6378 100644 --- a/configs/common/Caches.py +++ b/configs/common/Caches.py @@ -35,7 +35,6 @@ class L1Cache(BaseCache): latency = '1ns' mshrs = 10 tgts_per_mshr = 5 - protocol = CoherenceProtocol(protocol='moesi') class L2Cache(BaseCache): assoc = 8 diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py index 799b85e6c..769bdcf5a 100644 --- a/configs/splash2/cluster.py +++ b/configs/splash2/cluster.py @@ -1,4 +1,4 @@ -# Copyright (c) 2006 The Regents of The University of Michigan +# Copyright (c) 2006-2007 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -51,9 +51,6 @@ parser.add_option("-n", "--numcpus", parser.add_option("-f", "--frequency", default = "1GHz", help="Frequency of each CPU") -parser.add_option("-p", "--protocol", - default="moesi", - help="The coherence protocol to use for the L1'a (i.e. MOESI, MOSI)") parser.add_option("--l1size", default = "32kB") parser.add_option("--l1latency", @@ -141,7 +138,6 @@ class L1(BaseCache): block_size = 64 mshrs = 12 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol=options.protocol) # ---------------------- # Base L2 Cache Definition diff --git a/configs/splash2/run.py b/configs/splash2/run.py index d051f1f1b..ff0a9448c 100644 --- a/configs/splash2/run.py +++ b/configs/splash2/run.py @@ -48,9 +48,6 @@ parser.add_option("-n", "--numcpus", parser.add_option("-f", "--frequency", default = "1GHz", help="Frequency of each CPU") -parser.add_option("-p", "--protocol", - default="moesi", - help="The coherence protocol to use for the L1'a (i.e. MOESI, MOSI)") parser.add_option("--l1size", default = "32kB") parser.add_option("--l1latency", @@ -162,7 +159,6 @@ class L1(BaseCache): block_size = 64 mshrs = 12 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol=options.protocol) # ---------------------- # Base L2 Cache Definition diff --git a/src/mem/cache/BaseCache.py b/src/mem/cache/BaseCache.py index 55b68f81f..86148f821 100644 --- a/src/mem/cache/BaseCache.py +++ b/src/mem/cache/BaseCache.py @@ -51,7 +51,6 @@ class BaseCache(MemObject): mshrs = Param.Int("number of MSHRs (max outstanding requests)") prioritizeRequests = Param.Bool(False, "always service demand misses first") - protocol = Param.CoherenceProtocol(NULL, "coherence protocol to use") repl = Param.Repl(NULL, "replacement policy") size = Param.MemorySize("capacity in bytes") split = Param.Bool(False, "whether or not this cache is split") diff --git a/tests/configs/memtest.py b/tests/configs/memtest.py index 6fe244acf..93ea4cc0e 100644 --- a/tests/configs/memtest.py +++ b/tests/configs/memtest.py @@ -38,7 +38,6 @@ class L1(BaseCache): block_size = 64 mshrs = 12 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/o3-timing-mp.py b/tests/configs/o3-timing-mp.py index 1ac9bd2e4..fc6a72a82 100644 --- a/tests/configs/o3-timing-mp.py +++ b/tests/configs/o3-timing-mp.py @@ -39,7 +39,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/simple-atomic-mp.py b/tests/configs/simple-atomic-mp.py index de0793d1c..bc0ced250 100644 --- a/tests/configs/simple-atomic-mp.py +++ b/tests/configs/simple-atomic-mp.py @@ -38,7 +38,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/simple-timing-mp.py b/tests/configs/simple-timing-mp.py index 1fd0e8c3c..0b400e6b7 100644 --- a/tests/configs/simple-timing-mp.py +++ b/tests/configs/simple-timing-mp.py @@ -38,7 +38,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/tsunami-simple-atomic-dual.py b/tests/configs/tsunami-simple-atomic-dual.py index 131095055..de8fe2474 100644 --- a/tests/configs/tsunami-simple-atomic-dual.py +++ b/tests/configs/tsunami-simple-atomic-dual.py @@ -40,7 +40,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/tsunami-simple-atomic.py b/tests/configs/tsunami-simple-atomic.py index 595b1aeda..2ba50273a 100644 --- a/tests/configs/tsunami-simple-atomic.py +++ b/tests/configs/tsunami-simple-atomic.py @@ -40,7 +40,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/tsunami-simple-timing-dual.py b/tests/configs/tsunami-simple-timing-dual.py index 47fba30ff..3b1a4f5cf 100644 --- a/tests/configs/tsunami-simple-timing-dual.py +++ b/tests/configs/tsunami-simple-timing-dual.py @@ -40,7 +40,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache diff --git a/tests/configs/tsunami-simple-timing.py b/tests/configs/tsunami-simple-timing.py index 999bde087..3f18c6848 100644 --- a/tests/configs/tsunami-simple-timing.py +++ b/tests/configs/tsunami-simple-timing.py @@ -41,7 +41,6 @@ class L1(BaseCache): block_size = 64 mshrs = 4 tgts_per_mshr = 8 - protocol = CoherenceProtocol(protocol='moesi') # ---------------------- # Base L2 Cache -- 2.30.2