Big reformat change using clang-format-6.0

1 files changed, 127 insertions, 113 deletions

diff --git a/src/gpgpu-sim/mem_fetch.h b/src/gpgpu-sim/mem_fetch.h
index 1cab9f2..71d8acd 100644
--- a/src/gpgpu-sim/mem_fetch.h
+++ b/src/gpgpu-sim/mem_fetch.h
@@ -7,41 +7,44 @@
 //
 // 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 MEM_FETCH_H
 #define MEM_FETCH_H
 
-#include "addrdec.h"
-#include "../abstract_hardware_model.h"
 #include <bitset>
+#include "../abstract_hardware_model.h"
+#include "addrdec.h"
 
 enum mf_type {
-   READ_REQUEST = 0,
-   WRITE_REQUEST,
-   READ_REPLY, // send to shader
-   WRITE_ACK
+  READ_REQUEST = 0,
+  WRITE_REQUEST,
+  READ_REPLY,  // send to shader
+  WRITE_ACK
 };
 
 #define MF_TUP_BEGIN(X) enum X {
 #define MF_TUP(X) X
-#define MF_TUP_END(X) };
+#define MF_TUP_END(X) \
+  }                   \
+  ;
 #include "mem_fetch_status.tup"
 #undef MF_TUP_BEGIN
 #undef MF_TUP
