Merge pull request #31 from rgreen/dev

Application of clang-format to make the code use standardized formatting.

1 files changed, 179 insertions, 188 deletions

diff --git a/src/gpgpu-sim/dram.h b/src/gpgpu-sim/dram.h
index 0bd9725..2e39a43 100644
--- a/src/gpgpu-sim/dram.h
+++ b/src/gpgpu-sim/dram.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2011, Tor M. Aamodt, Ivan Sham, Ali Bakhoda, 
+// Copyright (c) 2009-2011, Tor M. Aamodt, Ivan Sham, Ali Bakhoda,
 // George L. Yuan, Wilson W.L. Fung
 // The University of British Columbia
 // All rights reserved.
@@ -8,248 +8,239 @@
 //
 // Redistributions of source code must retain the above copyright notice, this
 // list of conditions and the following disclaimer.
-// Redistributions in binary form must reproduce the above copyright notice, this
-// list of conditions and the following disclaimer in the documentation and/or
-// other materials provided with the distribution.
-// Neither the name of The University of British Columbia nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution. Neither the name of
+// The University of British Columbia nor the names of its contributors may be
+// used to endorse or promote products derived from this software without
+// specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef DRAM_H
 #define DRAM_H
 
-#include "delayqueue.h"
-#include <set>
-#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <zlib.h>
 #include <bitset>
+#include <fstream>
+#include <iomanip>
+#include <set>
 #include <sstream>
 #include <string>
-#include <fstream>
-#include <zlib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include<iomanip>
+#include <vector>
+#include "delayqueue.h"
 
-#define READ 'R'  //define read and write states
+#define READ 'R'  // define read and write states
 #define WRITE 'W'
 #define BANK_IDLE 'I'
 #define BANK_ACTIVE 'A'
 
 class dram_req_t {
-public:
-   dram_req_t( class mem_fetch *data , unsigned banks, unsigned dram_bnk_indexing_policy, class gpgpu_sim* gpu);
+ public:
+  dram_req_t(class mem_fetch *data, unsigned banks,
+             unsigned dram_bnk_indexing_policy, class gpgpu_sim *gpu);
 
-   unsigned int row;
-   unsigned int col;
-   unsigned int bk;
-   unsigned int nbytes;
-   unsigned int txbytes;
-   unsigned int dqbytes;
-   unsigned int age;
-   unsigned int timestamp;
-   unsigned char rw;    //is the request a read or a write?
-   unsigned long long int addr;
-   unsigned int insertion_time;
-   class mem_fetch * data;
-   class gpgpu_sim * m_gpu;
+  unsigned int row;
+  unsigned int col;
+  unsigned int bk;
+  unsigned int nbytes;
+  unsigned int txbytes;
+  unsigned int dqbytes;
+  unsigned int age;
+  unsigned int timestamp;
+  unsigned char rw;  // is the request a read or a write?
+  unsigned long long int addr;
+  unsigned int insertion_time;
+  class mem_fetch *data;
+  class gpgpu_sim *m_gpu;
 };
 
