Merge branch 'dev'

1 files changed, 219 insertions, 237 deletions

diff --git a/src/gpuwattch/basic_components.h b/src/gpuwattch/basic_components.h
index 7e4c962..2e9907a 100644
--- a/src/gpuwattch/basic_components.h
+++ b/src/gpuwattch/basic_components.h
@@ -32,302 +32,284 @@
 #ifndef BASIC_COMPONENTS_H_
 #define BASIC_COMPONENTS_H_
 
+#include <vector>
 #include "XML_Parse.h"
 #include "cacti/parameter.h"
-#include <vector>
 
 const double cdb_overhead = 1.1;
 
-enum FU_type {
-    FPU,
-    ALU,
-    MUL
-};
+enum FU_type { FPU, ALU, MUL };
 
-enum Core_type {
-	OOO,
-	Inorder
-};
+enum Core_type { OOO, Inorder };
 
-enum Renaming_type {
-    RAMbased,
-	CAMbased
-};
+enum Renaming_type { RAMbased, CAMbased };
 
-enum Scheduler_type {
-    PhysicalRegFile,
-	ReservationStation
-};
+enum Scheduler_type { PhysicalRegFile, ReservationStation };
 
-enum cache_level {
-    L2,
-    L3,
-    L1Directory,
-    L2Directory
-};
+enum cache_level { L2, L3, L1Directory, L2Directory };
 
 enum MemoryCtrl_type {
-	MC,    //memory controller
-	FLASHC //flash controller
-};
-
-enum Dram_type {
-	GDDR5,
-	GDDR3
+  MC,     // memory controller
+  FLASHC  // flash controller
 };
 
+enum Dram_type { GDDR5, GDDR3 };
 
 enum Dir_type {
-	ST,//shadowed tag
-	DC,//directory cache
-	SBT,//static bank tag
-	NonDir
+  ST,   // shadowed tag
+  DC,   // directory cache
+  SBT,  // static bank tag
+  NonDir
 
 };
 
-enum Cache_policy {
-	Write_through,
-	Write_back
-};
+enum Cache_policy { Write_through, Write_back };
 
-enum Device_ty {
-	Core_device,
-	Uncore_device,
-	LLC_device
-};
+enum Device_ty { Core_device, Uncore_device, LLC_device };
 