@@ -49,113 +52,124 @@ enum mf_type {
 
 class memory_config;
 class mem_fetch {
-public:
-    mem_fetch( const mem_access_t &access, 
-               const warp_inst_t *inst,
-               unsigned ctrl_size, 
-               unsigned wid,
-               unsigned sid, 
-               unsigned tpc, 
-               const memory_config *config,
-			   unsigned long long cycle,
-			   mem_fetch *original_mf = NULL,
-			   mem_fetch *original_wr_mf = NULL);
-   ~mem_fetch();
-
-   void set_status( enum mem_fetch_status status, unsigned long long cycle );
-   void set_reply() 
-   { 
-       assert( m_access.get_type() != L1_WRBK_ACC && m_access.get_type() != L2_WRBK_ACC );
-       if( m_type==READ_REQUEST ) {
-           assert( !get_is_write() );
-           m_type = READ_REPLY;
-       } else if( m_type == WRITE_REQUEST ) {
-           assert( get_is_write() );
-           m_type = WRITE_ACK;
-       }
-   }
-   void do_atomic();
+ public:
+  mem_fetch(const mem_access_t &access, const warp_inst_t *inst,
+            unsigned ctrl_size, unsigned wid, unsigned sid, unsigned tpc,
+            const memory_config *config, unsigned long long cycle,
+            mem_fetch *original_mf = NULL, mem_fetch *original_wr_mf = NULL);
+  ~mem_fetch();
 
-   void print( FILE *fp, bool print_inst = true ) const;
+  void set_status(enum mem_fetch_status status, unsigned long long cycle);
+  void set_reply() {
+    assert(m_access.get_type() != L1_WRBK_ACC &&
+           m_access.get_type() != L2_WRBK_ACC);
+    if (m_type == READ_REQUEST) {
+      assert(!get_is_write());
+      m_type = READ_REPLY;
+    } else if (m_type == WRITE_REQUEST) {
+      assert(get_is_write());
+      m_type = WRITE_ACK;
+    }
+  }
+  void do_atomic();
 
-   const addrdec_t &get_tlx_addr() const { return m_raw_addr; }
-   unsigned get_data_size() const { return m_data_size; }
-   void     set_data_size( unsigned size ) { m_data_size=size; }
-   unsigned get_ctrl_size() const { return m_ctrl_size; }
-   unsigned size() const { return m_data_size+m_ctrl_size; }
-   bool is_write() {return m_access.is_write();}
-   void set_addr(new_addr_type addr) { m_access.set_addr(addr); }
-   new_addr_type get_addr() const { return m_access.get_addr(); }
-   unsigned get_access_size() const { return m_access.get_size(); }
-   new_addr_type get_partition_addr() const { return m_partition_addr; }
-   unsigned get_sub_partition_id() const { return m_raw_addr.sub_partition; }
-   bool     get_is_write() const { return m_access.is_write(); }
-   unsigned get_request_uid() const { return m_request_uid; }
-   unsigned get_sid() const { return m_sid; }
-   unsigned get_tpc() const { return m_tpc; }
-   unsigned get_wid() const { return m_wid; }
-   bool istexture() const;
-   bool isconst() const;
-   enum mf_type get_type() const { return m_type; }
-   bool isatomic() const;
+  void print(FILE *fp, bool print_inst = true) const;
 
-   void set_return_timestamp( unsigned t ) { m_timestamp2=t; }
-   void set_icnt_receive_time( unsigned t ) { m_icnt_receive_time=t; }
-   unsigned get_timestamp() const { return m_timestamp; }
-   unsigned get_return_timestamp() const { return m_timestamp2; }
-   unsigned get_icnt_receive_time() const { return m_icnt_receive_time; }
+  const addrdec_t &get_tlx_addr() const { return m_raw_addr; }
+  unsigned get_data_size() const { return m_data_size; }
+  void set_data_size(unsigned size) { m_data_size = size; }
+  unsigned get_ctrl_size() const { return m_ctrl_size; }
+  unsigned size() const { return m_data_size + m_ctrl_size; }
+  bool is_write() { return m_access.is_write(); }
+  void set_addr(new_addr_type addr) { m_access.set_addr(addr); }
+  new_addr_type get_addr() const { return m_access.get_addr(); }
+  unsigned get_access_size() const { return m_access.get_size(); }
+  new_addr_type get_partition_addr() const { return m_partition_addr; }
+  unsigned get_sub_partition_id() const { return m_raw_addr.sub_partition; }
+  bool get_is_write() const { return m_access.is_write(); }
+  unsigned get_request_uid() const { return m_request_uid; }
+  unsigned get_sid() const { return m_sid; }
+  unsigned get_tpc() const { return m_tpc; }
+  unsigned get_wid() const { return m_wid; }
+  bool istexture() const;
+  bool isconst() const;
+  enum mf_type get_type() const { return m_type; }
+  bool isatomic() const;
 
-   enum mem_access_type get_access_type() const { return m_access.get_type(); }
-   const active_mask_t& get_access_warp_mask() const { return m_access.get_warp_mask(); }
-   mem_access_byte_mask_t get_access_byte_mask() const { return m_access.get_byte_mask(); }
-   mem_access_sector_mask_t get_access_sector_mask() const { return m_access.get_sector_mask(); }
+  void set_return_timestamp(unsigned t) { m_timestamp2 = t; }
+  void set_icnt_receive_time(unsigned t) { m_icnt_receive_time = t; }
+  unsigned get_timestamp() const { return m_timestamp; }
+  unsigned get_return_timestamp() const { return m_timestamp2; }
+  unsigned get_icnt_receive_time() const { return m_icnt_receive_time; }
 
-   address_type get_pc() const { return m_inst.empty()?-1:m_inst.pc; }
-   const warp_inst_t &get_inst() { return m_inst; }
-   enum mem_fetch_status get_status() const { return m_status; }
+  enum mem_access_type get_access_type() const { return m_access.get_type(); }
+  const active_mask_t &get_access_warp_mask() const {
+    return m_access.get_warp_mask();
+  }
+  mem_access_byte_mask_t get_access_byte_mask() const {
+    return m_access.get_byte_mask();
+  }
+  mem_access_sector_mask_t get_access_sector_mask() const {
+    return m_access.get_sector_mask();
+  }
 
-   const memory_config *get_mem_config(){return m_mem_config;}
+  address_type get_pc() const { return m_inst.empty() ? -1 : m_inst.pc; }
+  const warp_inst_t &get_inst() { return m_inst; }
+  enum mem_fetch_status get_status() const { return m_status; }
 
-   unsigned get_num_flits(bool simt_to_mem);
+  const memory_config *get_mem_config() { return m_mem_config; }
 
-   mem_fetch* get_original_mf() { return original_mf; }
-   mem_fetch* get_original_wr_mf()  { return original_wr_mf; }
+  unsigned get_num_flits(bool simt_to_mem);
 
-private:
-   // request source information
-   unsigned m_request_uid;
-   unsigned m_sid;
-   unsigned m_tpc;
-   unsigned m_wid;
+  mem_fetch *get_original_mf() { return original_mf; }
+  mem_fetch *get_original_wr_mf() { return original_wr_mf; }
 
-   // where is this request now?
-   enum mem_fetch_status m_status;
-   unsigned long long m_status_change;
+ private:
+  // request source information
+  unsigned m_request_uid;
+  unsigned m_sid;
+  unsigned m_tpc;
+  unsigned m_wid;
 
-   // request type, address, size, mask
-   mem_access_t m_access;
-   unsigned m_data_size; // how much data is being written
-   unsigned m_ctrl_size; // how big would all this meta data be in hardware (does not necessarily match actual size of mem_fetch)
-   new_addr_type m_partition_addr; // linear physical address *within* dram partition (partition bank select bits squeezed out)
-   addrdec_t m_raw_addr; // raw physical address (i.e., decoded DRAM chip-row-bank-column address)
-   enum mf_type m_type;
+  // where is this request now?
+  enum mem_fetch_status m_status;
+  unsigned long long m_status_change;
 
-   // statistics
-   unsigned m_timestamp;  // set to gpu_sim_cycle+gpu_tot_sim_cycle at struct creation
-   unsigned m_timestamp2; // set to gpu_sim_cycle+gpu_tot_sim_cycle when pushed onto icnt to shader; only used for reads
-   unsigned m_icnt_receive_time; // set to gpu_sim_cycle + interconnect_latency when fixed icnt latency mode is enabled
+  // request type, address, size, mask
+  mem_access_t m_access;
+  unsigned m_data_size;  // how much data is being written
+  unsigned
+      m_ctrl_size;  // how big would all this meta data be in hardware (does not
+                    // necessarily match actual size of mem_fetch)
+  new_addr_type
+      m_partition_addr;  // linear physical address *within* dram partition
+                         // (partition bank select bits squeezed out)
+  addrdec_t m_raw_addr;  // raw physical address (i.e., decoded DRAM
+                         // chip-row-bank-column address)
+  enum mf_type m_type;
 
-   // requesting instruction (put last so mem_fetch prints nicer in gdb)
-   warp_inst_t m_inst;
+  // statistics
+  unsigned
+      m_timestamp;  // set to gpu_sim_cycle+gpu_tot_sim_cycle at struct creation
+  unsigned m_timestamp2;  // set to gpu_sim_cycle+gpu_tot_sim_cycle when pushed
+                          // onto icnt to shader; only used for reads
+  unsigned m_icnt_receive_time;  // set to gpu_sim_cycle + interconnect_latency
+                                 // when fixed icnt latency mode is enabled
 
-   static unsigned sm_next_mf_request_uid;
+  // requesting instruction (put last so mem_fetch prints nicer in gdb)
+  warp_inst_t m_inst;
 
-   const memory_config *m_mem_config;
-   unsigned icnt_flit_size;
+  static unsigned sm_next_mf_request_uid;
 
-   mem_fetch* original_mf;  //this pointer is set up when a request is divided into sector requests at L2 cache (if the req size > L2 sector size), so the pointer refers to the original request
-   mem_fetch* original_wr_mf;  //this pointer refers to the original write req, when fetch-on-write policy is used
+  const memory_config *m_mem_config;
+  unsigned icnt_flit_size;
 
+  mem_fetch
+      *original_mf;  // this pointer is set up when a request is divided into
+                     // sector requests at L2 cache (if the req size > L2 sector
+                     // size), so the pointer refers to the original request
+  mem_fetch *original_wr_mf;  // this pointer refers to the original write req,
+                              // when fetch-on-write policy is used
 };
 
 #endif