sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merged changesets: 47e2adf7fb1a and b65d4e878ed2

Browse source 
--HG--
extra : amend_source : c51de9ae5387aba6fae8403677054678beceb2ab
This commit is contained in:
Nilay Vaish 2015-11-16 05:10:45 -06:00
commit 90d430d5b3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -209,10 +209,11 @@ use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH',
'PYTHONPATH', 'RANLIB', 'SWIG', 'TERM' ]) 'PYTHONPATH', 'RANLIB', 'SWIG', 'TERM' ])
use_prefixes = [ use_prefixes = [
"M5", # M5 configuration (e.g., path to kernels) "CCACHE_", # ccache (caching compiler wrapper) configuration
"DISTCC_", # distcc (distributed compiler wrapper) configuration "CCC_", # clang static analyzer configuration
"CCACHE_", # ccache (caching compiler wrapper) configuration "DISTCC_", # distcc (distributed compiler wrapper) configuration
"CCC_", # clang static analyzer configuration "INCLUDE_SERVER_", # distcc pump server settings
"M5", # M5 configuration (e.g., path to kernels)
] ]
use_env = {} use_env = {}

2
src/mem/cache/cache.hh vendored
View file

@ -304,7 +304,7 @@ class Cache : public BaseCache
* @param cmd Command of the incoming requesting packet * @param cmd Command of the incoming requesting packet
* @return Whether we should allocate on the fill * @return Whether we should allocate on the fill
*/ */
inline bool allocOnFill(MemCmd cmd) const inline bool allocOnFill(MemCmd cmd) const override
{ {
return clusivity == Enums::mostly_incl || return clusivity == Enums::mostly_incl ||
cmd == MemCmd::WriteLineReq || cmd == MemCmd::WriteLineReq ||