diff options
author | Yasuko Eckert <yasuko.eckert@amd.com> | 2014-06-03 13:32:59 -0700 |
---|---|---|
committer | Yasuko Eckert <yasuko.eckert@amd.com> | 2014-06-03 13:32:59 -0700 |
commit | 0deef376d96bfe0a3a2496714ac22471d9ee818a (patch) | |
tree | 43d383a5bc4315863240dd61f7a4077ce2ac86e7 /ext/mcpat/cacti/basic_circuit.h | |
parent | 1104199115a6ff5ed04f92ba6391f18728765014 (diff) | |
download | gem5-0deef376d96bfe0a3a2496714ac22471d9ee818a.tar.xz |
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.
Diffstat (limited to 'ext/mcpat/cacti/basic_circuit.h')
-rw-r--r-- | ext/mcpat/cacti/basic_circuit.h | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/ext/mcpat/cacti/basic_circuit.h b/ext/mcpat/cacti/basic_circuit.h index aaab6c0ea..e4bb5760a 100644 --- a/ext/mcpat/cacti/basic_circuit.h +++ b/ext/mcpat/cacti/basic_circuit.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. * ***************************************************************************/ @@ -49,10 +50,10 @@ int combination(int n, int m); //#define DBG #ifdef DBG - #define PRINTDW(a);\ +#define PRINTDW(a);\ a; #else - #define PRINTDW(a);\ +#define PRINTDW(a);\ #endif @@ -76,7 +77,7 @@ enum Htree_type { enum Gate_type { nmos, pmos, - inv, + inv, nand, nor, tri, @@ -164,13 +165,13 @@ double cmos_Ig_n( double nWidth, bool _is_dram = false, bool _is_cell = false, - bool _is_wl_tr= false); + bool _is_wl_tr = false); double cmos_Ig_p( double pWidth, bool _is_dram = false, bool _is_cell = false, - bool _is_wl_tr= false); + bool _is_wl_tr = false); double cmos_Isub_leakage( @@ -220,29 +221,29 @@ double shortcircuit_simple( double vdd); //set power point product mask; strictly speaking this is not real point product inline void set_pppm( - double * pppv, - double a=1, - double b=1, - double c=1, - double d=1 - ){ - pppv[0]= a; - pppv[1]= b; - pppv[2]= c; - pppv[3]= d; + double * pppv, + double a = 1, + double b = 1, + double c = 1, + double d = 1 +) { + pppv[0] = a; + pppv[1] = b; + pppv[2] = c; + pppv[3] = d; } inline void set_sppm( - double * sppv, - double a=1, - double b=1, - double c=1, - double d=1 - ){ - sppv[0]= a; - sppv[1]= b; - sppv[2]= c; + double * sppv, + double a = 1, + double b = 1, + double c = 1, + double d = 1 +) { + sppv[0] = a; + sppv[1] = b; + sppv[2] = c; } #endif |