Get rid of remaining traces of obsolete CoherenceProtocol object.

--HG--
extra : convert_revision : c5555b00bef1b304a84886188ad2c0dcb4d7c5b9
This commit is contained in:
Steve Reinhardt 2007-06-30 17:59:45 -07:00
parent 2447abe5ce
commit 07f091d6ed
12 changed files with 1 additions and 19 deletions

View file

@ -35,7 +35,6 @@ class L1Cache(BaseCache):
latency = '1ns' latency = '1ns'
mshrs = 10 mshrs = 10
tgts_per_mshr = 5 tgts_per_mshr = 5
protocol = CoherenceProtocol(protocol='moesi')
class L2Cache(BaseCache): class L2Cache(BaseCache):
assoc = 8 assoc = 8

View file

@ -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. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # 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", parser.add_option("-f", "--frequency",
default = "1GHz", default = "1GHz",
help="Frequency of each CPU") 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", parser.add_option("--l1size",
default = "32kB") default = "32kB")
parser.add_option("--l1latency", parser.add_option("--l1latency",
@ -141,7 +138,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 12 mshrs = 12
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol=options.protocol)
# ---------------------- # ----------------------
# Base L2 Cache Definition # Base L2 Cache Definition

View file

@ -48,9 +48,6 @@ parser.add_option("-n", "--numcpus",
parser.add_option("-f", "--frequency", parser.add_option("-f", "--frequency",
default = "1GHz", default = "1GHz",
help="Frequency of each CPU") 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", parser.add_option("--l1size",
default = "32kB") default = "32kB")
parser.add_option("--l1latency", parser.add_option("--l1latency",
@ -162,7 +159,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 12 mshrs = 12
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol=options.protocol)
# ---------------------- # ----------------------
# Base L2 Cache Definition # Base L2 Cache Definition

View file

@ -51,7 +51,6 @@ class BaseCache(MemObject):
mshrs = Param.Int("number of MSHRs (max outstanding requests)") mshrs = Param.Int("number of MSHRs (max outstanding requests)")
prioritizeRequests = Param.Bool(False, prioritizeRequests = Param.Bool(False,
"always service demand misses first") "always service demand misses first")
protocol = Param.CoherenceProtocol(NULL, "coherence protocol to use")
repl = Param.Repl(NULL, "replacement policy") repl = Param.Repl(NULL, "replacement policy")
size = Param.MemorySize("capacity in bytes") size = Param.MemorySize("capacity in bytes")
split = Param.Bool(False, "whether or not this cache is split") split = Param.Bool(False, "whether or not this cache is split")

View file

@ -38,7 +38,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 12 mshrs = 12
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -39,7 +39,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -38,7 +38,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -38,7 +38,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -40,7 +40,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -40,7 +40,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -40,7 +40,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache

View file

@ -41,7 +41,6 @@ class L1(BaseCache):
block_size = 64 block_size = 64
mshrs = 4 mshrs = 4
tgts_per_mshr = 8 tgts_per_mshr = 8
protocol = CoherenceProtocol(protocol='moesi')
# ---------------------- # ----------------------
# Base L2 Cache # Base L2 Cache