Merge branch 'dev' of https://github.com/purdue-aalp/gpgpu-sim_distribution into dev-private

1 files changed, 7 insertions, 4 deletions

diff --git a/src/gpgpu-sim/dram.h b/src/gpgpu-sim/dram.h
index 1ab0153..0bd9725 100644
--- a/src/gpgpu-sim/dram.h
+++ b/src/gpgpu-sim/dram.h
@@ -48,7 +48,7 @@
 
 class dram_req_t {
 public:
-   dram_req_t( class mem_fetch *data , unsigned banks, unsigned dram_bnk_indexing_policy);
+   dram_req_t( class mem_fetch *data , unsigned banks, unsigned dram_bnk_indexing_policy, class gpgpu_sim* gpu);
 
    unsigned int row;
    unsigned int col;
@@ -62,6 +62,7 @@ public:
    unsigned long long int addr;
    unsigned int insertion_time;
    class mem_fetch * data;
+   class gpgpu_sim * m_gpu;
 };
 
 struct bankgrp_t
@@ -105,12 +106,13 @@ enum bank_grp_bits_position{
 };
 
 class mem_fetch;
+class memory_config;
 
 class dram_t 
 {
 public:
-   dram_t( unsigned int parition_id, const struct memory_config *config, class memory_stats_t *stats, 
-           class memory_partition_unit *mp );
+   dram_t( unsigned int parition_id, const memory_config *config, class memory_stats_t *stats,
+           class memory_partition_unit *mp, class gpgpu_sim* gpu );
 
    bool full(bool is_write) const;
    void print( FILE* simFile ) const;
@@ -129,6 +131,7 @@ public:
    void dram_log (int task);
 
    class memory_partition_unit *m_memory_partition_unit;
+   class gpgpu_sim* m_gpu;
    unsigned int id;
 
    // Power Model
@@ -143,7 +146,7 @@ public:
 
 
 
-   const struct memory_config *m_config;
+   const memory_config *m_config;
 
 private:
    bankgrp_t **bkgrp;