-class statsComponents
-{
-  public:
-    double access;
-    double hit;
-    double miss;
+class statsComponents {
+ public:
+  double access;
+  double hit;
+  double miss;
 
-    statsComponents() : access(0), hit(0), miss(0)  {}
-    statsComponents(const statsComponents & obj) { *this = obj; }
-    statsComponents & operator=(const statsComponents & rhs)
-    {
-      access = rhs.access;
-      hit = rhs.hit;
-      miss  = rhs.miss;
-      return *this;
-    }
-    void reset() { access = 0; hit = 0; miss = 0;}
+  statsComponents() : access(0), hit(0), miss(0) {}
+  statsComponents(const statsComponents &obj) { *this = obj; }
+  statsComponents &operator=(const statsComponents &rhs) {
+    access = rhs.access;
+    hit = rhs.hit;
+    miss = rhs.miss;
+    return *this;
+  }
+  void reset() {
+    access = 0;
+    hit = 0;
+    miss = 0;
+  }
 
-    friend statsComponents operator+(const statsComponents & x, const statsComponents & y);
-    friend statsComponents operator*(const statsComponents & x, double const * const y);
+  friend statsComponents operator+(const statsComponents &x,
+                                   const statsComponents &y);
+  friend statsComponents operator*(const statsComponents &x,
+                                   double const *const y);
 };
 
-class statsDef
-{
-  public:
-    statsComponents readAc;
-    statsComponents writeAc;
-    statsComponents searchAc;
+class statsDef {
+ public:
+  statsComponents readAc;
+  statsComponents writeAc;
+  statsComponents searchAc;
 
-    statsDef() : readAc(), writeAc(),searchAc() { }
-    void reset() { readAc.reset(); writeAc.reset();searchAc.reset();}
+  statsDef() : readAc(), writeAc(), searchAc() {}
+  void reset() {
+    readAc.reset();
+    writeAc.reset();
+    searchAc.reset();
+  }
 
-    friend statsDef operator+(const statsDef & x, const statsDef & y);
-    friend statsDef operator*(const statsDef & x, double const * const y);
+  friend statsDef operator+(const statsDef &x, const statsDef &y);
+  friend statsDef operator*(const statsDef &x, double const *const y);
 };
 
-double longer_channel_device_reduction(
-		enum Device_ty device_ty=Core_device,
-		enum Core_type core_ty=Inorder);
+double longer_channel_device_reduction(enum Device_ty device_ty = Core_device,
+                                       enum Core_type core_ty = Inorder);
 
 class CoreDynParam {
-public:
-	CoreDynParam(){};
-	CoreDynParam(ParseXML *XML_interface, int ithCore_);
-	//    :XML(XML_interface),
-	//     ithCore(ithCore_)
-	//     core_ty(inorder),
-	//     rm_ty(CAMbased),
-	//     scheu_ty(PhysicalRegFile),
-	//     clockRate(1e9),//1GHz
-	//     arch_ireg_width(32),
-	//     arch_freg_width(32),
-	//     phy_ireg_width(128),
-	//     phy_freg_width(128),
-	//     perThreadState(8),
-	//     globalCheckpoint(32),
-	//     instructionLength(32){};
-	//ParseXML * XML;
-	bool opt_local;
-	bool x86;
-	bool Embedded;
-    enum Core_type  core_ty;
-	enum Renaming_type rm_ty;
-    enum Scheduler_type scheu_ty;
-    double clockRate,executionTime;
-    int  arch_ireg_width, arch_freg_width, phy_ireg_width, phy_freg_width;
-    int  num_IRF_entry, num_FRF_entry, num_ifreelist_entries, num_ffreelist_entries;
-    int  fetchW, decodeW,issueW,peak_issueW, commitW,peak_commitW, predictionW, fp_issueW, fp_decodeW;
-    int  perThreadState, globalCheckpoint, instruction_length, pc_width, opcode_length, micro_opcode_length;
-    int  num_hthreads, pipeline_stages, fp_pipeline_stages, num_pipelines, num_fp_pipelines;
-    int  num_alus, num_muls;
-    double num_fpus;
-    int  int_data_width, fp_data_width,v_address_width, p_address_width;
-    double pipeline_duty_cycle, total_cycles, busy_cycles, idle_cycles;
-    bool regWindowing,multithreaded;
-    double pppm_lkg_multhread[4];
-	double IFU_duty_cycle,BR_duty_cycle,LSU_duty_cycle,MemManU_I_duty_cycle,
-	       MemManU_D_duty_cycle, ALU_duty_cycle,MUL_duty_cycle,
-	       FPU_duty_cycle, ALU_cdb_duty_cycle,MUL_cdb_duty_cycle,
-	       FPU_cdb_duty_cycle;
-    ~CoreDynParam(){};
+ public:
+  CoreDynParam(){};
+  CoreDynParam(ParseXML *XML_interface, int ithCore_);
+  //    :XML(XML_interface),
+  //     ithCore(ithCore_)
+  //     core_ty(inorder),
+  //     rm_ty(CAMbased),
+  //     scheu_ty(PhysicalRegFile),
+  //     clockRate(1e9),//1GHz
+  //     arch_ireg_width(32),
+  //     arch_freg_width(32),
+  //     phy_ireg_width(128),
+  //     phy_freg_width(128),
+  //     perThreadState(8),
+  //     globalCheckpoint(32),
+  //     instructionLength(32){};
+  // ParseXML * XML;
+  bool opt_local;
+  bool x86;
+  bool Embedded;
+  enum Core_type core_ty;
+  enum Renaming_type rm_ty;
+  enum Scheduler_type scheu_ty;
+  double clockRate, executionTime;
+  int arch_ireg_width, arch_freg_width, phy_ireg_width, phy_freg_width;
+  int num_IRF_entry, num_FRF_entry, num_ifreelist_entries,
+      num_ffreelist_entries;
+  int fetchW, decodeW, issueW, peak_issueW, commitW, peak_commitW, predictionW,
+      fp_issueW, fp_decodeW;
+  int perThreadState, globalCheckpoint, instruction_length, pc_width,
+      opcode_length, micro_opcode_length;
+  int num_hthreads, pipeline_stages, fp_pipeline_stages, num_pipelines,
+      num_fp_pipelines;
+  int num_alus, num_muls;
+  double num_fpus;
+  int int_data_width, fp_data_width, v_address_width, p_address_width;
+  double pipeline_duty_cycle, total_cycles, busy_cycles, idle_cycles;
+  bool regWindowing, multithreaded;
+  double pppm_lkg_multhread[4];
+  double IFU_duty_cycle, BR_duty_cycle, LSU_duty_cycle, MemManU_I_duty_cycle,
+      MemManU_D_duty_cycle, ALU_duty_cycle, MUL_duty_cycle, FPU_duty_cycle,
+      ALU_cdb_duty_cycle, MUL_cdb_duty_cycle, FPU_cdb_duty_cycle;
+  ~CoreDynParam(){};
 };
 
 class CacheDynParam {
-public:
-	CacheDynParam(){};
-	CacheDynParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-	enum Dir_type    dir_ty;
-	double clockRate,executionTime;
-    double    capacity, blockW, assoc, nbanks;
-    double throughput, latency;
-    double duty_cycle, dir_duty_cycle;
-    //double duty_cycle;
-    int missb_size, fu_size, prefetchb_size, wbb_size;
-    ~CacheDynParam(){};
+ public:
+  CacheDynParam(){};
+  CacheDynParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  enum Dir_type dir_ty;
+  double clockRate, executionTime;
+  double capacity, blockW, assoc, nbanks;
+  double throughput, latency;
+  double duty_cycle, dir_duty_cycle;
+  // double duty_cycle;
+  int missb_size, fu_size, prefetchb_size, wbb_size;
+  ~CacheDynParam(){};
 };
 
 class DRAMParam {
-public:
-	DRAMParam(){};
-	DRAMParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    double  clockRate;
-    double executionTime;
-    double cmd_coeff;
-    double activity_coeff;
-    double nop_coeff;
-    double act_coeff;
-    double pre_coeff;
-    double rd_coeff;
-    double wr_coeff;
-    double req_coeff;
-    double const_coeff;
+ public:
+  DRAMParam(){};
+  DRAMParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  double clockRate;
+  double executionTime;
+  double cmd_coeff;
+  double activity_coeff;
+  double nop_coeff;
+  double act_coeff;
+  double pre_coeff;
+  double rd_coeff;
+  double wr_coeff;
+  double req_coeff;
+  double const_coeff;
 
-	int detailed_dram_model; // 1 - to use newly added DRAM model (GDDR5 only), 0 - use empirical model
-	// the following are the current specified by DATA SHEET
-	// unit: mA
-	int idd0;
-	int idd1;
-	int idd2p;
-	int idd2n;
-	int idd3p;
-	int idd3n;
-	int idd4r;
-	int idd4w;
-	int idd5;
-	int idd6;
-	int idd7;
+  int detailed_dram_model;  // 1 - to use newly added DRAM model (GDDR5 only), 0
+                            // - use empirical model
+  // the following are the current specified by DATA SHEET
+  // unit: mA
+  int idd0;
+  int idd1;
+  int idd2p;
+  int idd2n;
+  int idd3p;
+  int idd3n;
+  int idd4r;
+  int idd4w;
+  int idd5;
+  int idd6;
+  int idd7;
 
-	// the following are the vdd specified by DATA SHEET; NOT the actual VDD
-	double datasheet_vdd;
-	double actual_vdd;
+  // the following are the vdd specified by DATA SHEET; NOT the actual VDD
+  double datasheet_vdd;
+  double actual_vdd;
 
-	// the following are the timing parameters specified by DATA SHEET
-	// unit: ns
-	int t_ccd;
-	int t_rrd;
-	int t_rcd;
-	int t_ras;
-	int t_rp;
-	int t_rc;
-	int t_cl;
-	int t_cdlr;
-	int t_wr;
+  // the following are the timing parameters specified by DATA SHEET
+  // unit: ns
+  int t_ccd;
+  int t_rrd;
+  int t_rcd;
+  int t_ras;
+  int t_rp;
+  int t_rc;
+  int t_cl;
+  int t_cdlr;
+  int t_wr;
 
-	// the following are the DRAM clocks
-	// unit: MHz
-	int datasheet_operating_clock; // this is specified by DATA SHEET. This is NOT the actual DRAM clock
-	int actual_operating_clock;
+  // the following are the DRAM clocks
+  // unit: MHz
+  int datasheet_operating_clock;  // this is specified by DATA SHEET. This is
+                                  // NOT the actual DRAM clock
+  int actual_operating_clock;
 
-	// the following are each DRAM bank's IO info
-	int bank_width; // in bits
-	int dqs_signal_width; // in bits
-	int extra_dq_write_signal_width; //in bits
-	int per_dq_read_power; // in mW
-	int per_dq_write_power; // in mW
+  // the following are each DRAM bank's IO info
+  int bank_width;                   // in bits
+  int dqs_signal_width;             // in bits
+  int extra_dq_write_signal_width;  // in bits
+  int per_dq_read_power;            // in mW
+  int per_dq_write_power;           // in mW
 
-    ~DRAMParam(){};
+  ~DRAMParam(){};
 };
 
 class MCParam {
-public:
-	MCParam(){};
-	MCParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    double  clockRate,num_mcs, peakDataTransferRate, num_channels;
-    //  double mcTEPowerperGhz;
-    //	double mcPHYperGbit;
-    //	double area;
-    int	   llcBlockSize, dataBusWidth, addressBusWidth;
-    int    opcodeW;
-    int    memAccesses;
-    int    memRank;
-    int    type;
-    double frontend_duty_cycle, duty_cycle, perc_load;
-    double executionTime, reads, writes;
-    bool   LVDS, withPHY;
+ public:
+  MCParam(){};
+  MCParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  double clockRate, num_mcs, peakDataTransferRate, num_channels;
+  //  double mcTEPowerperGhz;
+  //	double mcPHYperGbit;
+  //	double area;
+  int llcBlockSize, dataBusWidth, addressBusWidth;
+  int opcodeW;
+  int memAccesses;
+  int memRank;
+  int type;
+  double frontend_duty_cycle, duty_cycle, perc_load;
+  double executionTime, reads, writes;
+  bool LVDS, withPHY;
 
-    ~MCParam(){};
+  ~MCParam(){};
 };
 
 class NoCParam {
-public:
-	NoCParam(){};
-	NoCParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    double  clockRate;
-    int	   flit_size;
-    int    input_ports, output_ports, min_ports, global_linked_ports;
-    int    virtual_channel_per_port,input_buffer_entries_per_vc;
-    int    horizontal_nodes,vertical_nodes, total_nodes;
-    double executionTime, total_access, link_throughput,link_latency,
-		   duty_cycle, chip_coverage, route_over_perc;
-    bool   has_global_link, type;
+ public:
+  NoCParam(){};
+  NoCParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  double clockRate;
+  int flit_size;
+  int input_ports, output_ports, min_ports, global_linked_ports;
+  int virtual_channel_per_port, input_buffer_entries_per_vc;
+  int horizontal_nodes, vertical_nodes, total_nodes;
+  double executionTime, total_access, link_throughput, link_latency, duty_cycle,
+      chip_coverage, route_over_perc;
+  bool has_global_link, type;
 
-    ~NoCParam(){};
+  ~NoCParam(){};
 };
 
 class ProcParam {
-public:
-	ProcParam(){};
-	ProcParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    int  numCore, numL2, numL3, numNOC, numL1Dir, numL2Dir,numMC, numMCChannel;
-    bool homoCore, homoL2, homoL3, homoNOC, homoL1Dir, homoL2Dir;
+ public:
+  ProcParam(){};
+  ProcParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  int numCore, numL2, numL3, numNOC, numL1Dir, numL2Dir, numMC, numMCChannel;
+  bool homoCore, homoL2, homoL3, homoNOC, homoL1Dir, homoL2Dir;
 
-    ~ProcParam(){};
+  ~ProcParam(){};
 };
 
 class NIUParam {
-public:
-	NIUParam(){};
-	NIUParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    double  clockRate;
-    int    num_units;
-    int    type;
-    double duty_cycle, perc_load;
-    ~NIUParam(){};
+ public:
+  NIUParam(){};
+  NIUParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  double clockRate;
+  int num_units;
+  int type;
+  double duty_cycle, perc_load;
+  ~NIUParam(){};
 };
 
 class PCIeParam {
-public:
-	PCIeParam(){};
-	PCIeParam(ParseXML *XML_interface, int ithCache_);
-    string name;
-    double  clockRate;
-    int    num_channels, num_units;
-    bool   withPHY;
-    int    type;
-    double duty_cycle, perc_load;
-    ~PCIeParam(){};
+ public:
+  PCIeParam(){};
+  PCIeParam(ParseXML *XML_interface, int ithCache_);
+  string name;
+  double clockRate;
+  int num_channels, num_units;
+  bool withPHY;
+  int type;
+  double duty_cycle, perc_load;
+  ~PCIeParam(){};
 };
 #endif /* BASIC_COMPONENTS_H_ */