From 2072e7ff2037c19a0c346e60469949c9437569bf Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Sat, 16 Oct 2010 14:25:19 -0800
Subject: 1. refactoring histogram/logger so that classes are in header files
 2. starting to redo cache_t 3. deleting more perf counters 4. other minor
 cleaning

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7869]
---
 src/gpgpu-sim/gpu-cache.cc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/gpgpu-sim/gpu-cache.cc')

diff --git a/src/gpgpu-sim/gpu-cache.cc b/src/gpgpu-sim/gpu-cache.cc
index faa817f..c1acc83 100644
--- a/src/gpgpu-sim/gpu-cache.cc
+++ b/src/gpgpu-sim/gpu-cache.cc
@@ -81,7 +81,7 @@ cache_t::cache_t( const char *name,
                   const char *opt, 
                   enum cache_write_policy wp, 
                   int core_id, 
-                  int type_id) 
+                  int type_id ) 
 {
    unsigned int nset;
    unsigned int line_sz;
@@ -120,19 +120,18 @@ cache_t::cache_t( const char *name,
 
 enum cache_request_status cache_t::access( new_addr_type addr, bool write, unsigned int cycle, address_type *wb_address ) 
 {
+   m_access++;
+   unsigned set_index = (addr >> m_line_sz_log2) & ( (1<<m_nset_log2) - 1 );
+   new_addr_type tag = addr >> (m_line_sz_log2 + m_nset_log2);
+
    bool all_reserved = true;
    cache_block_t *pending_line = NULL;
    cache_block_t *clean_line = NULL;
-   new_addr_type bank_addr = addr; // offset within bank
 
-   unsigned set = (bank_addr >> m_line_sz_log2) & ( (1<<m_nset_log2) - 1 );
-   unsigned long long tag = bank_addr >> (m_line_sz_log2 + m_nset_log2);
-
-   m_access++;
    shader_cache_access_log(m_core_id, m_type_id, 0);
 
    for (unsigned way=0; way<m_assoc; way++) {
-      cache_block_t *line = &(m_lines[set*m_assoc+way] );
+      cache_block_t *line = &(m_lines[set_index*m_assoc+way] );
       if (line->tag == tag) {
          if (line->status & RESERVED) {
             pending_line = line;
@@ -185,7 +184,7 @@ enum cache_request_status cache_t::access( new_addr_type addr, bool write, unsig
    cache_block_t *wb_line = NULL;
            
    for (unsigned way=0; way<m_assoc; way++) {
-      cache_block_t *line = &(m_lines[set*m_assoc+way] );
+      cache_block_t *line = &(m_lines[set_index*m_assoc+way] );
       if (line->status & VALID && !(line->status & RESERVED)) {
          if (!wb_line) {
             wb_line = line;
-- 
cgit v1.3