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

1 files changed, 13 insertions, 8 deletions

diff --git a/src/gpgpu-sim/l2cache.h b/src/gpgpu-sim/l2cache.h
index 9a51c0e..0f6fe32 100644
--- a/src/gpgpu-sim/l2cache.h
+++ b/src/gpgpu-sim/l2cache.h
@@ -42,12 +42,12 @@ public:
     {
         m_memory_config = config;
     }
-    virtual mem_fetch * alloc(const class warp_inst_t &inst, const mem_access_t &access) const 
+    virtual mem_fetch * alloc(const class warp_inst_t &inst, const mem_access_t &access, unsigned long long cycle) const
     {
         abort();
         return NULL;
     }
-    virtual mem_fetch * alloc(new_addr_type addr, mem_access_type type, unsigned size, bool wr) const;
+    virtual mem_fetch * alloc(new_addr_type addr, mem_access_type type, unsigned size, bool wr, unsigned long long cycle) const;
 private:
     const memory_config *m_memory_config;
 };
@@ -58,7 +58,7 @@ private:
 class memory_partition_unit
 {
 public: 
-   memory_partition_unit( unsigned partition_id, const struct memory_config *config, class memory_stats_t *stats );
+   memory_partition_unit( unsigned partition_id, const memory_config *config, class memory_stats_t *stats, class gpgpu_sim* gpu );
    ~memory_partition_unit(); 
 
    bool busy() const;
@@ -94,10 +94,12 @@ public:
 
    unsigned get_mpid() const { return m_id; }
 
+   class gpgpu_sim* get_mgpu() const { return m_gpu; }
+
 private: 
 
    unsigned m_id;
-   const struct memory_config *m_config;
+   const memory_config *m_config;
    class memory_stats_t *m_stats;
    class memory_sub_partition **m_sub_partition; 
    class dram_t *m_dram;
@@ -105,7 +107,7 @@ private:
    class arbitration_metadata
    {
    public: 
-      arbitration_metadata(const struct memory_config *config); 
+      arbitration_metadata(const memory_config *config);
 
       // check if a subpartition still has credit 
       bool has_credits(int inner_sub_partition_id) const; 
@@ -129,7 +131,7 @@ private:
       std::vector<int> m_private_credit; 
       int m_shared_credit; 
    }; 
-   arbitration_metadata m_arbitration_metadata; 
+   arbitration_metadata m_arbitration_metadata;
 
    // determine wheither a given subpartition can issue to DRAM 
    bool can_issue_to_dram(int inner_sub_partition_id); 
@@ -141,12 +143,14 @@ private:
       class mem_fetch* req;
    };
    std::list<dram_delay_t> m_dram_latency_queue;
+
+   class gpgpu_sim* m_gpu;
 };
 
 class memory_sub_partition
 {
 public:
-   memory_sub_partition( unsigned sub_partition_id, const struct memory_config *config, class memory_stats_t *stats );
+   memory_sub_partition( unsigned sub_partition_id, const memory_config *config, class memory_stats_t *stats, class gpgpu_sim* gpu );
    ~memory_sub_partition(); 
 
    unsigned get_id() const { return m_id; } 
@@ -194,9 +198,10 @@ public:
 private:
 // data
    unsigned m_id;  //< the global sub partition ID
-   const struct memory_config *m_config;
+   const memory_config *m_config;
    class l2_cache *m_L2cache;
    class L2interface *m_L2interface;
+   class gpgpu_sim* m_gpu;
    partition_mf_allocator *m_mf_allocator;
 
    // model delay of ROP units with a fixed latency