-struct bankgrp_t
-{
-	unsigned int CCDLc;
-	unsigned int RTPLc;
+struct bankgrp_t {
+  unsigned int CCDLc;
+  unsigned int RTPLc;
 };
 
-struct bank_t
-{
-   unsigned int RCDc;
-   unsigned int RCDWRc;
-   unsigned int RASc;
-   unsigned int RPc;
-   unsigned int RCc;
-   unsigned int WTPc; // write to precharge
-   unsigned int RTPc; // read to precharge
+struct bank_t {
+  unsigned int RCDc;
+  unsigned int RCDWRc;
+  unsigned int RASc;
+  unsigned int RPc;
+  unsigned int RCc;
+  unsigned int WTPc;  // write to precharge
+  unsigned int RTPc;  // read to precharge
 
-   unsigned char rw;    //is the bank reading or writing?
-   unsigned char state; //is the bank active or idle?
-   unsigned int curr_row;
+  unsigned char rw;     // is the bank reading or writing?
+  unsigned char state;  // is the bank active or idle?
+  unsigned int curr_row;
 
-   dram_req_t *mrq;
+  dram_req_t *mrq;
 
-   unsigned int n_access;
-   unsigned int n_writes;
-   unsigned int n_idle;
+  unsigned int n_access;
+  unsigned int n_writes;
+  unsigned int n_idle;
 
-   unsigned int bkgrpindex;
+  unsigned int bkgrpindex;
 };
 
-enum bank_index_function{
-	LINEAR_BK_INDEX = 0,
-	BITWISE_XORING_BK_INDEX,
-    CUSTOM_BK_INDEX
+enum bank_index_function {
+  LINEAR_BK_INDEX = 0,
+  BITWISE_XORING_BK_INDEX,
+  CUSTOM_BK_INDEX
 };
 
-enum bank_grp_bits_position{
-	HIGHER_BITS = 0,
-	LOWER_BITS
-};
+enum bank_grp_bits_position { HIGHER_BITS = 0, LOWER_BITS };
 
 class mem_fetch;
 class memory_config;
 
-class dram_t 
-{
-public:
-   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;
-   void visualize() const;
-   void print_stat( FILE* simFile );
-   unsigned que_length() const; 
-   bool returnq_full() const;
-   unsigned int queue_limit() const;
-   void visualizer_print( gzFile visualizer_file );
-
-   class mem_fetch* return_queue_pop();
-   class mem_fetch* return_queue_top();
+class dram_t {
+ public:
+  dram_t(unsigned int parition_id, const memory_config *config,
+         class memory_stats_t *stats, class memory_partition_unit *mp,
+         class gpgpu_sim *gpu);
 
-   void push( class mem_fetch *data );
-   void cycle();
-   void dram_log (int task);
+  bool full(bool is_write) const;
+  void print(FILE *simFile) const;
+  void visualize() const;
+  void print_stat(FILE *simFile);
+  unsigned que_length() const;
+  bool returnq_full() const;
+  unsigned int queue_limit() const;
+  void visualizer_print(gzFile visualizer_file);
 
-   class memory_partition_unit *m_memory_partition_unit;
-   class gpgpu_sim* m_gpu;
-   unsigned int id;
+  class mem_fetch *return_queue_pop();
+  class mem_fetch *return_queue_top();
 
-   // Power Model
-   void set_dram_power_stats(unsigned &cmd,
-								unsigned &activity,
-								unsigned &nop,
-								unsigned &act,
-								unsigned &pre,
-								unsigned &rd,
-								unsigned &wr,
-								unsigned &req) const;
+  void push(class mem_fetch *data);
+  void cycle();
+  void dram_log(int task);
 
+  class memory_partition_unit *m_memory_partition_unit;
+  class gpgpu_sim *m_gpu;
+  unsigned int id;
 
+  // Power Model
+  void set_dram_power_stats(unsigned &cmd, unsigned &activity, unsigned &nop,
+                            unsigned &act, unsigned &pre, unsigned &rd,
+                            unsigned &wr, unsigned &req) const;
 
-   const memory_config *m_config;
+  const memory_config *m_config;
 
-private:
-   bankgrp_t **bkgrp;
+ private:
+  bankgrp_t **bkgrp;
 
-   bank_t **bk;
-   unsigned int prio;
+  bank_t **bk;
+  unsigned int prio;
 
-   unsigned get_bankgrp_number(unsigned i);
+  unsigned get_bankgrp_number(unsigned i);
 
-   void scheduler_fifo();
-   void scheduler_frfcfs();
+  void scheduler_fifo();
+  void scheduler_frfcfs();
 
-   bool issue_col_command(int j);
-   bool issue_row_command(int j);
+  bool issue_col_command(int j);
+  bool issue_row_command(int j);
 
-   unsigned int RRDc;
-   unsigned int CCDc;
-   unsigned int RTWc;   //read to write penalty applies across banks
-   unsigned int WTRc;   //write to read penalty applies across banks
+  unsigned int RRDc;
+  unsigned int CCDc;
+  unsigned int RTWc;  // read to write penalty applies across banks
+  unsigned int WTRc;  // write to read penalty applies across banks
 
-   unsigned char rw; //was last request a read or write? (important for RTW, WTR)
+  unsigned char
+      rw;  // was last request a read or write? (important for RTW, WTR)
 
-   unsigned int pending_writes;
+  unsigned int pending_writes;
 
-   fifo_pipeline<dram_req_t> *rwq;
-   fifo_pipeline<dram_req_t> *mrqq;
-   //buffer to hold packets when DRAM processing is over
-   //should be filled with dram clock and popped with l2or icnt clock
-   fifo_pipeline<mem_fetch> *returnq;
+  fifo_pipeline<dram_req_t> *rwq;
+  fifo_pipeline<dram_req_t> *mrqq;
+  // buffer to hold packets when DRAM processing is over
+  // should be filled with dram clock and popped with l2or icnt clock
+  fifo_pipeline<mem_fetch> *returnq;
 
-   unsigned int dram_util_bins[10];
-   unsigned int dram_eff_bins[10];
-   unsigned int last_n_cmd, last_n_activity, last_bwutil;
+  unsigned int dram_util_bins[10];
+  unsigned int dram_eff_bins[10];
+  unsigned int last_n_cmd, last_n_activity, last_bwutil;
 
-   unsigned long long n_cmd;
-   unsigned long long n_activity;
-   unsigned long long n_nop;
-   unsigned long long n_act;
-   unsigned long long n_pre;
-   unsigned long long n_ref;
-   unsigned long long n_rd;
-   unsigned long long n_rd_L2_A;
-   unsigned long long n_wr;
-   unsigned long long n_wr_WB;
-   unsigned long long n_req;
-   unsigned long long max_mrqs_temp;
+  unsigned long long n_cmd;
+  unsigned long long n_activity;
+  unsigned long long n_nop;
+  unsigned long long n_act;
+  unsigned long long n_pre;
+  unsigned long long n_ref;
+  unsigned long long n_rd;
+  unsigned long long n_rd_L2_A;
+  unsigned long long n_wr;
+  unsigned long long n_wr_WB;
+  unsigned long long n_req;
+  unsigned long long max_mrqs_temp;
 
-   //some statistics to see where BW is wasted?
-   unsigned long long wasted_bw_row;
-   unsigned long long wasted_bw_col;
-   unsigned long long util_bw;
-   unsigned long long idle_bw;
-   unsigned long long RCDc_limit;
-   unsigned long long CCDLc_limit;
-   unsigned long long CCDLc_limit_alone;
-   unsigned long long CCDc_limit;
-   unsigned long long WTRc_limit;
-   unsigned long long WTRc_limit_alone;
-   unsigned long long RCDWRc_limit;
-   unsigned long long RTWc_limit;
-   unsigned long long RTWc_limit_alone;
-   unsigned long long rwq_limit;
+  // some statistics to see where BW is wasted?
+  unsigned long long wasted_bw_row;
+  unsigned long long wasted_bw_col;
+  unsigned long long util_bw;
+  unsigned long long idle_bw;
+  unsigned long long RCDc_limit;
+  unsigned long long CCDLc_limit;
+  unsigned long long CCDLc_limit_alone;
+  unsigned long long CCDc_limit;
+  unsigned long long WTRc_limit;
+  unsigned long long WTRc_limit_alone;
+  unsigned long long RCDWRc_limit;
+  unsigned long long RTWc_limit;
+  unsigned long long RTWc_limit_alone;
+  unsigned long long rwq_limit;
 
-   //row locality, BLP and other statistics
-   unsigned long long access_num;
-   unsigned long long read_num;
-   unsigned long long write_num;
-   unsigned long long hits_num;
-   unsigned long long hits_read_num;
-   unsigned long long hits_write_num;
-   unsigned long long banks_1time;
-   unsigned long long banks_acess_total;
-   unsigned long long banks_acess_total_after;
-   unsigned long long banks_time_rw;
-   unsigned long long banks_access_rw_total;
-   unsigned long long banks_time_ready;
-   unsigned long long banks_access_ready_total;
-   unsigned long long issued_two;
-   unsigned long long issued_total;
-   unsigned long long issued_total_row;
-   unsigned long long issued_total_col;
-   double write_to_read_ratio_blp_rw_average;
-   unsigned long long bkgrp_parallsim_rw;
+  // row locality, BLP and other statistics
+  unsigned long long access_num;
+  unsigned long long read_num;
+  unsigned long long write_num;
+  unsigned long long hits_num;
+  unsigned long long hits_read_num;
+  unsigned long long hits_write_num;
+  unsigned long long banks_1time;
+  unsigned long long banks_acess_total;
+  unsigned long long banks_acess_total_after;
+  unsigned long long banks_time_rw;
+  unsigned long long banks_access_rw_total;
+  unsigned long long banks_time_ready;
+  unsigned long long banks_access_ready_total;
+  unsigned long long issued_two;
+  unsigned long long issued_total;
+  unsigned long long issued_total_row;
+  unsigned long long issued_total_col;
+  double write_to_read_ratio_blp_rw_average;
+  unsigned long long bkgrp_parallsim_rw;
 
-   unsigned int bwutil;
-   unsigned int max_mrqs;
-   unsigned int ave_mrqs;
+  unsigned int bwutil;
+  unsigned int max_mrqs;
+  unsigned int ave_mrqs;
 
-   class frfcfs_scheduler* m_frfcfs_scheduler;
+  class frfcfs_scheduler *m_frfcfs_scheduler;
 
-   unsigned int n_cmd_partial;
-   unsigned int n_activity_partial;
-   unsigned int n_nop_partial; 
-   unsigned int n_act_partial; 
-   unsigned int n_pre_partial; 
-   unsigned int n_req_partial;
-   unsigned int ave_mrqs_partial;
-   unsigned int bwutil_partial;
+  unsigned int n_cmd_partial;
+  unsigned int n_activity_partial;
+  unsigned int n_nop_partial;
+  unsigned int n_act_partial;
+  unsigned int n_pre_partial;
+  unsigned int n_req_partial;
+  unsigned int ave_mrqs_partial;
+  unsigned int bwutil_partial;
 
-   class memory_stats_t *m_stats;
-   class Stats* mrqq_Dist; //memory request queue inside DRAM  
+  class memory_stats_t *m_stats;
+  class Stats *mrqq_Dist;  // memory request queue inside DRAM
 
-   friend class frfcfs_scheduler;
+  friend class frfcfs_scheduler;
 };
 
 #endif /*DRAM_H*/