ext: McPAT interface changes and fixes

This patch includes software engineering changes and some generic bug fixes
Joel Hestness and Yasuko Eckert made to McPAT 0.8. There are still known
issues/concernts we did not have a chance to address in this patch.

High-level changes in this patch include:
 1) Making XML parsing modular and hierarchical:
   - Shift parsing responsibility into the components
   - Read XML in a (mostly) context-free recursive manner so that McPAT input
     files can contain arbitrary component hierarchies
 2) Making power, energy, and area calculations a hierarchical and recursive
    process
   - Components track their subcomponents and recursively call compute
     functions in stages
   - Make C++ object hierarchy reflect inheritance of classes of components
     with similar structures
   - Simplify computeArea() and computeEnergy() functions to eliminate
     successive calls to calculate separate TDP vs. runtime energy
   - Remove Processor component (now unnecessary) and introduce a more abstract
     System component
 3) Standardizing McPAT output across all components
   - Use a single, common data structure for storing and printing McPAT output
   - Recursively call print functions through component hierarchy
 4) For caches, allow splitting data array and tag array reads and writes for
    better accuracy
 5) Improving the usability of CACTI by printing more helpful warning and error
    messages
 6) Minor: Impose more rigorous code style for clarity (more work still to be
    done)
Overall, these changes greatly reduce the amount of replicated code, and they
improve McPAT runtime and decrease memory footprint.

1 files changed, 14 insertions, 15 deletions

diff --git a/ext/mcpat/cacti/wire.h b/ext/mcpat/cacti/wire.h
index 51d55afff..906030dde 100644
--- a/ext/mcpat/cacti/wire.h
+++ b/ext/mcpat/cacti/wire.h
@@ -2,6 +2,7 @@
  *                                McPAT/CACTI
  *                      SOFTWARE LICENSE AGREEMENT
  *            Copyright 2012 Hewlett-Packard Development Company, L.P.
+ *            Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
  *                          All Rights Reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +26,7 @@
  * 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.”
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ***************************************************************************/
 
@@ -43,9 +44,8 @@
 #include "component.h"
 #include "parameter.h"
 
-class Wire : public Component
-{
-  public:
+class Wire : public Component {
+public:
     Wire(enum Wire_type wire_model, double len /* in u*/,
          int nsense = 1/* no. of sense amps connected to the low-swing wire */,
          double width_scaling = 1,
@@ -56,16 +56,16 @@ class Wire : public Component
     ~Wire();
 
     Wire( double width_scaling = 1,
-         double spacing_scaling = 1,
-         enum Wire_placement wire_placement = outside_mat,
-         double resistivity = CU_RESISTIVITY,
-         TechnologyParameter::DeviceType *dt = &(g_tp.peri_global)
-    ); // should be used only once for initializing static members
+          double spacing_scaling = 1,
+          enum Wire_placement wire_placement = outside_mat,
+          double resistivity = CU_RESISTIVITY,
+          TechnologyParameter::DeviceType *dt = &(g_tp.peri_global)
+        ); // should be used only once for initializing static members
     void init_wire();
 
     void calculate_wire_stats();
     void delay_optimal_wire();
-    double wire_cap(double len, bool call_from_outside=false);
+    double wire_cap(double len, bool call_from_outside = false);
     double wire_res(double len);
     void low_swing_model();
     double signal_fall_time();
@@ -81,9 +81,8 @@ class Wire : public Component
     double wire_length;
     double in_rise_time, out_rise_time;
 
-    void set_in_rise_time(double rt)
-    {
-      in_rise_time = rt;
+    void set_in_rise_time(double rt) {
+        in_rise_time = rt;
     }
     static Component global;
     static Component global_5;
@@ -95,10 +94,10 @@ class Wire : public Component
     static double wire_spacing_init;
     void print_wire();
 
-  private:
+private:
 
     int nsense; // no. of sense amps connected to a low-swing wire if it
-                // is broadcasting data to multiple destinations
+    // is broadcasting data to multiple destinations
     // width and spacing scaling factor can be used
     // to model low level wires or special
     // fat wires