From 141f61d83a23096dcff20df704bdd734c520f535 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 2 Apr 2010 11:20:32 -0700 Subject: ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base --- src/mem/ruby/system/CacheMemory.cc | 3 ++- src/mem/ruby/system/DirectoryMemory.cc | 10 +++++----- src/mem/ruby/system/MachineID.hh | 4 ++-- src/mem/ruby/system/MemoryControl.hh | 1 - src/mem/ruby/system/NodeID.hh | 4 ++-- src/mem/ruby/system/PersistentTable.cc | 1 - src/mem/ruby/system/Sequencer.cc | 1 + src/mem/ruby/system/System.cc | 7 ++++--- 8 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/mem/ruby/system') diff --git a/src/mem/ruby/system/CacheMemory.cc b/src/mem/ruby/system/CacheMemory.cc index 1e188fb60..62aa1e25d 100644 --- a/src/mem/ruby/system/CacheMemory.cc +++ b/src/mem/ruby/system/CacheMemory.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/intmath.hh" #include "mem/ruby/system/CacheMemory.hh" using namespace std; @@ -60,7 +61,7 @@ CacheMemory::init() m_cache_num_sets = (m_cache_size / m_cache_assoc) / RubySystem::getBlockSizeBytes(); assert(m_cache_num_sets > 1); - m_cache_num_set_bits = log_int(m_cache_num_sets); + m_cache_num_set_bits = floorLog2(m_cache_num_sets); assert(m_cache_num_set_bits > 0); if (m_policy == "PSEUDO_LRU") diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc index b3999fb3f..65b61c935 100644 --- a/src/mem/ruby/system/DirectoryMemory.cc +++ b/src/mem/ruby/system/DirectoryMemory.cc @@ -26,7 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/gems_common/util.hh" +#include "base/intmath.hh" #include "mem/ruby/slicc_interface/RubySlicc_Util.hh" #include "mem/ruby/system/DirectoryMemory.hh" #include "mem/ruby/system/System.hh" @@ -43,7 +43,7 @@ DirectoryMemory::DirectoryMemory(const Params *p) { m_version = p->version; m_size_bytes = p->size; - m_size_bits = log_int(m_size_bytes); + m_size_bits = floorLog2(m_size_bytes); m_num_entries = 0; m_use_map = p->use_map; m_map_levels = p->map_levels; @@ -56,7 +56,7 @@ DirectoryMemory::init() m_num_entries = m_size_bytes / RubySystem::getBlockSizeBytes(); if (m_use_map) { - int entry_bits = log_int(m_num_entries); + int entry_bits = floorLog2(m_num_entries); assert(entry_bits >= m_map_levels); m_sparseMemory = new SparseMemory(entry_bits, m_map_levels); } else { @@ -67,7 +67,7 @@ DirectoryMemory::init() } m_num_directories++; - m_num_directories_bits = log_int(m_num_directories); + m_num_directories_bits = floorLog2(m_num_directories); m_total_size_bytes += m_size_bytes; if (m_numa_high_bit == 0) { @@ -116,7 +116,7 @@ DirectoryMemory::printGlobalConfig(ostream & out) << endl; } out << " total memory size bytes: " << m_total_size_bytes << endl; - out << " total memory bits: " << log_int(m_total_size_bytes) << endl; + out << " total memory bits: " << floorLog2(m_total_size_bytes) << endl; } uint64 diff --git a/src/mem/ruby/system/MachineID.hh b/src/mem/ruby/system/MachineID.hh index 716196248..567d1f004 100644 --- a/src/mem/ruby/system/MachineID.hh +++ b/src/mem/ruby/system/MachineID.hh @@ -32,7 +32,7 @@ #include #include -#include "mem/gems_common/util.hh" +#include "base/cprintf.hh" #include "mem/protocol/MachineType.hh" #include "mem/ruby/common/Global.hh" @@ -45,7 +45,7 @@ struct MachineID inline std::string MachineIDToString(MachineID machine) { - return MachineType_to_string(machine.type)+"_"+int_to_string(machine.num); + return csprintf("%s_%d", MachineType_to_string(machine.type), machine.num); } inline bool diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh index 73646f623..839fd007c 100644 --- a/src/mem/ruby/system/MemoryControl.hh +++ b/src/mem/ruby/system/MemoryControl.hh @@ -34,7 +34,6 @@ #include #include "mem/gems_common/Map.hh" -#include "mem/gems_common/util.hh" #include "mem/protocol/MemoryMsg.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Consumer.hh" diff --git a/src/mem/ruby/system/NodeID.hh b/src/mem/ruby/system/NodeID.hh index 4ce8d8a8d..ed3486aaf 100644 --- a/src/mem/ruby/system/NodeID.hh +++ b/src/mem/ruby/system/NodeID.hh @@ -31,7 +31,7 @@ #include -#include "mem/gems_common/util.hh" +#include "base/str.hh" #include "mem/ruby/common/Global.hh" typedef int NodeID; @@ -39,7 +39,7 @@ typedef int NodeID; inline std::string NodeIDToString(NodeID node) { - return int_to_string(node); + return to_string(node); } #endif // __MEM_RUBY_SYSTEM_NODEID_HH__ diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/system/PersistentTable.cc index 64730ee29..a8e6b0323 100644 --- a/src/mem/ruby/system/PersistentTable.cc +++ b/src/mem/ruby/system/PersistentTable.cc @@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/gems_common/util.hh" #include "mem/ruby/system/PersistentTable.hh" using namespace std; diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 42bf7ebb5..dd8cec967 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/str.hh" #include "cpu/rubytest/RubyTester.hh" #include "mem/gems_common/Map.hh" #include "mem/protocol/CacheMsg.hh" diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index 418b31bf0..d28d74a89 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/intmath.hh" #include "base/output.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/common/Address.hh" @@ -63,14 +64,14 @@ RubySystem::RubySystem(const Params *p) m_clock = p->clock; m_block_size_bytes = p->block_size_bytes; - assert(is_power_of_2(m_block_size_bytes)); - m_block_size_bits = log_int(m_block_size_bytes); + assert(isPowerOf2(m_block_size_bytes)); + m_block_size_bits = floorLog2(m_block_size_bytes); m_memory_size_bytes = p->mem_size; if (m_memory_size_bytes == 0) { m_memory_size_bits = 0; } else { - m_memory_size_bits = log_int(m_memory_size_bytes); + m_memory_size_bits = floorLog2(m_memory_size_bytes); } m_network_ptr = p->network; -- cgit v1.2.3