diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
| commit | a7904e2cf341d5452c5622adfcbdcd268d4ab7d1 (patch) | |
| tree | 76c744e731c275b393130b869c2c2944807a77af /src/mem/ruby/config | |
| parent | 5b080ae0463c9644eb81bd923e25139dfe787e6e (diff) | |
| download | gem5-a7904e2cf341d5452c5622adfcbdcd268d4ab7d1.tar.xz | |
ruby: apply some fixes that were overwritten by the recent ruby import.
Diffstat (limited to 'src/mem/ruby/config')
| -rw-r--r-- | src/mem/ruby/config/MI_example-homogeneous.rb | 2 | ||||
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.hh | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mem/ruby/config/MI_example-homogeneous.rb b/src/mem/ruby/config/MI_example-homogeneous.rb index 8c2eef009..7dffb3957 100644 --- a/src/mem/ruby/config/MI_example-homogeneous.rb +++ b/src/mem/ruby/config/MI_example-homogeneous.rb @@ -13,7 +13,7 @@ require "cfg.rb" num_cores = 16 L1_CACHE_SIZE_KB = 32 L1_CACHE_ASSOC = 8 -L1_CACHE_LATENCY = "auto" +L1_CACHE_LATENCY = 2 num_memories = 2 memory_size_mb = 1024 NUM_DMA = 1 diff --git a/src/mem/ruby/config/RubyConfig.cc b/src/mem/ruby/config/RubyConfig.cc index 987a3d81d..4ecec4da6 100644 --- a/src/mem/ruby/config/RubyConfig.cc +++ b/src/mem/ruby/config/RubyConfig.cc @@ -220,7 +220,7 @@ static void print_parameters(ostream& out) #define PARAM_ARRAY( NAME, TYPE, DEFAULT_ARRAY_SIZE, DEFAULT_VALUE, CUSTOM_ACCESSOR ) { out << #NAME << ": ARRAY" << endl; } #define PARAM_ARRAY2D( NAME, TYPE, D1_DEFAULT_ARRAY_SIZE, D2_DEFAULT_ARRAY_SIZE, DEFAULT_VALUE, CUSTOM_ACCESSOR ) { out << #NAME << ": ARRAY2D" << endl; } #define PARAM_ARRAY3D( NAME, TYPE, D1_DEFAULT_ARRAY_SIZE, D2_DEFAULT_ARRAY_SIZE, D3_DEFAULT_ARRAY_SIZE, DEFAULT_VALUE, CUSTOM_ACCESSOR ) { out << #NAME << ": ARRAY3D" << endl; } -#include CONFIG_VAR_FILENAME +#include "mem/ruby/config/config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG diff --git a/src/mem/ruby/config/RubyConfig.hh b/src/mem/ruby/config/RubyConfig.hh index f2e3a0f13..8ad733385 100644 --- a/src/mem/ruby/config/RubyConfig.hh +++ b/src/mem/ruby/config/RubyConfig.hh @@ -46,7 +46,6 @@ #include <assert.h> #include "mem/ruby/common/TypeDefines.hh" -#define CONFIG_VAR_FILENAME "mem/ruby/config/config.hh" // Set paramterization /* @@ -182,7 +181,7 @@ public: array2d_accessor_##CUSTOM_ACCESSOR(TYPE, NAME) #define PARAM_ARRAY3D( NAME, TYPE, D1_DEFAULT_ARRAY_SIZE, D2_DEFAULT_ARRAY_SIZE, D3_DEFAULT_ARRAY_SIZE, DEFAULT_VALUE, CUSTOM_ACCESSOR ) \ array3d_accessor_##CUSTOM_ACCESSOR(TYPE, NAME) -#include CONFIG_VAR_FILENAME +#include "mem/ruby/config/config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -214,7 +213,7 @@ private: static TYPE** m_##NAME; #define PARAM_ARRAY3D( NAME, TYPE, D1_DEFAULT_ARRAY_SIZE, D2_DEFAULT_ARRAY_SIZE, D3_DEFAULT_ARRAY_SIZE, DEFAULT_VALUE, CUSTOM_ACCESSOR ) \ static TYPE*** m_##NAME; -#include CONFIG_VAR_FILENAME +#include "mem/ruby/config/config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG |